diff -ru pidgin-2.1.1/aclocal.m4 pidgin-2.2.0/aclocal.m4
--- pidgin-2.1.1/aclocal.m4	2007-08-20 14:13:25.000000000 -0400
+++ pidgin-2.2.0/aclocal.m4	2007-09-14 03:31:15.000000000 -0400
@@ -221,7 +221,7 @@
 	  AC_CHECK_FUNCS(dcgettext)
 	  MSGFMT_OPTS=
 	  AC_MSG_CHECKING([if msgfmt accepts -c])
-	  GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -447,7 +447,7 @@
 
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL],
 [AC_PREREQ([2.50])dnl
 
@@ -460,7 +460,7 @@
 esac
 
 if test -n "$1"; then
-    AC_MSG_CHECKING(for intltool >= $1)
+    AC_MSG_CHECKING([for intltool >= $1])
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
     INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -489,6 +489,7 @@
   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_THEME_RULE='%.theme:     %.theme.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 $< [$]@' 
     INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 
 AC_SUBST(INTLTOOL_DESKTOP_RULE)
 AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -508,6 +509,7 @@
 AC_SUBST(INTLTOOL_SCHEMAS_RULE)
 AC_SUBST(INTLTOOL_THEME_RULE)
 AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
 
 # Use the tools built into the package, not the ones that are installed.
 AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -530,19 +532,16 @@
    fi
 fi
 
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
 
 # Set DATADIRNAME correctly if it is not set yet
 # (copied from glib-gettext.m4)
 if test -z "$DATADIRNAME"; then
-  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-                 return _nl_msg_cat_cntr],
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
     [DATADIRNAME=share],
     [case $host in
     *-*-solaris*)
@@ -583,10 +582,6 @@
 for file in intltool-extract intltool-merge intltool-update; do
   sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
       -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
       -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
 	< ${ac_aux_dir}/${file}.in > ${file}.out
   if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -601,9 +596,7 @@
 ],
 [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
 prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir" 
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
 
 ])
 
@@ -652,7 +645,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -815,7 +808,7 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -902,8 +895,9 @@
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -915,8 +909,9 @@
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -932,12 +927,20 @@
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -1168,13 +1171,17 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -1191,6 +1198,9 @@
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -1262,7 +1272,7 @@
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -1303,11 +1313,12 @@
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -1421,24 +1432,27 @@
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -1665,7 +1679,8 @@
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1673,7 +1688,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1813,6 +1828,7 @@
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1830,7 +1846,8 @@
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1844,20 +1861,58 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -2014,12 +2069,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -2073,7 +2124,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -2136,7 +2187,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2207,7 +2258,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2313,6 +2364,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -2418,7 +2473,8 @@
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2679,7 +2735,7 @@
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2742,7 +2798,7 @@
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2889,7 +2945,7 @@
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2928,9 +2984,15 @@
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
@@ -2975,7 +3037,7 @@
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -3025,6 +3087,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3077,7 +3143,7 @@
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -3293,10 +3359,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -3398,10 +3464,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3547,7 +3613,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3706,10 +3772,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3792,9 +3858,7 @@
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3862,7 +3926,7 @@
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3982,6 +4046,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -4020,16 +4107,20 @@
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -4191,15 +4282,10 @@
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -4246,6 +4332,12 @@
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -4489,7 +4581,7 @@
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -4497,13 +4589,46 @@
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -4552,10 +4677,17 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4634,10 +4766,10 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4690,7 +4822,7 @@
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4779,6 +4911,7 @@
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4825,7 +4958,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -5150,7 +5283,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -5233,6 +5366,7 @@
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -5459,12 +5593,14 @@
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -5476,7 +5612,7 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5612,6 +5748,14 @@
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5732,13 +5876,15 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
@@ -5748,7 +5894,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5806,7 +5952,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -5858,6 +6004,22 @@
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -5867,6 +6029,10 @@
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5961,7 +6127,8 @@
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -5978,7 +6145,7 @@
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   linux* | k*bsd*-gnu)
     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -6120,7 +6287,7 @@
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -6138,7 +6305,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6153,7 +6320,7 @@
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -6171,13 +6338,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
@@ -6218,7 +6394,7 @@
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -6337,7 +6513,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -6430,7 +6606,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -6472,10 +6648,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -6637,24 +6813,28 @@
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6713,17 +6893,16 @@
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6780,7 +6959,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6855,7 +7034,7 @@
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6958,6 +7137,30 @@
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
@@ -6978,12 +7181,13 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -7016,6 +7220,7 @@
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
@@ -7167,7 +7372,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -ru pidgin-2.1.1/AUTHORS pidgin-2.2.0/AUTHORS
--- pidgin-2.1.1/AUTHORS	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/AUTHORS	2007-08-24 11:59:39.000000000 -0400
@@ -22,7 +22,7 @@
 Ka-Hing Cheung - Developer
 Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
-Christian 'ChipX86' Hammond - Developer & Webmaster
+Casey Harkins - Developer
 Gary 'grim' Kramlich - Developer
 Richard 'rlaager' Laager - Developer
 Richard 'wabz' Nelson - Developer
@@ -31,21 +31,16 @@
 Etan 'deryni' Reisner - Developer
 Tim 'marv' Ringenbach - Developer
 Luke 'LSchiere' Schierer - Support
-Megan 'Cae' Schneider (support/QA)
+Megan 'Cae' Schneider - support/QA
 Evan Schoenberg - Developer
+Kevin 'SimGuy' Stange - Developer & Webmaster
 Stu 'nosnilmot' Tomlinson - Developer
 Nathan 'faceprint' Walp - Developer
 
 Crazy Patch Writers:
 -------------------
 John 'rekkanoryo' Bailey
-Felipe 'shx' Contreras
-Decklin Foster
-Casey Harkins
 Peter 'Bleeter' Lawler
-Robert 'Robot101' McQueen
-Benjamin Miller
-Kevin 'SimGuy' Stange
 
 Retired Developers:
 ------------------
@@ -53,11 +48,19 @@
 Jim Duchek <jim@linuxpimps.com> - maintainer
 Rob Flynn <gaim@robflynn.com> - maintainer
 Adam Fritzler - libfaim maintainer
+Christian 'ChipX86' Hammond - Developer & Webmaster
 Syd Logan - hacker and designated driver [lazy bum]
 Jim Seymour - XMPP developer
 Mark Spencer <markster@marko.net> - original author
 Eric Warmenhoven <eric@warmenhoven.org> - lead developer
 
+Retired Crazy Patch Writers:
+---------------------------
+Felipe 'shx' Contreras
+Decklin Foster
+Robert 'Robot101' McQueen
+Benjamin Miller
+
 Artists:
 -------
 Hylke Bons - Icons
diff -ru pidgin-2.1.1/ChangeLog pidgin-2.2.0/ChangeLog
--- pidgin-2.1.1/ChangeLog	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/ChangeLog	2007-09-14 04:33:10.000000000 -0400
@@ -1,5 +1,41 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+Version 2.2.0 (09/13/2007):
+	http://developer.pidgin.im/query?status=closed&milestone=2.2.0
+
+	Libpurple:
+	* New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of
+	  Code)
+	* XMPP enhancements. See
+ 	  http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas 
+	  Monitzer, Google Summer of Code for Adium)
+	* Certificate management. Libpurple will validate certificates on
+	  SSL-encrypted protocols (William Ehlhardt, Google Summer of Code)
+	* Some adjustments were made to fix sending messages when using
+	  the MSN HTTP method. (Laszlo Pandy)
+	* Yahoo! Chat is fixed.
+	* Some AIM file transfer issues between Pidgin and other clients
+	  have been fixed. (Kyryll A Mirnenko)
+	* Properly restore idle status and time for AIM and ICQ accounts
+	  when they reconnect after being disconnected.
+
+	Pidgin:
+	* Insert Horizontal Rules and Strikethrough text from toolbar.
+	* Option to show protocol icons in the buddy list, from the
+	  Buddies > Show menu. (Justin Heiner)
+	* Ability to build with native, non-X11 GTK+ on OSX. (Anders
+	  Hasselqvist)
+	* Remember the 'Enable Sounds' setting for a conversation.
+	* Right-clicking the empty space in the formatting toolbar
+	  allows you to toggle back to the old "ungrouped" version.
+	* Protocols supporting account registration via Pidgin now show
+	  a descriptive checkbox instead of a vague "Register" button.
+	* Fixed a bug where a tab would be shown on single conversations
+	  when tabs were disabled.
+
+	Finch:
+	* Per-conversation mute and logging options (accessible from the menu).
+
 version 2.1.1 (08/20/2007):
 	Yahoo:
 	* Added an account action to open your inbox in the yahoo prpl.
diff -ru pidgin-2.1.1/ChangeLog.API pidgin-2.2.0/ChangeLog.API
--- pidgin-2.1.1/ChangeLog.API	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/ChangeLog.API	2007-09-14 04:33:10.000000000 -0400
@@ -1,5 +1,62 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+Version 2.2.0 (09/13/2007):
+	libpurple:
+		Added:
+		* PURPLE_MESSAGE_INVISIBLE flag, which can be used by
+		  purple_conv_im_send_with_flags to send a message, but not display it
+		  in the conversation
+		* serv_send_attention(), serv_got_attention(), as well as send_attention 
+		  and attention_types in PurplePluginProtocolInfo. This new API is used
+		  for zapping in MySpaceIM, buzzing in Yahoo, and nudging in MSN.
+		* PurpleConvMessage structure to represent a message in a
+		  conversation. purple_conversation_message_get_sender,
+		  purple_conversation_message_get_message,
+		  purple_conversation_message_get_flags and
+		  purple_conversation_message_get_timestamp to get information about a
+		  PurpleConvMessage.
+		* purple_conversation_get_message_history() to retrieve a list of
+		  PurpleConvMessage's in a conversation, and
+		  purple_conversation_clear_message_history to clear the history.
+		* purple_certificate_* functions in libpurple/certificate.h - "A public-key certificate API"
+		* purple_ssl_get_peer_certificates() and associated field in PurpleSslOps to retrieve a server's presented SSL certificate chain.
+		* PurpleSslConnection::verifier to provide a "how to verify the peer's certificates" callback to the SSL handlers. See certificate.h for more on this.
+		* purple_ssl_connect_with_host_fd() to create an SSL connection from a file descriptor and provide a hostname with it to authenticate the peer against.
+
+		Changed:
+		* purple_prefs_load is now called within purple_prefs_init.
+		  The UI no longer needs to call it.
+		* writing-im-msg now receives the conversation name as the who
+		  argument if the caller of purple_conversation_write didn't
+		  provide a value for who.
+
+	Pidgin:
+		Added:
+		* pidgin_set_accessible_relations, sets up label-for and labelled-by
+		  ATK relations (broken out from pidgin_set_accessible_label)
+		* pidgin_conv_attach_to_conversation, to reattach the Pidgin UI to a
+		  conversation
+		* conversation-hiding and conversation-displayed signals.
+		* pidgin_text_combo_box_entry_new, pidgin_text_combo_box_entry_get_text
+		  and pidgin_text_combo_box_entry_set_text
+
+		Changed:
+		* pidgin_conversations_fill_menu now also adds a separator and a 'Show
+		  All' item if there are more than one conversations in the list.
+
+	Finch:
+		Added:
+		* finch_sound_is_enabled
+		* The reserved field in the FinchConv is now used to store information
+		  about the conversation (using FinchConversationFlag)
+		* finch_account_dialog_show
+
+		libgnt:
+		* gnt_slider_set_small_step, gnt_slider_set_large_step to allow more
+		  fine tuned updates of a GntSlider
+		* gnt_util_parse_xhtml_to_textview to parse XHTML strings in a
+		  GntTextView (this works only if libxml2 is available)
+
 Version 2.1.1 (08/20/2007):
 	libpurple:
 		Changed:
diff -ru pidgin-2.1.1/ChangeLog.win32 pidgin-2.2.0/ChangeLog.win32
--- pidgin-2.1.1/ChangeLog.win32	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/ChangeLog.win32	2007-09-14 02:21:41.000000000 -0400
@@ -1,5 +1,9 @@
+version 2.2.0 (09/13/2007):
+	* Updated gtkspell to 2.0.11
+	* Upgrade SILC to use the 1.1.2 toolkit
+
 version 2.1.1 (08/20/2007):
-        * No changes
+	* No changes
 
 version 2.1.0 (7/28/2007):
 	* Updated launcher application (pidgin.exe) to support portable mode
diff -ru pidgin-2.1.1/config.guess pidgin-2.2.0/config.guess
--- pidgin-2.1.1/config.guess	2006-11-08 02:44:58.000000000 -0500
+++ pidgin-2.2.0/config.guess	2007-04-27 14:13:54.000000000 -0400
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-03-06'
 
 # 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
@@ -161,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -950,6 +954,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff -ru pidgin-2.1.1/config.h.in pidgin-2.2.0/config.h.in
--- pidgin-2.1.1/config.h.in	2007-08-20 14:13:30.000000000 -0400
+++ pidgin-2.2.0/config.h.in	2007-09-14 03:32:05.000000000 -0400
@@ -316,7 +316,7 @@
 #undef HAVE_VPRINTF
 
 /* Define to 1 if you have X11 */
-#undef HAVE_X11
+#undef HAVE_X
 
 /* Define to 1 if you have the <X11/SM/SMlib.h> header file. */
 #undef HAVE_X11_SM_SMLIB_H
diff -ru pidgin-2.1.1/config.sub pidgin-2.2.0/config.sub
--- pidgin-2.1.1/config.sub	2006-11-08 02:44:58.000000000 -0500
+++ pidgin-2.2.0/config.sub	2007-04-27 14:13:54.000000000 -0400
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-01-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1219,7 +1222,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1417,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff -ru pidgin-2.1.1/configure pidgin-2.2.0/configure
--- pidgin-2.1.1/configure	2007-08-20 14:13:51.000000000 -0400
+++ pidgin-2.2.0/configure	2007-09-14 03:31:39.000000000 -0400
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pidgin 2.1.1.
+# Generated by GNU Autoconf 2.61 for pidgin 2.2.0.
 #
 # Report bugs to <devel@pidgin.im>.
 #
@@ -728,8 +728,8 @@
 # Identity of this package.
 PACKAGE_NAME='pidgin'
 PACKAGE_TARNAME='pidgin'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='pidgin 2.1.1'
+PACKAGE_VERSION='2.2.0'
+PACKAGE_STRING='pidgin 2.2.0'
 PACKAGE_BUGREPORT='devel@pidgin.im'
 
 # Factoring default headers for most tests.
@@ -865,6 +865,7 @@
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
+SED
 GREP
 EGREP
 LN_S
@@ -901,14 +902,11 @@
 INTLTOOL_SCHEMAS_RULE
 INTLTOOL_THEME_RULE
 INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
 ALL_LINGUAS
 DATADIRNAME
 PKG_CONFIG
@@ -940,6 +938,8 @@
 GTK_LIBS
 pango_CFLAGS
 pango_LIBS
+X11_CFLAGS
+X11_LIBS
 XSS_LIBS
 SM_LIBS
 STARTUP_NOTIFICATION_CFLAGS
@@ -956,8 +956,8 @@
 BUILD_GEVOLUTION_FALSE
 ENABLE_CAP_TRUE
 ENABLE_CAP_FALSE
-X11_CFLAGS
-X11_LIBS
+ENABLE_GESTURES_TRUE
+ENABLE_GESTURES_FALSE
 GNT_LIBS
 GNT_CFLAGS
 ENABLE_GNT_TRUE
@@ -1002,6 +1002,8 @@
 STATIC_JABBER_FALSE
 STATIC_MSN_TRUE
 STATIC_MSN_FALSE
+STATIC_MYSPACE_TRUE
+STATIC_MYSPACE_FALSE
 STATIC_NOVELL_TRUE
 STATIC_NOVELL_FALSE
 STATIC_OSCAR_TRUE
@@ -1032,6 +1034,8 @@
 DYNAMIC_JABBER_FALSE
 DYNAMIC_MSN_TRUE
 DYNAMIC_MSN_FALSE
+DYNAMIC_MYSPACE_TRUE
+DYNAMIC_MYSPACE_FALSE
 DYNAMIC_NOVELL_TRUE
 DYNAMIC_NOVELL_FALSE
 DYNAMIC_OSCAR_TRUE
@@ -1138,6 +1142,8 @@
 GTK_LIBS
 pango_CFLAGS
 pango_LIBS
+X11_CFLAGS
+X11_LIBS
 STARTUP_NOTIFICATION_CFLAGS
 STARTUP_NOTIFICATION_LIBS
 GTKSPELL_CFLAGS
@@ -1146,8 +1152,6 @@
 EVOLUTION_ADDRESSBOOK_LIBS
 SQLITE3_CFLAGS
 SQLITE3_LIBS
-X11_CFLAGS
-X11_LIBS
 LIBXML_CFLAGS
 LIBXML_LIBS
 GSTREAMER_CFLAGS
@@ -1674,7 +1678,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 pidgin 2.1.1 to adapt to many kinds of systems.
+\`configure' configures pidgin 2.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1749,7 +1753,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pidgin 2.1.1:";;
+     short | recursive ) echo "Configuration of pidgin 2.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1775,6 +1779,7 @@
   --disable-gevolution    compile without the Evolution plugin
   --disable-cap           compile without Contact Availability Prediction
                           plugin
+  --disable-gestures      compile without the gestures plugin
   --disable-schemas-install	Disable the schemas installation
   --disable-gstreamer     compile without GStreamer audio support
 
@@ -1801,6 +1806,7 @@
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-tags[=TAGS]      include additional configurations [automatic]
+
   --with-x                use the X Window System
   --with-ncurses-headers=DIR
                           compile finch against the ncurses includes in DIR
@@ -1869,6 +1875,8 @@
   pango_CFLAGS
               C compiler flags for pango, overriding pkg-config
   pango_LIBS  linker flags for pango, overriding pkg-config
+  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
+  X11_LIBS    linker flags for X11, overriding pkg-config
   STARTUP_NOTIFICATION_CFLAGS
               C compiler flags for STARTUP_NOTIFICATION, overriding pkg-config
   STARTUP_NOTIFICATION_LIBS
@@ -1886,8 +1894,6 @@
               C compiler flags for SQLITE3, overriding pkg-config
   SQLITE3_LIBS
               linker flags for SQLITE3, overriding pkg-config
-  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
-  X11_LIBS    linker flags for X11, overriding pkg-config
   LIBXML_CFLAGS
               C compiler flags for LIBXML, overriding pkg-config
   LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
@@ -1985,7 +1991,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pidgin configure 2.1.1
+pidgin configure 2.2.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1999,7 +2005,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pidgin $as_me 2.1.1, which was
+It was created by pidgin $as_me 2.2.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2798,7 +2804,7 @@
 
 # Define the identity of the package.
  PACKAGE=pidgin
- VERSION=2.1.1
+ VERSION=2.2.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2947,19 +2953,19 @@
 #AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 PURPLE_MAJOR_VERSION=2
-PURPLE_MINOR_VERSION=1
-PURPLE_MICRO_VERSION=1
+PURPLE_MINOR_VERSION=2
+PURPLE_MICRO_VERSION=0
 PURPLE_VERSION=purple_display_version
 
 
 
 
 
-PURPLE_LT_VERSION_INFO="1:1:1"
+PURPLE_LT_VERSION_INFO="2:0:2"
 
 
 GNT_MAJOR_VERSION=2
-GNT_MINOR_VERSION=1
+GNT_MINOR_VERSION=2
 GNT_MICRO_VERSION=0
 GNT_VERSION=gnt_display_version
 
@@ -2967,7 +2973,7 @@
 
 
 
-GNT_LT_VERSION_INFO="1:0:1"
+GNT_LT_VERSION_INFO="2:0:2"
 
 
 # Extract the first word of "sed", so it can be a program name with args.
@@ -4197,12 +4203,13 @@
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -4237,6 +4244,7 @@
 fi
 
 SED=$lt_cv_path_SED
+
 { echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6; }
 
@@ -4598,8 +4606,8 @@
 echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4640,9 +4648,15 @@
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
@@ -4687,7 +4701,7 @@
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -4737,6 +4751,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4824,7 +4842,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4827 "configure"' > conftest.$ac_ext
+  echo '#line 4845 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4859,7 +4877,8 @@
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4870,6 +4889,9 @@
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -4886,6 +4908,9 @@
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -6679,24 +6704,27 @@
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -6713,6 +6741,7 @@
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
@@ -7301,7 +7330,7 @@
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -7501,10 +7530,10 @@
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -7519,13 +7548,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -7545,7 +7574,7 @@
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7556,11 +7585,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:7559: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7588: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7563: \$? = $ac_status" >&5
+   echo "$as_me:7592: \$? = $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.
@@ -7611,13 +7640,15 @@
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -7627,7 +7658,7 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -7685,7 +7716,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7737,6 +7768,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -7746,6 +7793,10 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -7813,7 +7864,7 @@
 else
   lt_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7824,11 +7875,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:7827: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7878: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7831: \$? = $ac_status" >&5
+   echo "$as_me:7882: \$? = $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.
@@ -7877,7 +7928,7 @@
   lt_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7917,7 +7968,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -7928,11 +7979,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:7931: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7935: \$? = $ac_status" >&5
+   echo "$as_me:7986: \$? = $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
@@ -8124,7 +8175,7 @@
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8142,7 +8193,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -8157,7 +8208,7 @@
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -8175,13 +8226,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs=no
       else
@@ -8341,7 +8401,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -8415,11 +8475,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8474,11 +8541,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8532,7 +8606,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -8574,10 +8648,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -8739,24 +8813,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -8815,17 +8893,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -8882,7 +8959,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -8959,7 +9036,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -9017,17 +9094,55 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -9187,12 +9302,8 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -9246,7 +9357,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -9309,7 +9420,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9380,7 +9491,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9486,6 +9597,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -9639,6 +9754,7 @@
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        else
@@ -10225,7 +10341,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10228 "configure"
+#line 10344 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10325,7 +10441,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10328 "configure"
+#line 10444 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10523,6 +10639,7 @@
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -10567,7 +10684,7 @@
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -10891,7 +11008,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -11060,10 +11177,10 @@
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -11079,13 +11196,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -11344,7 +11461,7 @@
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -11418,11 +11535,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11478,11 +11602,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11601,10 +11732,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -11687,9 +11818,7 @@
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -11757,7 +11886,7 @@
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -11877,6 +12006,29 @@
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -11915,16 +12067,20 @@
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -12086,15 +12242,10 @@
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -12141,6 +12292,12 @@
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -12332,7 +12489,7 @@
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -12340,13 +12497,46 @@
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
@@ -12383,12 +12573,14 @@
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -12400,7 +12592,7 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -12536,6 +12728,14 @@
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -12650,7 +12850,7 @@
 else
   lt_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -12661,11 +12861,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:12664: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12864: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12668: \$? = $ac_status" >&5
+   echo "$as_me:12868: \$? = $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.
@@ -12714,7 +12914,7 @@
   lt_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12754,7 +12954,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -12765,11 +12965,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:12768: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12968: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12772: \$? = $ac_status" >&5
+   echo "$as_me:12972: \$? = $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
@@ -12835,7 +13035,7 @@
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   linux* | k*bsd*-gnu)
     link_all_deplibs_CXX=no
@@ -12869,7 +13069,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -12927,20 +13127,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -13097,12 +13284,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -13156,7 +13338,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -13219,7 +13401,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13290,7 +13472,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13396,6 +13578,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13590,6 +13776,7 @@
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -13910,7 +14097,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -14001,10 +14188,17 @@
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -14020,13 +14214,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -14113,13 +14307,15 @@
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -14129,7 +14325,7 @@
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -14187,7 +14383,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -14239,6 +14435,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -14248,6 +14460,10 @@
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -14315,7 +14531,7 @@
 else
   lt_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -14326,11 +14542,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:14329: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14545: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14333: \$? = $ac_status" >&5
+   echo "$as_me:14549: \$? = $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.
@@ -14379,7 +14595,7 @@
   lt_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14419,7 +14635,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14430,11 +14646,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:14433: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14649: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14437: \$? = $ac_status" >&5
+   echo "$as_me:14653: \$? = $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
@@ -14626,7 +14842,7 @@
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -14644,7 +14860,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -14659,7 +14875,7 @@
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -14677,13 +14893,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs_F77=no
       else
@@ -14843,7 +15068,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -14907,11 +15132,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -14956,11 +15188,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -15014,7 +15253,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -15056,10 +15295,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -15221,24 +15460,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -15297,17 +15540,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15364,7 +15606,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15441,7 +15683,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -15499,20 +15741,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -15669,12 +15898,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -15728,7 +15952,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -15791,7 +16015,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15862,7 +16086,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15968,6 +16192,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -16162,6 +16390,7 @@
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -16482,7 +16711,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -16540,10 +16769,10 @@
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -16559,13 +16788,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -16606,7 +16835,7 @@
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16617,11 +16846,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:16620: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16849: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16624: \$? = $ac_status" >&5
+   echo "$as_me:16853: \$? = $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.
@@ -16672,13 +16901,15 @@
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
       ;;
 
@@ -16688,7 +16919,7 @@
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -16746,7 +16977,7 @@
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -16798,6 +17029,22 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -16807,6 +17054,10 @@
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16874,7 +17125,7 @@
 else
   lt_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16885,11 +17136,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:16888: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17139: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16892: \$? = $ac_status" >&5
+   echo "$as_me:17143: \$? = $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.
@@ -16938,7 +17189,7 @@
   lt_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16978,7 +17229,7 @@
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -16989,11 +17240,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:16992: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17243: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16996: \$? = $ac_status" >&5
+   echo "$as_me:17247: \$? = $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
@@ -17185,7 +17436,7 @@
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -17203,7 +17454,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -17218,7 +17469,7 @@
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -17236,13 +17487,22 @@
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
 	link_all_deplibs_GCJ=no
       else
@@ -17402,7 +17662,7 @@
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -17476,11 +17736,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17535,11 +17802,18 @@
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+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
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17593,7 +17867,7 @@
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -17635,10 +17909,10 @@
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -17800,24 +18074,28 @@
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -17876,17 +18154,16 @@
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -17943,7 +18220,7 @@
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -18020,7 +18297,7 @@
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -18078,20 +18355,7 @@
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -18248,12 +18512,7 @@
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -18307,7 +18566,7 @@
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18370,7 +18629,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18441,7 +18700,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18547,6 +18806,10 @@
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -18741,6 +19004,7 @@
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -19061,7 +19325,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -19118,7 +19382,7 @@
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -19137,13 +19401,13 @@
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -19221,6 +19485,7 @@
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -19541,7 +19806,7 @@
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -19766,6 +20031,8 @@
   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
     INTLTOOL_THEME_RULE='%.theme:     %.theme.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 $< $@'
     INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
 
 
 
@@ -19857,171 +20124,6 @@
    fi
 fi
 
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_ICONV in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
-  ;;
-esac
-fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
-  ;;
-esac
-fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
-  ;;
-esac
-fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $INTLTOOL_XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  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_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
-  ;;
-esac
-fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
-  { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
@@ -20039,7 +20141,7 @@
 main ()
 {
 extern int _nl_msg_cat_cntr;
-                 return _nl_msg_cat_cntr
+                       return _nl_msg_cat_cntr
   ;
   return 0;
 }
@@ -20670,7 +20772,7 @@
 	;;
 esac
 
-ALL_LINGUAS="af am ar az bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ps ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ps ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_HK zh_TW"
 
 
 for ac_header in locale.h
@@ -21853,8 +21955,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 _ACEOF
-if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
-  (msgfmt -c -o /dev/null conftest.foo) 2>&5
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -25294,6 +25396,14 @@
 
 
 
+
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then
+  withval=$with_x; with_x="$withval"
+else
+  with_x="yes"
+fi
+
 # Check whether --enable-gtkui was given.
 if test "${enable_gtkui+set}" = set; then
   enableval=$enable_gtkui; enable_gtkui="$enableval"
@@ -25351,6 +25461,12 @@
   enable_cap="yes"
 fi
 
+# Check whether --enable-gestures was given.
+if test "${enable_gestures+set}" = set; then
+  enableval=$enable_gestures; enable_gestures="$enableval"
+else
+  enable_gestures="yes"
+fi
 
 
 { echo "$as_me:$LINENO: checking for X" >&5
@@ -26859,12 +26975,97 @@
 
 fi
 
+				if test "x$with_x" = "xyes" ; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for X11" >&5
+echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11_CFLAGS"; then
+        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11_LIBS"; then
+        pkg_cv_X11_LIBS="$X11_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 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
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+        else
+	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$X11_PKG_ERRORS" >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+			with_x=no
+elif test $pkg_failed = untried; then
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+			with_x=no
+else
+	X11_CFLAGS=$pkg_cv_X11_CFLAGS
+	X11_LIBS=$pkg_cv_X11_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_X 1
+_ACEOF
+
+fi
+
+
+	fi
+
 				if test "x$enable_screensaver" = "xyes" ; then
-		old_LIBS="$LIBS"
-		LIBS="$LIBS $GTK_LIBS $x_libpath_add"
-		XSS_LIBS=""
-		XSS_HEADERS=""
-		{ echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXext" >&5
+		if test "x$with_x" = "xyes" ; then
+			old_LIBS="$LIBS"
+			LIBS="$LIBS $GTK_LIBS $x_libpath_add"
+			XSS_LIBS=""
+			XSS_HEADERS=""
+			{ echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXext" >&5
 echo $ECHO_N "checking for XScreenSaverRegister in -lXext... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xext_XScreenSaverRegister+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26929,7 +27130,7 @@
   XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"
 fi
 
-		{ echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXss" >&5
+			{ echo "$as_me:$LINENO: checking for XScreenSaverRegister in -lXss" >&5
 echo $ECHO_N "checking for XScreenSaverRegister in -lXss... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xss_XScreenSaverRegister+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26994,10 +27195,10 @@
   XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"
 fi
 
-		if test "x$XSS_LIBS" != "x"; then
-			oldCPPFLAGS="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $x_incpath_add"
-			cat >conftest.$ac_ext <<_ACEOF
+			if test "x$XSS_LIBS" != "x"; then
+				oldCPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS $x_incpath_add"
+				cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -27041,25 +27242,29 @@
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-			CPPFLAGS="$oldCPPFLAGS"
-		else
-			enable_screensaver=no
-		fi
-		LIBS="$old_LIBS"
+				CPPFLAGS="$oldCPPFLAGS"
+			else
+				enable_screensaver=no
+			fi
+			LIBS="$old_LIBS"
 
-		if test "x$enable_screensaver" = "xyes" ; then
+			if test "x$enable_screensaver" = "xyes" ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_SCREENSAVER 1
 _ACEOF
 
 
+			fi
+		else
+			enable_screensaver=no
 		fi
 	fi
 
 				if test "x$enable_sm" = "xyes"; then
-		enable_sm=no
-		{ echo "$as_me:$LINENO: checking for SmcSaveYourselfDone in -lSM" >&5
+		if test "x$with_x" = "xyes" ; then
+			enable_sm=no
+			{ echo "$as_me:$LINENO: checking for SmcSaveYourselfDone in -lSM" >&5
 echo $ECHO_N "checking for SmcSaveYourselfDone in -lSM... $ECHO_C" >&6; }
 if test "${ac_cv_lib_SM_SmcSaveYourselfDone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27124,9 +27329,9 @@
   found_sm_lib=true
 fi
 
-		if test "x$found_sm_lib" = "xtrue"; then
-			oldCPPFLAGS="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $x_incpath_add"
+			if test "x$found_sm_lib" = "xtrue"; then
+				oldCPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS $x_incpath_add"
 
 for ac_header in X11/SM/SMlib.h
 do
@@ -27272,16 +27477,25 @@
 
 done
 
-			CPPFLAGS="$oldCPPFLAGS"
-		fi
+				CPPFLAGS="$oldCPPFLAGS"
+			fi
 
-		if test "x$enable_sm" = "xyes"; then
+			if test "x$enable_sm" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_SM 1
 _ACEOF
 
 
+			fi
+		else
+			enable_sm=no
+		fi
+	fi
+
+				if test "x$enable_gestures" = "xyes"; then
+		if test "x$with_x" = "xno" ; then
+			enable_gestures=no
 		fi
 	fi
 
@@ -27705,15 +27919,15 @@
 	{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 
-													{ echo "$as_me:$LINENO: result: no" >&5
+			{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-													enable_cap="no"
+			enable_cap="no"
 
 elif test $pkg_failed = untried; then
 
-													{ echo "$as_me:$LINENO: result: no" >&5
+			{ echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-													enable_cap="no"
+			enable_cap="no"
 
 else
 	SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
@@ -27724,6 +27938,7 @@
 fi
 	fi
 
+
 else # GTK
 	enable_cap=no
 	enable_gevolution=no
@@ -27764,6 +27979,17 @@
 fi
 
 
+
+if test "x$enable_gestures" = "xyes"; then
+  ENABLE_GESTURES_TRUE=
+  ENABLE_GESTURES_FALSE='#'
+else
+  ENABLE_GESTURES_TRUE='#'
+  ENABLE_GESTURES_FALSE=
+fi
+
+
+
 GNT_LIBS=""
 GNT_CFLAGS=""
 
@@ -28276,86 +28502,6 @@
 			fi
 		fi
 	fi
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for X11" >&5
-echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_CFLAGS"; then
-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$X11_LIBS"; then
-        pkg_cv_X11_LIBS="$X11_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 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
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
-        else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$X11_PKG_ERRORS" >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-elif test $pkg_failed = untried; then
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-else
-	X11_CFLAGS=$pkg_cv_X11_CFLAGS
-	X11_LIBS=$pkg_cv_X11_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_X11 1
-_ACEOF
-
-fi
-
-
 fi
 
 
@@ -30863,7 +31009,7 @@
 fi
 
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
+	STATIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes" ; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -30907,6 +31053,7 @@
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
 		msn)		static_msn=yes ;;
+		myspace)	static_myspace=yes ;;
 		novell)		static_novell=yes ;;
 		oscar)		static_oscar=yes ;;
 		aim)		static_oscar=yes ;;
@@ -30974,6 +31121,16 @@
 
 
 
+if test "x$static_myspace" = "xyes"; then
+  STATIC_MYSPACE_TRUE=
+  STATIC_MYSPACE_FALSE='#'
+else
+  STATIC_MYSPACE_TRUE='#'
+  STATIC_MYSPACE_FALSE=
+fi
+
+
+
 if test "x$static_novell" = "xyes"; then
   STATIC_NOVELL_TRUE=
   STATIC_NOVELL_FALSE='#'
@@ -31076,7 +31233,7 @@
 fi
 
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
-	DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
+	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
@@ -31100,6 +31257,7 @@
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
 		msn)		dynamic_msn=yes ;;
+		myspace)	dynamic_myspace=yes ;;
 		novell)		dynamic_novell=yes ;;
 		oscar)		dynamic_oscar=yes ;;
 		aim)		dynamic_oscar=yes ;;
@@ -31167,6 +31325,16 @@
 
 
 
+if test "x$dynamic_myspace" = "xyes"; then
+  DYNAMIC_MYSPACE_TRUE=
+  DYNAMIC_MYSPACE_FALSE='#'
+else
+  DYNAMIC_MYSPACE_TRUE='#'
+  DYNAMIC_MYSPACE_FALSE=
+fi
+
+
+
 if test "x$dynamic_novell" = "xyes"; then
   DYNAMIC_NOVELL_TRUE=
   DYNAMIC_NOVELL_FALSE='#'
@@ -31993,7 +32161,7 @@
 
 	fi
 
-	if test x"$python" = x"no" ; then
+	if test x"$PYTHON" = x"no" ; then
 		{ echo "$as_me:$LINENO: WARNING: python interpreter not found in your path" >&5
 echo "$as_me: WARNING: python interpreter not found in your path" >&2;}
 		enable_dbus=no
@@ -37173,7 +37341,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/animations/Makefile pidgin/pixmaps/animations/16/Makefile pidgin/pixmaps/buddy_icons/Makefile pidgin/pixmaps/buddy_icons/qq/Makefile pidgin/pixmaps/dialogs/Makefile pidgin/pixmaps/dialogs/16/Makefile pidgin/pixmaps/dialogs/16/scalable/Makefile pidgin/pixmaps/dialogs/64/Makefile pidgin/pixmaps/dialogs/64/scalable/Makefile pidgin/pixmaps/emblems/Makefile pidgin/pixmaps/emblems/16/Makefile pidgin/pixmaps/emblems/16/scalable/Makefile pidgin/pixmaps/emotes/Makefile pidgin/pixmaps/emotes/default/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/default/24/scalable/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/icons/Makefile pidgin/pixmaps/icons/16/Makefile pidgin/pixmaps/icons/16/scalable/Makefile pidgin/pixmaps/icons/22/Makefile pidgin/pixmaps/icons/22/scalable/Makefile pidgin/pixmaps/icons/24/Makefile pidgin/pixmaps/icons/24/scalable/Makefile pidgin/pixmaps/icons/32/Makefile pidgin/pixmaps/icons/32/scalable/Makefile pidgin/pixmaps/icons/48/Makefile pidgin/pixmaps/icons/48/scalable/Makefile pidgin/pixmaps/protocols/Makefile pidgin/pixmaps/protocols/16/Makefile pidgin/pixmaps/protocols/16/scalable/Makefile pidgin/pixmaps/protocols/22/Makefile pidgin/pixmaps/protocols/22/scalable/Makefile pidgin/pixmaps/protocols/48/Makefile pidgin/pixmaps/protocols/48/scalable/Makefile pidgin/pixmaps/status/Makefile pidgin/pixmaps/status/11/Makefile pidgin/pixmaps/status/11/scalable/Makefile pidgin/pixmaps/status/16/Makefile pidgin/pixmaps/status/16/rtl/Makefile pidgin/pixmaps/status/16/scalable/Makefile pidgin/pixmaps/status/22/Makefile pidgin/pixmaps/status/22/rtl/Makefile pidgin/pixmaps/status/22/scalable/Makefile pidgin/pixmaps/status/32/Makefile pidgin/pixmaps/status/32/rtl/Makefile pidgin/pixmaps/status/32/scalable/Makefile pidgin/pixmaps/status/48/Makefile pidgin/pixmaps/status/48/rtl/Makefile pidgin/pixmaps/toolbar/Makefile pidgin/pixmaps/toolbar/16/Makefile pidgin/pixmaps/toolbar/16/scalable/Makefile pidgin/pixmaps/toolbar/22/Makefile pidgin/pixmaps/toolbar/22/scalable/Makefile pidgin/pixmaps/tray/Makefile pidgin/pixmaps/tray/16/Makefile pidgin/pixmaps/tray/16/scalable/Makefile pidgin/pixmaps/tray/22/Makefile pidgin/pixmaps/tray/22/scalable/Makefile pidgin/pixmaps/tray/32/Makefile pidgin/pixmaps/tray/48/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/qq/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/toc/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/version.h share/Makefile share/sounds/Makefile finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/animations/Makefile pidgin/pixmaps/animations/16/Makefile pidgin/pixmaps/buddy_icons/Makefile pidgin/pixmaps/buddy_icons/qq/Makefile pidgin/pixmaps/dialogs/Makefile pidgin/pixmaps/dialogs/16/Makefile pidgin/pixmaps/dialogs/16/scalable/Makefile pidgin/pixmaps/dialogs/64/Makefile pidgin/pixmaps/dialogs/64/scalable/Makefile pidgin/pixmaps/emblems/Makefile pidgin/pixmaps/emblems/16/Makefile pidgin/pixmaps/emblems/16/scalable/Makefile pidgin/pixmaps/emotes/Makefile pidgin/pixmaps/emotes/default/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/default/24/scalable/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/icons/Makefile pidgin/pixmaps/icons/16/Makefile pidgin/pixmaps/icons/16/scalable/Makefile pidgin/pixmaps/icons/22/Makefile pidgin/pixmaps/icons/22/scalable/Makefile pidgin/pixmaps/icons/24/Makefile pidgin/pixmaps/icons/24/scalable/Makefile pidgin/pixmaps/icons/32/Makefile pidgin/pixmaps/icons/32/scalable/Makefile pidgin/pixmaps/icons/48/Makefile pidgin/pixmaps/icons/48/scalable/Makefile pidgin/pixmaps/protocols/Makefile pidgin/pixmaps/protocols/16/Makefile pidgin/pixmaps/protocols/16/scalable/Makefile pidgin/pixmaps/protocols/22/Makefile pidgin/pixmaps/protocols/22/scalable/Makefile pidgin/pixmaps/protocols/48/Makefile pidgin/pixmaps/protocols/48/scalable/Makefile pidgin/pixmaps/status/Makefile pidgin/pixmaps/status/11/Makefile pidgin/pixmaps/status/11/scalable/Makefile pidgin/pixmaps/status/11/rtl/Makefile pidgin/pixmaps/status/16/Makefile pidgin/pixmaps/status/16/rtl/Makefile pidgin/pixmaps/status/16/scalable/Makefile pidgin/pixmaps/status/22/Makefile pidgin/pixmaps/status/22/rtl/Makefile pidgin/pixmaps/status/22/scalable/Makefile pidgin/pixmaps/status/32/Makefile pidgin/pixmaps/status/32/rtl/Makefile pidgin/pixmaps/status/32/scalable/Makefile pidgin/pixmaps/status/48/Makefile pidgin/pixmaps/status/48/rtl/Makefile pidgin/pixmaps/toolbar/Makefile pidgin/pixmaps/toolbar/16/Makefile pidgin/pixmaps/toolbar/16/scalable/Makefile pidgin/pixmaps/toolbar/22/Makefile pidgin/pixmaps/toolbar/22/scalable/Makefile pidgin/pixmaps/tray/Makefile pidgin/pixmaps/tray/16/Makefile pidgin/pixmaps/tray/16/scalable/Makefile pidgin/pixmaps/tray/22/Makefile pidgin/pixmaps/tray/22/scalable/Makefile pidgin/pixmaps/tray/32/Makefile pidgin/pixmaps/tray/48/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/qq/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/toc/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/version.h share/Makefile share/sounds/Makefile share/ca-certs/Makefile finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -37317,6 +37485,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${ENABLE_GESTURES_TRUE}" && test -z "${ENABLE_GESTURES_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GESTURES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ENABLE_GESTURES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${ENABLE_GNT_TRUE}" && test -z "${ENABLE_GNT_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GNT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -37401,6 +37576,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"STATIC_MYSPACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"STATIC_MYSPACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"STATIC_NOVELL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -37499,6 +37681,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${DYNAMIC_MYSPACE_TRUE}" && test -z "${DYNAMIC_MYSPACE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_MYSPACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DYNAMIC_MYSPACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${DYNAMIC_NOVELL_TRUE}" && test -z "${DYNAMIC_NOVELL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"DYNAMIC_NOVELL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -37988,7 +38177,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pidgin $as_me 2.1.1, which was
+This file was extended by pidgin $as_me 2.2.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -38041,7 +38230,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pidgin config.status 2.1.1
+pidgin config.status 2.2.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -38147,9 +38336,7 @@
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
 prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
 
 
 _ACEOF
@@ -38213,6 +38400,7 @@
     "pidgin/pixmaps/status/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/Makefile" ;;
     "pidgin/pixmaps/status/11/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/11/Makefile" ;;
     "pidgin/pixmaps/status/11/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/11/scalable/Makefile" ;;
+    "pidgin/pixmaps/status/11/rtl/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/11/rtl/Makefile" ;;
     "pidgin/pixmaps/status/16/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/16/Makefile" ;;
     "pidgin/pixmaps/status/16/rtl/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/16/rtl/Makefile" ;;
     "pidgin/pixmaps/status/16/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pidgin/pixmaps/status/16/scalable/Makefile" ;;
@@ -38263,6 +38451,7 @@
     "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
     "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
     "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+    "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
     "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
     "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
     "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
@@ -38278,6 +38467,7 @@
     "libpurple/version.h") CONFIG_FILES="$CONFIG_FILES libpurple/version.h" ;;
     "share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
     "share/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES share/sounds/Makefile" ;;
+    "share/ca-certs/Makefile") CONFIG_FILES="$CONFIG_FILES share/ca-certs/Makefile" ;;
     "finch/Makefile") CONFIG_FILES="$CONFIG_FILES finch/Makefile" ;;
     "finch/libgnt/Makefile") CONFIG_FILES="$CONFIG_FILES finch/libgnt/Makefile" ;;
     "finch/libgnt/gnt.pc") CONFIG_FILES="$CONFIG_FILES finch/libgnt/gnt.pc" ;;
@@ -38486,6 +38676,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SED!$SED$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
@@ -38522,14 +38713,11 @@
 INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
 INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
 INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
 INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
 INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
 INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
 INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
 ALL_LINGUAS!$ALL_LINGUAS$ac_delim
 DATADIRNAME!$DATADIRNAME$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
@@ -38561,6 +38749,8 @@
 GTK_LIBS!$GTK_LIBS$ac_delim
 pango_CFLAGS!$pango_CFLAGS$ac_delim
 pango_LIBS!$pango_LIBS$ac_delim
+X11_CFLAGS!$X11_CFLAGS$ac_delim
+X11_LIBS!$X11_LIBS$ac_delim
 XSS_LIBS!$XSS_LIBS$ac_delim
 SM_LIBS!$SM_LIBS$ac_delim
 STARTUP_NOTIFICATION_CFLAGS!$STARTUP_NOTIFICATION_CFLAGS$ac_delim
@@ -38577,8 +38767,8 @@
 BUILD_GEVOLUTION_FALSE!$BUILD_GEVOLUTION_FALSE$ac_delim
 ENABLE_CAP_TRUE!$ENABLE_CAP_TRUE$ac_delim
 ENABLE_CAP_FALSE!$ENABLE_CAP_FALSE$ac_delim
-X11_CFLAGS!$X11_CFLAGS$ac_delim
-X11_LIBS!$X11_LIBS$ac_delim
+ENABLE_GESTURES_TRUE!$ENABLE_GESTURES_TRUE$ac_delim
+ENABLE_GESTURES_FALSE!$ENABLE_GESTURES_FALSE$ac_delim
 GNT_LIBS!$GNT_LIBS$ac_delim
 GNT_CFLAGS!$GNT_CFLAGS$ac_delim
 ENABLE_GNT_TRUE!$ENABLE_GNT_TRUE$ac_delim
@@ -38664,6 +38854,8 @@
 STATIC_JABBER_FALSE!$STATIC_JABBER_FALSE$ac_delim
 STATIC_MSN_TRUE!$STATIC_MSN_TRUE$ac_delim
 STATIC_MSN_FALSE!$STATIC_MSN_FALSE$ac_delim
+STATIC_MYSPACE_TRUE!$STATIC_MYSPACE_TRUE$ac_delim
+STATIC_MYSPACE_FALSE!$STATIC_MYSPACE_FALSE$ac_delim
 STATIC_NOVELL_TRUE!$STATIC_NOVELL_TRUE$ac_delim
 STATIC_NOVELL_FALSE!$STATIC_NOVELL_FALSE$ac_delim
 STATIC_OSCAR_TRUE!$STATIC_OSCAR_TRUE$ac_delim
@@ -38694,6 +38886,8 @@
 DYNAMIC_JABBER_FALSE!$DYNAMIC_JABBER_FALSE$ac_delim
 DYNAMIC_MSN_TRUE!$DYNAMIC_MSN_TRUE$ac_delim
 DYNAMIC_MSN_FALSE!$DYNAMIC_MSN_FALSE$ac_delim
+DYNAMIC_MYSPACE_TRUE!$DYNAMIC_MYSPACE_TRUE$ac_delim
+DYNAMIC_MYSPACE_FALSE!$DYNAMIC_MYSPACE_FALSE$ac_delim
 DYNAMIC_NOVELL_TRUE!$DYNAMIC_NOVELL_TRUE$ac_delim
 DYNAMIC_NOVELL_FALSE!$DYNAMIC_NOVELL_FALSE$ac_delim
 DYNAMIC_OSCAR_TRUE!$DYNAMIC_OSCAR_TRUE$ac_delim
@@ -38717,10 +38911,6 @@
 pidginpath!$pidginpath$ac_delim
 enable_dbus!$enable_dbus$ac_delim
 DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
-DBUS_LIBS!$DBUS_LIBS$ac_delim
-LIBNM_CFLAGS!$LIBNM_CFLAGS$ac_delim
-LIBNM_LIBS!$LIBNM_LIBS$ac_delim
-PYTHON!$PYTHON$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -38762,6 +38952,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+DBUS_LIBS!$DBUS_LIBS$ac_delim
+LIBNM_CFLAGS!$LIBNM_CFLAGS$ac_delim
+LIBNM_LIBS!$LIBNM_LIBS$ac_delim
+PYTHON!$PYTHON$ac_delim
 DBUS_SERVICES_DIR!$DBUS_SERVICES_DIR$ac_delim
 ENABLE_DBUS_TRUE!$ENABLE_DBUS_TRUE$ac_delim
 ENABLE_DBUS_FALSE!$ENABLE_DBUS_FALSE$ac_delim
@@ -38819,7 +39013,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -39383,10 +39577,6 @@
 for file in intltool-extract intltool-merge intltool-update; do
   sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
       -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
       -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
 	< ${ac_aux_dir}/${file}.in > ${file}.out
   if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -39464,7 +39654,9 @@
 echo
 echo Build GTK+ 2.x UI............. : $enable_gtkui
 echo Build console UI.............. : $enable_consoleui
+echo Build for X11................. : $with_x
 echo
+echo Enable Gestures............... : $enable_gestures
 echo Protocols to build dynamically : $DYNAMIC_PRPLS
 echo Protocols to link statically.. : $STATIC_PRPLS
 echo
diff -ru pidgin-2.1.1/configure.ac pidgin-2.2.0/configure.ac
--- pidgin-2.1.1/configure.ac	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/configure.ac	2007-09-14 02:21:41.000000000 -0400
@@ -43,18 +43,18 @@
 #
 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
 #
-m4_define([purple_lt_current], [1])
+m4_define([purple_lt_current], [2])
 m4_define([purple_major_version], [2])
-m4_define([purple_minor_version], [1])
-m4_define([purple_micro_version], [1])
+m4_define([purple_minor_version], [2])
+m4_define([purple_micro_version], [0])
 m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
 
-m4_define([gnt_lt_current], [1])
+m4_define([gnt_lt_current], [2])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [1])
+m4_define([gnt_minor_version], [2])
 m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
@@ -136,7 +136,7 @@
 	;;
 esac
 
-ALL_LINGUAS="af am ar az bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ps ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ps ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -275,6 +275,8 @@
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+AC_ARG_WITH(x, [],
+	with_x="$withval", with_x="yes")
 AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
 		[compile without GTK+ user interface])],
 	enable_gtkui="$enableval", enable_gtkui="yes")
@@ -309,7 +311,10 @@
 	[AC_HELP_STRING([--disable-cap],
 		[compile without Contact Availability Prediction plugin])],
 	enable_cap="$enableval", enable_cap="yes")
-
+AC_ARG_ENABLE(gestures,
+	[AC_HELP_STRING([--disable-gestures],
+		[compile without the gestures plugin])],
+	enable_gestures="$enableval", enable_gestures="yes")
 
 AC_PATH_XTRA
 # We can't assume that $x_libraries will be set, because autoconf does not
@@ -343,50 +348,79 @@
 			AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
 
 	dnl #######################################################################
+	dnl # Check if we should compile with X support
+	dnl #######################################################################
+	if test "x$with_x" = "xyes" ; then
+		PKG_CHECK_MODULES(X11, x11,
+			[AC_DEFINE(HAVE_X, 1, [Define to 1 if you have X11])],
+			[AC_MSG_RESULT(no)
+			with_x=no])
+		AC_SUBST(X11_LIBS)
+		AC_SUBST(X11_CFLAGS)
+	fi
+	
+	dnl #######################################################################
 	dnl # Check for XScreenSaver
 	dnl #######################################################################
 	if test "x$enable_screensaver" = "xyes" ; then
-		old_LIBS="$LIBS"
-		LIBS="$LIBS $GTK_LIBS $x_libpath_add"
-		XSS_LIBS=""
-		XSS_HEADERS=""
-		AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm])
-		AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm])
-		if test "x$XSS_LIBS" != "x"; then
-			oldCPPFLAGS="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $x_incpath_add"
-			AC_TRY_COMPILE([
+		if test "x$with_x" = "xyes" ; then
+			old_LIBS="$LIBS"
+			LIBS="$LIBS $GTK_LIBS $x_libpath_add"
+			XSS_LIBS=""
+			XSS_HEADERS=""
+			AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm])
+			AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm])
+			if test "x$XSS_LIBS" != "x"; then
+				oldCPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS $x_incpath_add"
+				AC_TRY_COMPILE([
 					#include <X11/Xlib.h>
 					#include <X11/extensions/scrnsaver.h>
-				], [], [], [enable_screensaver=no])
-			CPPFLAGS="$oldCPPFLAGS"
+					], [], [], [enable_screensaver=no])
+				CPPFLAGS="$oldCPPFLAGS"
+			else
+				enable_screensaver=no
+			fi
+			LIBS="$old_LIBS"
+
+			if test "x$enable_screensaver" = "xyes" ; then
+				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
+				AC_SUBST(XSS_LIBS)
+			fi
 		else
 			enable_screensaver=no
 		fi
-		LIBS="$old_LIBS"
-
-		if test "x$enable_screensaver" = "xyes" ; then
-			AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
-			AC_SUBST(XSS_LIBS)
-		fi
 	fi
 
 	dnl #######################################################################
 	dnl # Check for X session management libs
 	dnl #######################################################################
 	if test "x$enable_sm" = "xyes"; then
-		enable_sm=no
-		AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE])
-		if test "x$found_sm_lib" = "xtrue"; then
-			oldCPPFLAGS="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $x_incpath_add"
-			AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="$x_libpath_add -lSM -lICE" enable_sm=yes)
-			CPPFLAGS="$oldCPPFLAGS"
+		if test "x$with_x" = "xyes" ; then
+			enable_sm=no
+			AC_CHECK_LIB(SM, SmcSaveYourselfDone, found_sm_lib=true, , [$x_libpath_add -lICE])
+			if test "x$found_sm_lib" = "xtrue"; then
+				oldCPPFLAGS="$CPPFLAGS"
+				CPPFLAGS="$CPPFLAGS $x_incpath_add"
+				AC_CHECK_HEADERS(X11/SM/SMlib.h, SM_LIBS="$x_libpath_add -lSM -lICE" enable_sm=yes)
+				CPPFLAGS="$oldCPPFLAGS"
+			fi
+
+			if test "x$enable_sm" = "xyes"; then
+				AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])
+				AC_SUBST(SM_LIBS)
+			fi
+		else
+			enable_sm=no
 		fi
+	fi
 
-		if test "x$enable_sm" = "xyes"; then
-			AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])
-			AC_SUBST(SM_LIBS)
+	dnl #######################################################################
+	dnl # Check for X11 to allow the gestures plugin
+	dnl #######################################################################
+	if test "x$enable_gestures" = "xyes"; then
+		if test "x$with_x" = "xno" ; then
+			enable_gestures=no
 		fi
 	fi
 
@@ -450,10 +484,11 @@
 	dnl #######################################################################
 	if test "x$enable_cap" = "xyes"; then
 		PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[
-													AC_MSG_RESULT(no)
-													enable_cap="no"
-													])
+			AC_MSG_RESULT(no)
+			enable_cap="no"
+			])
 	fi
+        
 
 else # GTK
 	enable_cap=no
@@ -467,6 +502,8 @@
 AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtkui" = "xyes")
 AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$enable_gevolution" = "xyes")
 AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes")
+AM_CONDITIONAL(ENABLE_GESTURES, test "x$enable_gestures" = "xyes")
+
 
 dnl #######################################################################
 dnl # Check for ncurses and other things used by the console UI
@@ -531,11 +568,6 @@
 			fi
 		fi
 	fi
-
-	PKG_CHECK_MODULES(X11, x11,
-		[AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no)])
-	AC_SUBST(X11_LIBS)
-	AC_SUBST(X11_CFLAGS)
 fi
 
 AC_SUBST(GNT_LIBS)
@@ -858,7 +890,7 @@
 fi
 
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
+	STATIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes" ; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -904,6 +936,7 @@
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
 		msn)		static_msn=yes ;;
+		myspace)	static_myspace=yes ;;
 		novell)		static_novell=yes ;;
 		oscar)		static_oscar=yes ;;
 		aim)		static_oscar=yes ;;
@@ -924,6 +957,7 @@
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes")
@@ -939,7 +973,7 @@
 
 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
-	DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
+	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
@@ -963,6 +997,7 @@
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
 		msn)		dynamic_msn=yes ;;
+		myspace)	dynamic_myspace=yes ;;
 		novell)		dynamic_novell=yes ;;
 		oscar)		dynamic_oscar=yes ;;
 		aim)		dynamic_oscar=yes ;;
@@ -983,6 +1018,7 @@
 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes")
 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes")
+AM_CONDITIONAL(DYNAMIC_MYSPACE, test "x$dynamic_myspace" = "xyes")
 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes")
 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes")
 AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes")
@@ -1151,7 +1187,7 @@
 		AC_PATH_PROG([PYTHON], [python], [no])
 	fi
 
-	if test x"$python" = x"no" ; then
+	if test x"$PYTHON" = x"no" ; then
 		AC_MSG_WARN([python interpreter not found in your path])
 		enable_dbus=no
 	fi
@@ -2137,6 +2173,7 @@
 		   pidgin/pixmaps/status/Makefile
 		   pidgin/pixmaps/status/11/Makefile
 		   pidgin/pixmaps/status/11/scalable/Makefile
+		   pidgin/pixmaps/status/11/rtl/Makefile
 		   pidgin/pixmaps/status/16/Makefile
 		   pidgin/pixmaps/status/16/rtl/Makefile
 		   pidgin/pixmaps/status/16/scalable/Makefile
@@ -2187,6 +2224,7 @@
 		   libpurple/protocols/irc/Makefile
 		   libpurple/protocols/jabber/Makefile
 		   libpurple/protocols/msn/Makefile
+		   libpurple/protocols/myspace/Makefile
 		   libpurple/protocols/novell/Makefile
 		   libpurple/protocols/null/Makefile
 		   libpurple/protocols/oscar/Makefile
@@ -2202,6 +2240,7 @@
 		   libpurple/version.h
 		   share/Makefile
 		   share/sounds/Makefile
+		   share/ca-certs/Makefile
 		   finch/Makefile
 		   finch/libgnt/Makefile
 		   finch/libgnt/gnt.pc
@@ -2217,7 +2256,9 @@
 echo
 echo Build GTK+ 2.x UI............. : $enable_gtkui
 echo Build console UI.............. : $enable_consoleui
+echo Build for X11................. : $with_x
 echo
+echo Enable Gestures............... : $enable_gestures
 echo Protocols to build dynamically : $DYNAMIC_PRPLS
 echo Protocols to link statically.. : $STATIC_PRPLS
 echo
diff -ru pidgin-2.1.1/COPYING pidgin-2.2.0/COPYING
--- pidgin-2.1.1/COPYING	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/COPYING	2007-09-14 00:45:38.000000000 -0400
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff -ru pidgin-2.1.1/COPYRIGHT pidgin-2.2.0/COPYRIGHT
--- pidgin-2.1.1/COPYRIGHT	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/COPYRIGHT	2007-09-14 00:45:38.000000000 -0400
@@ -156,12 +156,14 @@
 Casey Harkins
 Andy Harrison
 Andrew Hart (arhart)
+Anders Hasselqvist
 Rene Hausleitner
 Will Hawkins
 G. Sumner Hayes
 Michael R. Head
 Nick Hebner
 Mike Heffner
+Justin Heiner
 Benjamin Herrenschmidt
 Fernando Herrera
 hjheins
@@ -214,6 +216,7 @@
 Nicolas Lichtmaier
 Wesley Lin
 Artem Litvinovich
+Josh Littlefield
 Syd Logan
 Lokheed
 Norberto Lopes
@@ -267,6 +270,7 @@
 Nathan Owens (pianocomp81)
 John Oyler
 Matt Pandina
+Laszlo Pandy
 Ricardo Fernandez Pascual
 Riley Patterson
 Havoc Pennington
@@ -304,6 +308,7 @@
 Bob Rossi
 Jason Roth
 Jean-Francois Roy
+Peter Ruibal
 Sam S.
 Pradyumna Sampath
 Arvind Samptur
@@ -344,6 +349,7 @@
 Sony Computer Entertainment America, Inc.
 Andy Spencer
 Mark Spencer
+Peter Speybrouck
 Lex Spoon
 Chris Stafford
 Kevin Stange
@@ -370,6 +376,7 @@
 Warren Togami
 Stu Tomlinson
 Bill Tompkins
+Gal Topper
 Chris Toshok
 Ken Tossell
 Tom Tromey
Only in pidgin-2.2.0/doc: certificate-signals.dox
diff -ru pidgin-2.1.1/doc/finch.1.in pidgin-2.2.0/doc/finch.1.in
--- pidgin-2.1.1/doc/finch.1.in	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/doc/finch.1.in	2007-09-14 00:45:38.000000000 -0400
@@ -494,7 +494,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 .SH AUTHORS
 Sadrul Habib Chowdhury <\fIsadrul@users.sourceforge.net\fR>
diff -ru pidgin-2.1.1/doc/funniest_home_convos.txt pidgin-2.2.0/doc/funniest_home_convos.txt
--- pidgin-2.1.1/doc/funniest_home_convos.txt	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/doc/funniest_home_convos.txt	2007-08-27 22:35:01.000000000 -0400
@@ -474,3 +474,16 @@
 
 19:23 <-- elb has quit (K-lined)
 
+19:01 <user> whoa
+19:01 <user> okay
+19:01 <user> now when i try to go into the left over files after the 
+             uninstall
+19:01 <user> something is seriously wrong because it says "the files on the 
+             c drive are not formatted, would you like to format?"
+19:03 <user> manually deleting the folder from command gives me a "Data 
+             error (cyclic redundancy check)."
+19:03 <elb> remember, one line per thought
+19:03 <elb> and yes, you have something wrong with your computer, we've 
+            established that
+19:03 <user> its functioning just fine
+
diff -ru pidgin-2.1.1/doc/gtkconv-signals.dox pidgin-2.2.0/doc/gtkconv-signals.dox
--- pidgin-2.1.1/doc/gtkconv-signals.dox	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/doc/gtkconv-signals.dox	2007-08-31 23:54:32.000000000 -0400
@@ -8,6 +8,8 @@
   @signal displaying-chat-msg
   @signal displayed-chat-msg
   @signal conversation-switched
+  @signal conversation-hiding
+  @signal conversation-displayed
  @endsignals
 
  <hr>
@@ -116,5 +118,23 @@
   @param new_conv The now active conversation.
  @endsignaldef
 
+ @signaldef conversation-hiding
+  @signalproto
+void (*conversation_hiding)(PidginConversation *gtkconv);
+  @endsignalproto
+  @signaldesc
+   Emitted immediately before an existing conversation is hidden.
+  @param gtkconv  The PidginConversation
+ @endsignaldef
+
+ @signaldef conversation-displayed
+  @signalproto
+void (*conversation_displayed)(PidginConversation *gtkconv);
+  @endsignalproto
+  @signaldesc
+   Emitted right after the Pidgin UI is reattached to a conversation.
+  @param gtkconv  The PidginConversation
+ @endsignaldef
+
 */
 // vim: syntax=c tw=75 et
diff -ru pidgin-2.1.1/doc/Makefile.am pidgin-2.2.0/doc/Makefile.am
--- pidgin-2.1.1/doc/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/doc/Makefile.am	2007-08-27 22:35:01.000000000 -0400
@@ -3,11 +3,13 @@
 EXTRA_DIST = \
 	C-HOWTO.dox \
 	PERL-HOWTO.dox \
+	SIGNAL-HOWTO.dox \
 	TCL-HOWTO.dox \
 	TracFooter.html \
 	TracHeader.html \
 	account-signals.dox \
 	blist-signals.dox \
+	certificate-signals.dox \
 	cipher-signals.dox \
 	connection-signals.dox \
 	conversation-signals.dox \
diff -ru pidgin-2.1.1/doc/Makefile.in pidgin-2.2.0/doc/Makefile.in
--- pidgin-2.1.1/doc/Makefile.in	2007-08-20 14:13:52.000000000 -0400
+++ pidgin-2.2.0/doc/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -104,6 +104,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -132,6 +134,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -187,14 +191,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -206,7 +208,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -267,6 +268,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -287,6 +289,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -403,11 +407,13 @@
 EXTRA_DIST = \
 	C-HOWTO.dox \
 	PERL-HOWTO.dox \
+	SIGNAL-HOWTO.dox \
 	TCL-HOWTO.dox \
 	TracFooter.html \
 	TracHeader.html \
 	account-signals.dox \
 	blist-signals.dox \
+	certificate-signals.dox \
 	cipher-signals.dox \
 	connection-signals.dox \
 	conversation-signals.dox \
diff -ru pidgin-2.1.1/doc/pidgin.1.in pidgin-2.2.0/doc/pidgin.1.in
--- pidgin-2.1.1/doc/pidgin.1.in	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/doc/pidgin.1.in	2007-09-14 00:45:38.000000000 -0400
@@ -526,7 +526,7 @@
 
 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 .SH AUTHORS
 Pidgin's active developers are:
Only in pidgin-2.2.0/doc: SIGNAL-HOWTO.dox
diff -ru pidgin-2.1.1/finch/finch.c pidgin-2.2.0/finch/finch.c
--- pidgin-2.1.1/finch/finch.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/finch.c	2007-09-14 00:45:38.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
 
@@ -360,9 +360,7 @@
 	purple_set_blist(purple_blist_new());
 	purple_blist_load();
 
-	/* TODO: Move prefs loading into purple_prefs_init() */
-	purple_prefs_load();
-	purple_prefs_update_old();
+	/* TODO: should this be moved into finch_prefs_init() ? */
 	finch_prefs_update_old();
 
 	/* load plugins we had when we quit */
@@ -412,6 +410,8 @@
 {
 	signal(SIGPIPE, SIG_IGN);
 
+	g_thread_init(NULL);
+
 	g_set_prgname("Finch");
 #if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Finch"));
diff -ru pidgin-2.1.1/finch/finch.h pidgin-2.2.0/finch/finch.h
--- pidgin-2.1.1/finch/finch.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/finch.h	2007-09-14 00:45:38.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <glib.h>
 
diff -ru pidgin-2.1.1/finch/gntaccount.c pidgin-2.2.0/finch/gntaccount.c
--- pidgin-2.1.1/finch/gntaccount.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntaccount.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
@@ -169,7 +169,7 @@
 	purple_account_set_remember_password(account,
 			gnt_check_box_get_checked(GNT_CHECK_BOX(dialog->remember)));
 	value = gnt_entry_get_text(GNT_ENTRY(dialog->password));
-	if (value && *value && purple_account_get_remember_password(account))
+	if (value && *value)
 		purple_account_set_password(account, value);
 	else
 		purple_account_set_password(account, NULL);
@@ -222,6 +222,11 @@
 
 	/* XXX: Proxy options */
 
+	if (accounts.window && accounts.tree) {
+		gnt_tree_set_selected(GNT_TREE(accounts.tree), account);
+		gnt_box_give_focus_to_child(GNT_BOX(accounts.window), accounts.tree);
+	}
+
 	gnt_widget_destroy(dialog->window);
 }
 
@@ -710,6 +715,11 @@
 	gnt_widget_show(accounts.window);
 }
 
+void finch_account_dialog_show(PurpleAccount *account)
+{
+	edit_account(account);
+}
+
 static gpointer
 finch_accounts_get_handle()
 {
diff -ru pidgin-2.1.1/finch/gntaccount.h pidgin-2.2.0/finch/gntaccount.h
--- pidgin-2.1.1/finch/gntaccount.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntaccount.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_ACCOUNT_H
 #define _GNT_ACCOUNT_H
@@ -54,6 +54,13 @@
  */
 void finch_accounts_show_all(void);
 
+/**
+ * Show the edit dialog for an account.
+ *
+ * @param account  The account to edit, or @c NULL to create a new account.
+ */
+void finch_account_dialog_show(PurpleAccount *account);
+
 /*@}*/
 
 #endif
diff -ru pidgin-2.1.1/finch/gntblist.c pidgin-2.2.0/finch/gntblist.c
--- pidgin-2.1.1/finch/gntblist.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntblist.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
 
@@ -2139,20 +2139,29 @@
 	}
 }
 
-static void
-account_signed_on_cb(PurpleConnection *pc, gpointer null)
+static gboolean
+auto_join_chats(gpointer data)
 {
 	PurpleBlistNode *node;
+	PurpleConnection *pc = data;
+	PurpleAccount *account = purple_connection_get_account(pc);
 
 	for (node = purple_blist_get_root(); node;
 			node = purple_blist_node_next(node, FALSE)) {
 		if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
 			PurpleChat *chat = (PurpleChat*)node;
-			if (chat->account == purple_connection_get_account(pc) &&
+			if (chat->account == account &&
 					purple_blist_node_get_bool(node, "gnt-autojoin"))
 				serv_join_chat(purple_account_get_connection(chat->account), chat->components);
 		}
 	}
+	return FALSE;
+}
+
+static void
+account_signed_on_cb(PurpleConnection *gc, gpointer null)
+{
+	g_idle_add(auto_join_chats, gc);
 }
 
 static void toggle_pref_cb(GntMenuItem *item, gpointer n)
diff -ru pidgin-2.1.1/finch/gntblist.h pidgin-2.2.0/finch/gntblist.h
--- pidgin-2.1.1/finch/gntblist.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntblist.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_BLIST_H
 #define _GNT_BLIST_H
Only in pidgin-2.2.0/finch: gntcertmgr.c
Only in pidgin-2.2.0/finch: gntcertmgr.h
diff -ru pidgin-2.1.1/finch/gntconn.c pidgin-2.2.0/finch/gntconn.c
--- pidgin-2.1.1/finch/gntconn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntconn.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
 
@@ -30,6 +30,7 @@
 #include "debug.h"
 #include "request.h"
 
+#include "gntaccount.h"
 #include "gntconn.h"
 
 #define INITIAL_RECON_DELAY_MIN  8000
@@ -87,6 +88,18 @@
 }
 
 static void
+ce_modify_account_cb(PurpleAccount *account)
+{
+	finch_account_dialog_show(account);
+}
+
+static void
+ce_enable_account_cb(PurpleAccount *account)
+{
+	purple_account_set_enabled(account, FINCH_UI, TRUE);
+}
+
+static void
 finch_connection_report_disconnect(PurpleConnection *gc, const char *text)
 {
 	FinchAutoRecon *info;
@@ -114,7 +127,13 @@
 		secondary = g_strdup_printf(_("%s\n\n"
 				"Finch will not attempt to reconnect the account until you "
 				"correct the error and re-enable the account."), text);
-		purple_notify_error(NULL, NULL, primary, secondary);
+
+		purple_request_action(account, NULL, primary, secondary, 2,
+							account, NULL, NULL,
+							account, 3,
+							_("OK"), NULL,
+							_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
+							_("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));
 
 		g_free(act);
 		g_free(primary);
diff -ru pidgin-2.1.1/finch/gntconn.h pidgin-2.2.0/finch/gntconn.h
--- pidgin-2.1.1/finch/gntconn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntconn.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_CONN_H
 #define _GNT_CONN_H
diff -ru pidgin-2.1.1/finch/gntconv.c pidgin-2.2.0/finch/gntconv.c
--- pidgin-2.1.1/finch/gntconv.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntconv.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <string.h>
 
@@ -37,6 +37,7 @@
 #include "gntdebug.h"
 #include "gntplugin.h"
 #include "gntprefs.h"
+#include "gntsound.h"
 #include "gntstatus.h"
 #include "gntpounce.h"
 
@@ -62,6 +63,25 @@
 		const char *message, PurpleMessageFlags flags, time_t mtime);
 static void generate_send_to_menu(FinchConv *ggc);
 
+static PurpleBlistNode *
+get_conversation_blist_node(PurpleConversation *conv)
+{
+	PurpleBlistNode *node = NULL;
+
+	switch (purple_conversation_get_type(conv)) {
+		case PURPLE_CONV_TYPE_IM:
+			node = (PurpleBlistNode*)purple_find_buddy(conv->account, conv->name);
+			node = node ? node->parent : NULL;
+			break;
+		case PURPLE_CONV_TYPE_CHAT:
+			node = (PurpleBlistNode*)purple_blist_find_chat(conv->account, conv->name);
+			break;
+		default:
+			break;
+	}
+	return node;
+}
+
 static void
 send_typing_notification(GntWidget *w, FinchConv *ggconv)
 {
@@ -142,6 +162,11 @@
 			}
 			g_free(error);
 		}
+		else if (!purple_account_is_connected(ggconv->active_conv->account))
+		{
+			purple_conversation_write(ggconv->active_conv, "", _("Message was not sent, because you are not signed on."),
+					PURPLE_MESSAGE_ERROR | PURPLE_MESSAGE_NO_LOG, time(NULL));
+		}
 		else
 		{
 			char *escape = g_markup_escape_text(text, -1);
@@ -342,6 +367,56 @@
 }
 
 static void
+toggle_logging_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *fc = ggconv;
+	PurpleConversation *conv = fc->active_conv;
+	gboolean logging = gnt_menuitem_check_get_checked(GNT_MENU_ITEM_CHECK(item));
+	GList *iter;
+
+	if (logging == purple_conversation_is_logging(conv))
+		return;
+
+	/* Xerox */
+	if (logging) {
+		/* Enable logging first so the message below can be logged. */
+		purple_conversation_set_logging(conv, TRUE);
+
+		purple_conversation_write(conv, NULL,
+				_("Logging started. Future messages in this conversation will be logged."),
+				conv->logs ? (PURPLE_MESSAGE_SYSTEM) :
+				(PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG),
+				time(NULL));
+	} else {
+		purple_conversation_write(conv, NULL,
+				_("Logging stopped. Future messages in this conversation will not be logged."),
+				conv->logs ? (PURPLE_MESSAGE_SYSTEM) :
+				(PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LOG),
+				time(NULL));
+
+		/* Disable the logging second, so that the above message can be logged. */
+		purple_conversation_set_logging(conv, FALSE);
+	}
+
+	/* Each conversation with the same person will have the same logging setting */
+	for (iter = fc->list; iter; iter = iter->next) {
+		if (iter->data == conv)
+			continue;
+		purple_conversation_set_logging(iter->data, logging);
+	}
+}
+
+static void
+toggle_sound_cb(GntMenuItem *item, gpointer ggconv)
+{
+	FinchConv *fc = ggconv;
+	PurpleBlistNode *node = get_conversation_blist_node(fc->active_conv);
+	fc->flags ^= FINCH_CONV_NO_SOUND;
+	if (node)
+		purple_blist_node_set_bool(node, "gnt-mute-sound", !!(fc->flags & FINCH_CONV_NO_SOUND));
+}
+
+static void
 send_to_cb(GntMenuItem *m, gpointer n)
 {
 	PurpleAccount *account = g_object_get_data(G_OBJECT(m), "purple_account");
@@ -447,6 +522,18 @@
 
 		generate_send_to_menu(ggc);
 	}
+
+	item = gnt_menuitem_check_new(_("Enable Logging"));
+	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
+			purple_conversation_is_logging(ggc->active_conv));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(item, toggle_logging_cb, ggc);
+
+	item = gnt_menuitem_check_new(_("Enable Sounds"));
+	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
+			!(ggc->flags & FINCH_CONV_NO_SOUND));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(item, toggle_sound_cb, ggc);
 }
 
 static void
@@ -482,6 +569,7 @@
 	PurpleConversationType type;
 	PurpleConversation *cc;
 	PurpleAccount *account;
+	PurpleBlistNode *convnode = NULL;
 
 	if (ggc)
 		return;
@@ -492,6 +580,12 @@
 	else
 		ggc = g_new0(FinchConv, 1);
 
+	/* Each conversation with the same person will have the same logging setting */
+	if (ggc->list) {
+		purple_conversation_set_logging(conv,
+				purple_conversation_is_logging(ggc->list->data));
+	}
+
 	ggc->list = g_list_prepend(ggc->list, conv);
 	ggc->active_conv = conv;
 	conv->ui_data = ggc;
@@ -542,6 +636,7 @@
 		gnt_tree_set_col_width(GNT_TREE(tree), 0, 1);   /* The flag column */
 		gnt_tree_set_compare_func(GNT_TREE(tree), (GCompareFunc)g_utf8_collate);
 		gnt_tree_set_hash_fns(GNT_TREE(tree), g_str_hash, g_str_equal, g_free);
+		gnt_tree_set_search_column(GNT_TREE(tree), 1);
 		GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
 		gnt_box_add_widget(GNT_BOX(hbox), ggc->tv);
 		gnt_box_add_widget(GNT_BOX(hbox), tree);
@@ -581,6 +676,11 @@
 		g_signal_connect(G_OBJECT(ggc->entry), "text_changed", G_CALLBACK(send_typing_notification), ggc);
 	}
 
+	convnode = get_conversation_blist_node(conv);
+	if ((convnode && purple_blist_node_get_bool(convnode, "gnt-mute-sound")) ||
+			!finch_sound_is_enabled())
+		ggc->flags |= FINCH_CONV_NO_SOUND;
+
 	gg_create_menu(ggc);
 
 	g_free(title);
@@ -825,6 +925,23 @@
 	gnt_tree_change_text(GNT_TREE(ggc->u.chat->userlist), (gpointer)user, 0, chat_flag_text(cb->flags));
 }
 
+static void
+finch_conv_present(PurpleConversation *conv)
+{
+	FinchConv *fc = FINCH_CONV(conv);
+	if (fc && fc->window)
+		return gnt_window_present(fc->window);
+}
+
+static gboolean
+finch_conv_has_focus(PurpleConversation *conv)
+{
+	FinchConv *fc = FINCH_CONV(conv);
+	if (fc && fc->window)
+		return gnt_widget_has_focus(fc->window);
+	return FALSE;
+}
+
 static PurpleConversationUiOps conv_ui_ops = 
 {
 	finch_create_conversation,
@@ -836,8 +953,8 @@
 	finch_chat_rename_user,
 	finch_chat_remove_users,
 	finch_chat_update_user,
-	NULL, /* present */
-	NULL, /* has_focus */
+	finch_conv_present, /* present */
+	finch_conv_has_focus, /* has_focus */
 	NULL, /* custom_smiley_add */
 	NULL, /* custom_smiley_write */
 	NULL, /* custom_smiley_close */
@@ -915,6 +1032,7 @@
 {
 	FinchConv *ggconv = conv->ui_data;
 	gnt_text_view_clear(GNT_TEXT_VIEW(ggconv->tv));
+	purple_conversation_clear_message_history(conv);
 	return PURPLE_CMD_STATUS_OK;
 }
 
diff -ru pidgin-2.1.1/finch/gntconv.h pidgin-2.2.0/finch/gntconv.h
--- pidgin-2.1.1/finch/gntconv.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntconv.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_CONV_H
 #define _GNT_CONV_H
@@ -43,6 +43,11 @@
 typedef struct _FinchConvChat FinchConvChat;
 typedef struct _FinchConvIm FinchConvIm;
 
+typedef enum
+{
+	FINCH_CONV_NO_SOUND     = 1 << 0,
+} FinchConversationFlag;
+
 struct _FinchConv
 {
 	GList *list;
@@ -53,7 +58,7 @@
 	GntWidget *tv;            /* text-view */
 	GntWidget *menu;
 	GntWidget *info;
-	void *pad;
+	FinchConversationFlag flags;
 
 	union
 	{
diff -ru pidgin-2.1.1/finch/gntdebug.c pidgin-2.2.0/finch/gntdebug.c
--- pidgin-2.1.1/finch/gntdebug.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntdebug.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
diff -ru pidgin-2.1.1/finch/gntdebug.h pidgin-2.2.0/finch/gntdebug.h
--- pidgin-2.1.1/finch/gntdebug.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntdebug.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_DEBUG_H
 #define _GNT_DEBUG_H
diff -ru pidgin-2.1.1/finch/gntft.c pidgin-2.2.0/finch/gntft.c
--- pidgin-2.1.1/finch/gntft.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntft.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
@@ -193,6 +193,8 @@
 	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(finch_xfer_dialog_destroy), NULL);
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 	gnt_box_set_title(GNT_BOX(window), _("File Transfers"));
+	gnt_box_set_fill(GNT_BOX(window), TRUE);
+	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 
 	xfer_dialog->tree = tree = gnt_tree_new_with_columns(NUM_COLUMNS);
 	gnt_tree_set_column_titles(GNT_TREE(tree), _("Progress"), _("Filename"), _("Size"), _("Speed"), _("Remaining"), _("Status"));
@@ -219,7 +221,7 @@
 					 G_CALLBACK(toggle_clear_finished_cb), NULL);
 	gnt_box_add_widget(GNT_BOX(window), checkbox);
 
-	bbox = gnt_hbox_new(TRUE);
+	bbox = gnt_hbox_new(FALSE);
 
 	xfer_dialog->remove_button = button = gnt_button_new(_("Remove"));
 	g_signal_connect(G_OBJECT(button), "activate",
@@ -425,8 +427,11 @@
 	g_free(remaining_str);
 	g_free(kbsec);
 	if (purple_xfer_is_completed(xfer)) {
+		char *msg = g_strdup_printf(_("The file was saved as %s."), purple_xfer_get_local_filename(xfer));
 		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, _("Finished"));
 		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_REMAINING, _("Finished"));
+		purple_xfer_conversation_write(xfer, msg, FALSE);
+		g_free(msg);
 	} else {
 		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, _("Transferring"));
 	}
diff -ru pidgin-2.1.1/finch/gntft.h pidgin-2.2.0/finch/gntft.h
--- pidgin-2.1.1/finch/gntft.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntft.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _FINCHFT_H_
 #define _FINCHFT_H_
diff -ru pidgin-2.1.1/finch/gntidle.c pidgin-2.2.0/finch/gntidle.c
--- pidgin-2.1.1/finch/gntidle.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntidle.c	2007-09-14 00:45:38.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/finch/gntidle.h pidgin-2.2.0/finch/gntidle.h
--- pidgin-2.1.1/finch/gntidle.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntidle.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_IDLE_H_
 #define _GNT_IDLE_H_
diff -ru pidgin-2.1.1/finch/gntnotify.c pidgin-2.2.0/finch/gntnotify.c
--- pidgin-2.1.1/finch/gntnotify.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntnotify.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
diff -ru pidgin-2.1.1/finch/gntnotify.h pidgin-2.2.0/finch/gntnotify.h
--- pidgin-2.1.1/finch/gntnotify.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntnotify.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_NOTIFY_H
 #define _GNT_NOTIFY_H
diff -ru pidgin-2.1.1/finch/gntplugin.c pidgin-2.2.0/finch/gntplugin.c
--- pidgin-2.1.1/finch/gntplugin.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntplugin.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
diff -ru pidgin-2.1.1/finch/gntplugin.h pidgin-2.2.0/finch/gntplugin.h
--- pidgin-2.1.1/finch/gntplugin.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntplugin.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_PLUGIN_H
 #define _GNT_PLUGIN_H
diff -ru pidgin-2.1.1/finch/gntpounce.c pidgin-2.2.0/finch/gntpounce.c
--- pidgin-2.1.1/finch/gntpounce.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntpounce.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include <gnt.h>
@@ -452,7 +452,7 @@
 
 	gnt_box_add_widget(GNT_BOX(window), gnt_line_new(FALSE));
 	/* Now the button box! */
-	bbox = gnt_hbox_new(TRUE);
+	bbox = gnt_hbox_new(FALSE);
 
 	/* Cancel button */
 	button = gnt_button_new(_("Cancel"));
@@ -613,6 +613,12 @@
 static void
 pounces_manager_add_cb(GntButton *button, gpointer user_data)
 {
+	if (purple_accounts_get_all() == NULL) {
+		purple_notify_error(NULL, _("Cannot create pounce"),
+				_("You do not have any accounts."),
+				_("You must create an account first before you can create a pounce."));
+		return;
+	}
 	finch_pounce_editor_show(NULL, NULL, NULL);
 }
 
@@ -622,7 +628,8 @@
 {
 	PouncesManager *dialog = user_data;
 	PurplePounce *pounce = gnt_tree_get_selection_data(GNT_TREE(dialog->tree));
-	finch_pounce_editor_show(NULL, NULL, pounce);
+	if (pounce)
+		finch_pounce_editor_show(NULL, NULL, pounce);
 }
 
 static void
@@ -645,6 +652,9 @@
 	char *buf;
 
 	pounce = (PurplePounce *)gnt_tree_get_selection_data(GNT_TREE(dialog->tree));
+	if (pounce == NULL)
+		return;
+
 	account = purple_pounce_get_pouncer(pounce);
 	pouncer = purple_account_get_username(account);
 	pouncee = purple_pounce_get_pouncee(pounce);
@@ -696,7 +706,7 @@
 	gnt_box_add_widget(GNT_BOX(win), tree);
 
 	/* Button box. */
-	bbox = gnt_hbox_new(TRUE);
+	bbox = gnt_hbox_new(FALSE);
 
 	/* Add button */
 	button = gnt_button_new(_("Add"));
diff -ru pidgin-2.1.1/finch/gntpounce.h pidgin-2.2.0/finch/gntpounce.h
--- pidgin-2.1.1/finch/gntpounce.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntpounce.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _FINCHPOUNCE_H_
 #define _FINCHPOUNCE_H_
diff -ru pidgin-2.1.1/finch/gntprefs.c pidgin-2.2.0/finch/gntprefs.c
--- pidgin-2.1.1/finch/gntprefs.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntprefs.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "finch.h"
 
diff -ru pidgin-2.1.1/finch/gntprefs.h pidgin-2.2.0/finch/gntprefs.h
--- pidgin-2.1.1/finch/gntprefs.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntprefs.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_PREFS_H
 #define _GNT_PREFS_H
diff -ru pidgin-2.1.1/finch/gntrequest.c pidgin-2.2.0/finch/gntrequest.c
--- pidgin-2.1.1/finch/gntrequest.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntrequest.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
@@ -198,7 +198,7 @@
 
 static void *
 finch_request_choice(const char *title, const char *primary,
-		const char *secondary, unsigned int default_value,
+		const char *secondary, int default_value,
 		const char *ok_text, GCallback ok_cb,
 		const char *cancel_text, GCallback cancel_cb,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -244,7 +244,7 @@
 
 static void*
 finch_request_action(const char *title, const char *primary,
-		const char *secondary, unsigned int default_value,
+		const char *secondary, int default_value,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
 		void *user_data, size_t actioncount,
 		va_list actions)
@@ -368,6 +368,22 @@
 	purple_request_close(PURPLE_REQUEST_FIELDS, button);
 }
 
+static void
+update_selected_account(GntEntry *screenname, const char *start, const char *end,
+		GntComboBox *accountlist)
+{
+	GList *accounts = gnt_tree_get_rows(GNT_TREE(accountlist->dropdown));
+	const char *name = gnt_entry_get_text(screenname);
+	while (accounts) {
+		if (purple_find_buddy(accounts->data, name)) {
+			gnt_combo_box_set_selected(accountlist, accounts->data);
+			gnt_widget_draw(GNT_WIDGET(accountlist));
+			break;
+		}
+		accounts = accounts->next;
+	}
+}
+
 static void *
 finch_request_fields(const char *title, const char *primary,
 		const char *secondary, PurpleRequestFields *allfields,
@@ -378,6 +394,7 @@
 {
 	GntWidget *window, *box;
 	GList *grlist;
+	GntWidget *screenname = NULL, *accountlist = NULL;
 
 	window = setup_request_window(title, primary, secondary, PURPLE_REQUEST_FIELDS);
 
@@ -439,6 +456,7 @@
 						gnt_entry_add_suggest(GNT_ENTRY(entry), purple_buddy_get_name((PurpleBuddy*)node));
 					}
 					gnt_entry_set_always_suggest(GNT_ENTRY(entry), TRUE);
+					screenname = entry;
 				} else if (hint && !strcmp(hint, "group")) {
 					PurpleBlistNode *node;
 					for (node = purple_blist_get_root(); node; node = node->next) {
@@ -556,6 +574,7 @@
 						gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), account);
 				}
 				gnt_widget_set_size(combo, 20, 3); /* ew */
+				accountlist = combo;
 			}
 			else
 			{
@@ -576,6 +595,10 @@
 	setup_default_callback(window, cancel_cb, userdata);
 	gnt_widget_show(window);
 
+	if (screenname && accountlist) {
+		g_signal_connect(screenname, "completion", G_CALLBACK(update_selected_account), accountlist);
+	}
+
 	g_object_set_data(G_OBJECT(window), "fields", allfields);
 	
 	return window;
diff -ru pidgin-2.1.1/finch/gntrequest.h pidgin-2.2.0/finch/gntrequest.h
--- pidgin-2.1.1/finch/gntrequest.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntrequest.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_REQUEST_H
 #define _GNT_REQUEST_H
diff -ru pidgin-2.1.1/finch/gntsound.c pidgin-2.2.0/finch/gntsound.c
--- pidgin-2.1.1/finch/gntsound.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntsound.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "finch.h"
@@ -40,6 +40,8 @@
 #include "sound.h"
 #include "util.h"
 
+#include "gntconv.h"
+
 #include "gntbox.h"
 #include "gntwindow.h"
 #include "gntcombobox.h"
@@ -173,7 +175,8 @@
 
 		has_focus = purple_conversation_has_focus(conv);
 
-		if (has_focus && !purple_prefs_get_bool(make_pref("/conv_focus")))
+		if ((gntconv->flags & FINCH_CONV_NO_SOUND) ||
+			(has_focus && !purple_prefs_get_bool(make_pref("/conv_focus"))))
 		{
 			return;
 		}
@@ -409,14 +412,14 @@
 	GError *err = NULL;
 
 	switch (GST_MESSAGE_TYPE (msg)) {
-	case GST_MESSAGE_EOS:
-		gst_element_set_state(play, GST_STATE_NULL);
-		gst_object_unref(GST_OBJECT(play));
-		break;
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error(msg, &err, NULL);
 		purple_debug_error("gstreamer", "%s\n", err->message);
 		g_error_free(err);
+		/* fall-through and clean up */
+	case GST_MESSAGE_EOS:
+		gst_element_set_state(play, GST_STATE_NULL);
+		gst_object_unref(GST_OBJECT(play));
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);
@@ -670,28 +673,34 @@
 {
 	PurpleSoundEventID id = GPOINTER_TO_INT(gnt_tree_get_selection_data(GNT_TREE(pref_dialog->events)));
 	FinchSoundEvent * event = &sounds[id];
-	char *enabled, *file, *tmpfile;
+	char *enabled, *file, *tmpfile, *volpref;
 	gboolean temp_value;
+	int volume;
 
 	enabled = g_strdup_printf(FINCH_PREFS_ROOT "/sound/profiles/%s/enabled/%s",
 			finch_sound_get_active_profile(), event->pref);
 	file = g_strdup_printf(FINCH_PREFS_ROOT "/sound/profiles/%s/file/%s",
 			finch_sound_get_active_profile(), event->pref);
+	volpref = g_strdup(make_pref("/volume"));
 
 	temp_value = purple_prefs_get_bool(enabled);
-	tmpfile = g_strdup(purple_prefs_get_string(file));
+	tmpfile = g_strdup(purple_prefs_get_path(file));
+	volume = purple_prefs_get_int(volpref);
 
-	purple_prefs_set_string(file, event->file);
+	purple_prefs_set_path(file, event->file);
 	if (!temp_value) purple_prefs_set_bool(enabled, TRUE);
+	purple_prefs_set_int(volpref, gnt_slider_get_value(GNT_SLIDER(pref_dialog->volume)));
 
 	purple_sound_play_event(id, NULL);
 
 	if (!temp_value) purple_prefs_set_bool(enabled, FALSE);
-	purple_prefs_set_string(file, tmpfile);
+	purple_prefs_set_path(file, tmpfile);
+	purple_prefs_set_int(volpref, volume);
 
 	g_free(enabled);
 	g_free(file);
 	g_free(tmpfile);
+	g_free(volpref);
 }
 
 static void
@@ -990,6 +999,8 @@
 
 	pref_dialog->volume = slider = gnt_slider_new(FALSE, 100, 0);
 	gnt_slider_set_step(GNT_SLIDER(slider), 5);
+	gnt_slider_set_small_step(GNT_SLIDER(slider), 1);
+	gnt_slider_set_large_step(GNT_SLIDER(slider), 20);
 	label = gnt_label_new("");
 	gnt_slider_reflect_label(GNT_SLIDER(slider), GNT_LABEL(label));
 	gnt_box_set_pad(GNT_BOX(tmpbox), 1);
@@ -1053,7 +1064,22 @@
 	load_pref_window(finch_sound_get_active_profile());
 
 	gnt_widget_show(win);
-}	
+}
+
+gboolean finch_sound_is_enabled(void)
+{
+	const char *pref = make_pref("/method");
+	const char *method = purple_prefs_get_string(pref);
+
+	if (!method)
+		return FALSE;
+	if (strcmp(method, "nosound") == 0)
+		return FALSE;
+	if (purple_prefs_get_int(make_pref("/volume")) <= 0)
+		return FALSE;
+
+	return TRUE;
+}
 
 static PurpleSoundUiOps sound_ui_ops =
 {
diff -ru pidgin-2.1.1/finch/gntsound.h pidgin-2.2.0/finch/gntsound.h
--- pidgin-2.1.1/finch/gntsound.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntsound.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_SOUND_H
 #define _GNT_SOUND_H
@@ -55,6 +55,14 @@
 GList *finch_sound_get_profiles(void);
 
 /**
+ * Determine whether any sound will be played or not.
+ *
+ * @return Returns FALSE if preference is set to 'No sound', or if volume is
+ *         set to zero.
+ */
+gboolean finch_sound_is_enabled(void);
+
+/**
  * Gets GNT sound UI ops.
  *
  * @return The UI operations structure.
diff -ru pidgin-2.1.1/finch/gntstatus.c pidgin-2.2.0/finch/gntstatus.c
--- pidgin-2.1.1/finch/gntstatus.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntstatus.c	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gnt.h>
 #include <gntbox.h>
@@ -299,6 +299,7 @@
 	{
 		purple_notify_error(edit, _("Error"), _("Invalid title"),
 				_("Please enter a non-empty title for the status."));
+		gnt_box_give_focus_to_child(GNT_BOX(edit->window), edit->title);
 		return;
 	}
 
@@ -307,6 +308,7 @@
 	{
 		purple_notify_error(edit, _("Error"), _("Duplicate title"),
 				_("Please enter a different title for the status."));
+		gnt_box_give_focus_to_child(GNT_BOX(edit->window), edit->title);
 		return;
 	}
 	
@@ -447,6 +449,7 @@
 		sub->window = window = gnt_vbox_new(FALSE);
 		gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 		gnt_box_set_title(GNT_BOX(window), _("Substatus"));  /* XXX: a better title */
+		gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 
 		box = gnt_hbox_new(FALSE);
 		gnt_box_add_widget(GNT_BOX(box), gnt_label_new(_("Account:")));
@@ -523,7 +526,7 @@
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 	gnt_box_set_title(GNT_BOX(window), _("Edit Status"));
 	gnt_box_set_fill(GNT_BOX(window), TRUE);
-	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_LEFT);
+	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 	gnt_box_set_pad(GNT_BOX(window), 0);
 
 	edits = g_list_append(edits, edit);
diff -ru pidgin-2.1.1/finch/gntstatus.h pidgin-2.2.0/finch/gntstatus.h
--- pidgin-2.1.1/finch/gntstatus.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntstatus.h	2007-09-14 00:45:38.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_STATUS_H
 #define _GNT_STATUS_H
diff -ru pidgin-2.1.1/finch/gntui.c pidgin-2.2.0/finch/gntui.c
--- pidgin-2.1.1/finch/gntui.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntui.c	2007-09-14 00:45:38.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
@@ -25,6 +25,7 @@
 
 #include "gntaccount.h"
 #include "gntblist.h"
+#include "gntcertmgr.h"
 #include "gntconn.h"
 #include "gntconv.h"
 #include "gntdebug.h"
@@ -81,6 +82,7 @@
 	gnt_register_action(_("Accounts"), finch_accounts_show_all);
 	gnt_register_action(_("Buddy List"), finch_blist_show);
 	gnt_register_action(_("Buddy Pounces"), finch_pounces_manager_show);
+	gnt_register_action(_("Certificates"), finch_certmgr_show);
 	gnt_register_action(_("Debug Window"), finch_debug_window_show);
 	gnt_register_action(_("File Transfers"), finch_xfer_dialog_show);
 	gnt_register_action(_("Plugins"), finch_plugins_show_all);
@@ -89,8 +91,6 @@
 	gnt_register_action(_("Statuses"), finch_savedstatus_show_all);
 
 #ifdef STANDALONE
-
-	finch_plugins_save_loaded();
 }
 
 void gnt_ui_uninit()
diff -ru pidgin-2.1.1/finch/gntui.h pidgin-2.2.0/finch/gntui.h
--- pidgin-2.1.1/finch/gntui.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/gntui.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GNT_UI_H
 #define _GNT_UI_H
diff -ru pidgin-2.1.1/finch/libgnt/COPYING pidgin-2.2.0/finch/libgnt/COPYING
--- pidgin-2.1.1/finch/libgnt/COPYING	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/COPYING	2007-09-14 00:45:39.000000000 -0400
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff -ru pidgin-2.1.1/finch/libgnt/gntbindable.c pidgin-2.2.0/finch/libgnt/gntbindable.c
--- pidgin-2.1.1/finch/libgnt/gntbindable.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbindable.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <string.h>
diff -ru pidgin-2.1.1/finch/libgnt/gntbindable.h pidgin-2.2.0/finch/libgnt/gntbindable.h
--- pidgin-2.1.1/finch/libgnt/gntbindable.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbindable.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_BINDABLE_H
diff -ru pidgin-2.1.1/finch/libgnt/gntbox.c pidgin-2.2.0/finch/libgnt/gntbox.c
--- pidgin-2.1.1/finch/libgnt/gntbox.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbox.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntbox.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntbox.h pidgin-2.2.0/finch/libgnt/gntbox.h
--- pidgin-2.1.1/finch/libgnt/gntbox.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbox.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_BOX_H
diff -ru pidgin-2.1.1/finch/libgnt/gntbutton.c pidgin-2.2.0/finch/libgnt/gntbutton.c
--- pidgin-2.1.1/finch/libgnt/gntbutton.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbutton.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <stdlib.h>
diff -ru pidgin-2.1.1/finch/libgnt/gntbutton.h pidgin-2.2.0/finch/libgnt/gntbutton.h
--- pidgin-2.1.1/finch/libgnt/gntbutton.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntbutton.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_BUTTON_H
diff -ru pidgin-2.1.1/finch/libgnt/gntcheckbox.c pidgin-2.2.0/finch/libgnt/gntcheckbox.c
--- pidgin-2.1.1/finch/libgnt/gntcheckbox.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcheckbox.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntcheckbox.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntcheckbox.h pidgin-2.2.0/finch/libgnt/gntcheckbox.h
--- pidgin-2.1.1/finch/libgnt/gntcheckbox.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcheckbox.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_CHECK_BOX_H
diff -ru pidgin-2.1.1/finch/libgnt/gntclipboard.c pidgin-2.2.0/finch/libgnt/gntclipboard.c
--- pidgin-2.1.1/finch/libgnt/gntclipboard.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntclipboard.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntclipboard.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntclipboard.h pidgin-2.2.0/finch/libgnt/gntclipboard.h
--- pidgin-2.1.1/finch/libgnt/gntclipboard.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntclipboard.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_CLIPBOARD_H
diff -ru pidgin-2.1.1/finch/libgnt/gntcolors.c pidgin-2.2.0/finch/libgnt/gntcolors.c
--- pidgin-2.1.1/finch/libgnt/gntcolors.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcolors.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "config.h"
@@ -133,6 +133,7 @@
 		restore_colors();
 }
 
+#if GLIB_CHECK_VERSION(2,6,0)
 static int
 get_color(char *key)
 {
@@ -164,7 +165,6 @@
 	return color;
 }
 
-#if GLIB_CHECK_VERSION(2,6,0)
 void gnt_colors_parse(GKeyFile *kfile)
 {
 	GError *error = NULL;
diff -ru pidgin-2.1.1/finch/libgnt/gntcolors.h pidgin-2.2.0/finch/libgnt/gntcolors.h
--- pidgin-2.1.1/finch/libgnt/gntcolors.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcolors.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_COLORS_H
diff -ru pidgin-2.1.1/finch/libgnt/gntcombobox.c pidgin-2.2.0/finch/libgnt/gntcombobox.c
--- pidgin-2.1.1/finch/libgnt/gntcombobox.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcombobox.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntbox.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntcombobox.h pidgin-2.2.0/finch/libgnt/gntcombobox.h
--- pidgin-2.1.1/finch/libgnt/gntcombobox.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntcombobox.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_COMBO_BOX_H
diff -ru pidgin-2.1.1/finch/libgnt/gntentry.c pidgin-2.2.0/finch/libgnt/gntentry.c
--- pidgin-2.1.1/finch/libgnt/gntentry.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntentry.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <ctype.h>
diff -ru pidgin-2.1.1/finch/libgnt/gntentry.h pidgin-2.2.0/finch/libgnt/gntentry.h
--- pidgin-2.1.1/finch/libgnt/gntentry.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntentry.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_ENTRY_H
diff -ru pidgin-2.1.1/finch/libgnt/gntfilesel.c pidgin-2.2.0/finch/libgnt/gntfilesel.c
--- pidgin-2.1.1/finch/libgnt/gntfilesel.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntfilesel.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntbutton.h"
@@ -200,7 +200,7 @@
 	const char *tmp;
 	tmp = sel->suggest ? sel->suggest :
 		(const char*)gnt_tree_get_selection_data(sel->dirsonly ? GNT_TREE(sel->dirs) : GNT_TREE(sel->files));
-	old = g_strdup_printf("%s%s%s", sel->current, sel->current[1] ? G_DIR_SEPARATOR_S : "", tmp ? tmp : "");
+	old = g_strdup_printf("%s%s%s", SAFE(sel->current), SAFE(sel->current)[1] ? G_DIR_SEPARATOR_S : "", tmp ? tmp : "");
 	gnt_entry_set_text(GNT_ENTRY(sel->location), old);
 	g_free(old);
 }
diff -ru pidgin-2.1.1/finch/libgnt/gntfilesel.h pidgin-2.2.0/finch/libgnt/gntfilesel.h
--- pidgin-2.1.1/finch/libgnt/gntfilesel.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntfilesel.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_FILE_SEL_H
diff -ru pidgin-2.1.1/finch/libgnt/gnt.h pidgin-2.2.0/finch/libgnt/gnt.h
--- pidgin-2.1.1/finch/libgnt/gnt.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gnt.h	2007-09-14 00:45:39.000000000 -0400
@@ -27,7 +27,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
@@ -37,6 +37,15 @@
 #include "gntkeys.h"
 
 /**
+ * Get things to compile in Glib < 2.8
+ */
+#if !GLIB_CHECK_VERSION(2,8,0)
+	#define G_PARAM_STATIC_NAME  G_PARAM_PRIVATE
+	#define G_PARAM_STATIC_NICK  G_PARAM_PRIVATE
+	#define G_PARAM_STATIC_BLURB  G_PARAM_PRIVATE
+#endif
+
+/**
  * 
  */
 void gnt_init(void);
diff -ru pidgin-2.1.1/finch/libgnt/gntkeys.c pidgin-2.2.0/finch/libgnt/gntkeys.c
--- pidgin-2.1.1/finch/libgnt/gntkeys.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntkeys.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntkeys.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntkeys.h pidgin-2.2.0/finch/libgnt/gntkeys.h
--- pidgin-2.1.1/finch/libgnt/gntkeys.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntkeys.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_KEYS_H
diff -ru pidgin-2.1.1/finch/libgnt/gntlabel.c pidgin-2.2.0/finch/libgnt/gntlabel.c
--- pidgin-2.1.1/finch/libgnt/gntlabel.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntlabel.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntlabel.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntlabel.h pidgin-2.2.0/finch/libgnt/gntlabel.h
--- pidgin-2.1.1/finch/libgnt/gntlabel.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntlabel.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_LABEL_H
diff -ru pidgin-2.1.1/finch/libgnt/gntline.c pidgin-2.2.0/finch/libgnt/gntline.c
--- pidgin-2.1.1/finch/libgnt/gntline.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntline.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntline.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntline.h pidgin-2.2.0/finch/libgnt/gntline.h
--- pidgin-2.1.1/finch/libgnt/gntline.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntline.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_LINE_H
diff -ru pidgin-2.1.1/finch/libgnt/gntmain.c pidgin-2.2.0/finch/libgnt/gntmain.c
--- pidgin-2.1.1/finch/libgnt/gntmain.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmain.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #define _GNU_SOURCE
diff -ru pidgin-2.1.1/finch/libgnt/gntmarshal.c pidgin-2.2.0/finch/libgnt/gntmarshal.c
--- pidgin-2.1.1/finch/libgnt/gntmarshal.c	2007-08-20 14:14:50.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmarshal.c	2007-05-03 02:20:55.000000000 -0400
@@ -48,7 +48,7 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* BOOLEAN:VOID (./genmarshal:1) */
+/* BOOLEAN:VOID (/dev/stdin:1) */
 void
 gnt_closure_marshal_BOOLEAN__VOID (GClosure     *closure,
                                    GValue       *return_value,
@@ -85,7 +85,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:STRING (./genmarshal:2) */
+/* BOOLEAN:STRING (/dev/stdin:2) */
 void
 gnt_closure_marshal_BOOLEAN__STRING (GClosure     *closure,
                                      GValue       *return_value,
@@ -124,7 +124,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* VOID:INT,INT,INT,INT (./genmarshal:3) */
+/* VOID:INT,INT,INT,INT (/dev/stdin:3) */
 void
 gnt_closure_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
                                            GValue       *return_value,
@@ -165,7 +165,7 @@
             data2);
 }
 
-/* VOID:INT,INT (./genmarshal:4) */
+/* VOID:INT,INT (/dev/stdin:4) */
 void
 gnt_closure_marshal_VOID__INT_INT (GClosure     *closure,
                                    GValue       *return_value,
@@ -202,7 +202,7 @@
             data2);
 }
 
-/* VOID:POINTER,POINTER (./genmarshal:5) */
+/* VOID:POINTER,POINTER (/dev/stdin:5) */
 void
 gnt_closure_marshal_VOID__POINTER_POINTER (GClosure     *closure,
                                            GValue       *return_value,
@@ -239,7 +239,7 @@
             data2);
 }
 
-/* BOOLEAN:INT,INT (./genmarshal:6) */
+/* BOOLEAN:INT,INT (/dev/stdin:6) */
 void
 gnt_closure_marshal_BOOLEAN__INT_INT (GClosure     *closure,
                                       GValue       *return_value,
@@ -280,7 +280,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:INT,INT,INT (./genmarshal:7) */
+/* BOOLEAN:INT,INT,INT (/dev/stdin:7) */
 void
 gnt_closure_marshal_BOOLEAN__INT_INT_INT (GClosure     *closure,
                                           GValue       *return_value,
@@ -323,7 +323,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:POINTER,POINTER,POINTER (./genmarshal:8) */
+/* BOOLEAN:POINTER,POINTER,POINTER (/dev/stdin:8) */
 void
 gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER (GClosure     *closure,
                                                       GValue       *return_value,
@@ -366,7 +366,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* BOOLEAN:INT,INT,INT,POINTER (./genmarshal:9) */
+/* BOOLEAN:INT,INT,INT,POINTER (/dev/stdin:9) */
 void
 gnt_closure_marshal_BOOLEAN__INT_INT_INT_POINTER (GClosure     *closure,
                                                   GValue       *return_value,
@@ -411,7 +411,7 @@
   g_value_set_boolean (return_value, v_return);
 }
 
-/* VOID:STRING,STRING (./genmarshal:10) */
+/* VOID:STRING,STRING (/dev/stdin:10) */
 void
 gnt_closure_marshal_VOID__STRING_STRING (GClosure     *closure,
                                          GValue       *return_value,
@@ -448,7 +448,7 @@
             data2);
 }
 
-/* VOID:POINTER,BOOLEAN (./genmarshal:11) */
+/* VOID:POINTER,BOOLEAN (/dev/stdin:11) */
 void
 gnt_closure_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
                                            GValue       *return_value,
diff -ru pidgin-2.1.1/finch/libgnt/gntmarshal.h pidgin-2.2.0/finch/libgnt/gntmarshal.h
--- pidgin-2.1.1/finch/libgnt/gntmarshal.h	2007-08-20 14:14:50.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmarshal.h	2007-05-03 02:20:55.000000000 -0400
@@ -6,7 +6,7 @@
 
 G_BEGIN_DECLS
 
-/* BOOLEAN:VOID (./genmarshal:1) */
+/* BOOLEAN:VOID (/dev/stdin:1) */
 extern void gnt_closure_marshal_BOOLEAN__VOID (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -14,7 +14,7 @@
                                                gpointer      invocation_hint,
                                                gpointer      marshal_data);
 
-/* BOOLEAN:STRING (./genmarshal:2) */
+/* BOOLEAN:STRING (/dev/stdin:2) */
 extern void gnt_closure_marshal_BOOLEAN__STRING (GClosure     *closure,
                                                  GValue       *return_value,
                                                  guint         n_param_values,
@@ -22,7 +22,7 @@
                                                  gpointer      invocation_hint,
                                                  gpointer      marshal_data);
 
-/* VOID:INT,INT,INT,INT (./genmarshal:3) */
+/* VOID:INT,INT,INT,INT (/dev/stdin:3) */
 extern void gnt_closure_marshal_VOID__INT_INT_INT_INT (GClosure     *closure,
                                                        GValue       *return_value,
                                                        guint         n_param_values,
@@ -30,7 +30,7 @@
                                                        gpointer      invocation_hint,
                                                        gpointer      marshal_data);
 
-/* VOID:INT,INT (./genmarshal:4) */
+/* VOID:INT,INT (/dev/stdin:4) */
 extern void gnt_closure_marshal_VOID__INT_INT (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -38,7 +38,7 @@
                                                gpointer      invocation_hint,
                                                gpointer      marshal_data);
 
-/* VOID:POINTER,POINTER (./genmarshal:5) */
+/* VOID:POINTER,POINTER (/dev/stdin:5) */
 extern void gnt_closure_marshal_VOID__POINTER_POINTER (GClosure     *closure,
                                                        GValue       *return_value,
                                                        guint         n_param_values,
@@ -46,7 +46,7 @@
                                                        gpointer      invocation_hint,
                                                        gpointer      marshal_data);
 
-/* BOOLEAN:INT,INT (./genmarshal:6) */
+/* BOOLEAN:INT,INT (/dev/stdin:6) */
 extern void gnt_closure_marshal_BOOLEAN__INT_INT (GClosure     *closure,
                                                   GValue       *return_value,
                                                   guint         n_param_values,
@@ -54,7 +54,7 @@
                                                   gpointer      invocation_hint,
                                                   gpointer      marshal_data);
 
-/* BOOLEAN:INT,INT,INT (./genmarshal:7) */
+/* BOOLEAN:INT,INT,INT (/dev/stdin:7) */
 extern void gnt_closure_marshal_BOOLEAN__INT_INT_INT (GClosure     *closure,
                                                       GValue       *return_value,
                                                       guint         n_param_values,
@@ -62,7 +62,7 @@
                                                       gpointer      invocation_hint,
                                                       gpointer      marshal_data);
 
-/* BOOLEAN:POINTER,POINTER,POINTER (./genmarshal:8) */
+/* BOOLEAN:POINTER,POINTER,POINTER (/dev/stdin:8) */
 extern void gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER (GClosure     *closure,
                                                                   GValue       *return_value,
                                                                   guint         n_param_values,
@@ -70,7 +70,7 @@
                                                                   gpointer      invocation_hint,
                                                                   gpointer      marshal_data);
 
-/* BOOLEAN:INT,INT,INT,POINTER (./genmarshal:9) */
+/* BOOLEAN:INT,INT,INT,POINTER (/dev/stdin:9) */
 extern void gnt_closure_marshal_BOOLEAN__INT_INT_INT_POINTER (GClosure     *closure,
                                                               GValue       *return_value,
                                                               guint         n_param_values,
@@ -78,7 +78,7 @@
                                                               gpointer      invocation_hint,
                                                               gpointer      marshal_data);
 
-/* VOID:STRING,STRING (./genmarshal:10) */
+/* VOID:STRING,STRING (/dev/stdin:10) */
 extern void gnt_closure_marshal_VOID__STRING_STRING (GClosure     *closure,
                                                      GValue       *return_value,
                                                      guint         n_param_values,
@@ -86,7 +86,7 @@
                                                      gpointer      invocation_hint,
                                                      gpointer      marshal_data);
 
-/* VOID:POINTER,BOOLEAN (./genmarshal:11) */
+/* VOID:POINTER,BOOLEAN (/dev/stdin:11) */
 extern void gnt_closure_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
                                                        GValue       *return_value,
                                                        guint         n_param_values,
diff -ru pidgin-2.1.1/finch/libgnt/gntmenu.c pidgin-2.2.0/finch/libgnt/gntmenu.c
--- pidgin-2.1.1/finch/libgnt/gntmenu.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenu.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntmenu.h"
@@ -221,8 +221,13 @@
 {
 	/* check for a trigger key */
 	GList *iter;
+	GList *find;
 	GList *nth = g_list_find(menu->list, gnt_tree_get_selection_data(GNT_TREE(menu)));
-	GList *find = find_item_with_trigger(nth->next, NULL, trigger);
+
+	if (nth == NULL)
+		return FALSE;
+		
+	find = find_item_with_trigger(nth->next, NULL, trigger);
 	if (!find)
 		find = find_item_with_trigger(menu->list, nth->next, trigger);
 	if (!find)
diff -ru pidgin-2.1.1/finch/libgnt/gntmenu.h pidgin-2.2.0/finch/libgnt/gntmenu.h
--- pidgin-2.1.1/finch/libgnt/gntmenu.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenu.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_MENU_H
diff -ru pidgin-2.1.1/finch/libgnt/gntmenuitem.c pidgin-2.2.0/finch/libgnt/gntmenuitem.c
--- pidgin-2.1.1/finch/libgnt/gntmenuitem.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenuitem.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntmenu.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntmenuitemcheck.c pidgin-2.2.0/finch/libgnt/gntmenuitemcheck.c
--- pidgin-2.1.1/finch/libgnt/gntmenuitemcheck.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenuitemcheck.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntmenuitemcheck.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntmenuitemcheck.h pidgin-2.2.0/finch/libgnt/gntmenuitemcheck.h
--- pidgin-2.1.1/finch/libgnt/gntmenuitemcheck.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenuitemcheck.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_MENU_ITEM_CHECK_H
diff -ru pidgin-2.1.1/finch/libgnt/gntmenuitem.h pidgin-2.2.0/finch/libgnt/gntmenuitem.h
--- pidgin-2.1.1/finch/libgnt/gntmenuitem.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntmenuitem.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_MENUITEM_H
diff -ru pidgin-2.1.1/finch/libgnt/gntslider.c pidgin-2.2.0/finch/libgnt/gntslider.c
--- pidgin-2.1.1/finch/libgnt/gntslider.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntslider.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntcolors.h"
@@ -125,22 +125,66 @@
 step_back(GntBindable *bindable, GList *null)
 {
 	GntSlider *slider = GNT_SLIDER(bindable);
-	if (slider->current <= slider->min)
-		return FALSE;
 	gnt_slider_advance_step(slider, -1);
 	return TRUE;
 }
 
 static gboolean
+small_step_back(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->current - slider->smallstep);
+	return TRUE;
+}
+
+static gboolean
+large_step_back(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->current - slider->largestep);
+	return TRUE;
+}
+
+static gboolean
 step_forward(GntBindable *bindable, GList *list)
 {
 	GntSlider *slider = GNT_SLIDER(bindable);
-	if (slider->current >= slider->max)
-		return FALSE;
 	gnt_slider_advance_step(slider, 1);
 	return TRUE;
 }
 
+static gboolean
+small_step_forward(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->current + slider->smallstep);
+	return TRUE;
+}
+
+static gboolean
+large_step_forward(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->current + slider->largestep);
+	return TRUE;
+}
+
+static gboolean
+move_min_value(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->min);
+	return TRUE;
+}
+
+static gboolean
+move_max_value(GntBindable *bindable, GList *null)
+{
+	GntSlider *slider = GNT_SLIDER(bindable);
+	gnt_slider_set_value(slider, slider->max);
+	return TRUE;
+}
+
 static void
 gnt_slider_class_init(GntSliderClass *klass)
 {
@@ -165,8 +209,14 @@
 	gnt_bindable_register_binding(bindable, "step-backward", GNT_KEY_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "step-forward", step_forward, GNT_KEY_RIGHT, NULL);
 	gnt_bindable_register_binding(bindable, "step-forward", GNT_KEY_UP, NULL);
-
-	/* XXX: how would home/end work? */
+	gnt_bindable_class_register_action(bindable, "small-step-backward", small_step_back, GNT_KEY_CTRL_LEFT, NULL);
+	gnt_bindable_register_binding(bindable, "small-step-backward", GNT_KEY_CTRL_DOWN, NULL);
+	gnt_bindable_class_register_action(bindable, "small-step-forward", small_step_forward, GNT_KEY_CTRL_RIGHT, NULL);
+	gnt_bindable_register_binding(bindable, "small-step-forward", GNT_KEY_CTRL_UP, NULL);
+	gnt_bindable_class_register_action(bindable, "large-step-backward", large_step_back, GNT_KEY_PGDOWN, NULL);
+	gnt_bindable_class_register_action(bindable, "large-step-forward", large_step_forward, GNT_KEY_PGUP, NULL);
+	gnt_bindable_class_register_action(bindable, "min-value", move_min_value, GNT_KEY_HOME, NULL);
+	gnt_bindable_class_register_action(bindable, "max-value", move_max_value, GNT_KEY_END, NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 }
@@ -233,10 +283,14 @@
 
 void gnt_slider_set_value(GntSlider *slider, int value)
 {
+	int old;
 	if (slider->current == value)
 		return;
+	old = slider->current;
 	slider->current = value;
 	sanitize_value(slider);
+	if (old == slider->current)
+		return;
 	redraw_slider(slider);
 	slider_value_changed(slider);
 }
@@ -248,10 +302,7 @@
 
 int gnt_slider_advance_step(GntSlider *slider, int steps)
 {
-	slider->current += steps * slider->step;
-	sanitize_value(slider);
-	redraw_slider(slider);
-	slider_value_changed(slider);
+	gnt_slider_set_value(slider, slider->current + steps * slider->step);
 	return slider->current;
 }
 
@@ -260,6 +311,16 @@
 	slider->step = step;
 }
 
+void gnt_slider_set_small_step(GntSlider *slider, int step)
+{
+	slider->smallstep = step;
+}
+
+void gnt_slider_set_large_step(GntSlider *slider, int step)
+{
+	slider->largestep = step;
+}
+
 void gnt_slider_set_range(GntSlider *slider, int max, int min)
 {
 	slider->max = MAX(max, min);
diff -ru pidgin-2.1.1/finch/libgnt/gntslider.h pidgin-2.2.0/finch/libgnt/gntslider.h
--- pidgin-2.1.1/finch/libgnt/gntslider.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntslider.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_SLIDER_H
@@ -56,6 +56,8 @@
 	int min;        /* minimum value */
 	int step;       /* amount to change at each step */
 	int current;    /* current value */
+	int smallstep;
+	int largestep;
 };
 
 struct _GntSliderClass
@@ -103,11 +105,27 @@
  * Sets the amount of change at each step.
  * 
  * @param slider  The slider
- * @param step    The amount for each ste
+ * @param step    The amount for each step
  */
 void gnt_slider_set_step(GntSlider *slider, int step);
 
 /**
+ * Sets the amount of change a small step.
+ * 
+ * @param slider  The slider
+ * @param step    The amount for a small step (for the slider)
+ */
+void gnt_slider_set_small_step(GntSlider *slider, int step);
+
+/**
+ * Sets the amount of change a large step.
+ * 
+ * @param slider  The slider
+ * @param step    The amount for a large step (for the slider)
+ */
+void gnt_slider_set_large_step(GntSlider *slider, int step);
+
+/**
  * Advance the slider forward or backward.
  *
  * @param slider   The slider
diff -ru pidgin-2.1.1/finch/libgnt/gntstyle.c pidgin-2.2.0/finch/libgnt/gntstyle.c
--- pidgin-2.1.1/finch/libgnt/gntstyle.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntstyle.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntstyle.h"
@@ -55,6 +55,8 @@
 	if (!group)
 		group = "general";
 	return g_key_file_get_value(gkfile, group, key, NULL);
+#else
+	return NULL;
 #endif
 }
 
@@ -93,6 +95,7 @@
 	return def;
 }
 
+#if GLIB_CHECK_VERSION(2,6,0)
 static void
 refine(char *text)
 {
@@ -133,6 +136,7 @@
 {
 	return (char *)gnt_key_translate(key);
 }
+#endif
 
 void gnt_style_read_workspaces(GntWM *wm)
 {
diff -ru pidgin-2.1.1/finch/libgnt/gntstyle.h pidgin-2.2.0/finch/libgnt/gntstyle.h
--- pidgin-2.1.1/finch/libgnt/gntstyle.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntstyle.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gnt.h"
diff -ru pidgin-2.1.1/finch/libgnt/gnttextview.c pidgin-2.2.0/finch/libgnt/gnttextview.c
--- pidgin-2.1.1/finch/libgnt/gnttextview.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gnttextview.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntstyle.h"
@@ -549,7 +549,8 @@
 		if ((end = strchr(start, '\r')) != NULL ||
 			(end = strchr(start, '\n')) != NULL) {
 			len = gnt_util_onscreen_width(start, end - has_scroll);
-			if (len >= widget->priv.width - line->length - has_scroll) {
+			if (widget->priv.width > 0 &&
+					len >= widget->priv.width - line->length - has_scroll) {
 				end = NULL;
 			}
 		}
diff -ru pidgin-2.1.1/finch/libgnt/gnttextview.h pidgin-2.2.0/finch/libgnt/gnttextview.h
--- pidgin-2.1.1/finch/libgnt/gnttextview.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gnttextview.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_TEXT_VIEW_H
diff -ru pidgin-2.1.1/finch/libgnt/gnttree.c pidgin-2.2.0/finch/libgnt/gnttree.c
--- pidgin-2.1.1/finch/libgnt/gnttree.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gnttree.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntmarshal.h"
@@ -985,11 +985,7 @@
 			g_param_spec_int("columns", "Columns",
 				"Number of columns in the tree.",
 				1, G_MAXINT, 1,
-#if GLIB_CHECK_VERSION(2,8,0)
 				G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-#else
-				G_PARAM_READWRITE|G_PARAM_PRIVATE
-#endif
 			)
 		);
 
diff -ru pidgin-2.1.1/finch/libgnt/gnttree.h pidgin-2.2.0/finch/libgnt/gnttree.h
--- pidgin-2.1.1/finch/libgnt/gnttree.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gnttree.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_TREE_H
diff -ru pidgin-2.1.1/finch/libgnt/gntutils.c pidgin-2.2.0/finch/libgnt/gntutils.c
--- pidgin-2.1.1/finch/libgnt/gntutils.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntutils.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntbutton.h"
@@ -376,6 +376,101 @@
 #endif
 }
 
+#ifndef NO_LIBXML
+static void
+util_parse_html_to_tv(xmlNode *node, GntTextView *tv, GntTextFormatFlags flag)
+{
+	const char *name;
+	char *content;
+	xmlNode *ch;
+	gboolean processed = FALSE;
+	char *url = NULL;
+	gboolean insert_nl_s = FALSE, insert_nl_e = FALSE;
+
+	if (node == NULL || node->name == NULL || node->type != XML_ELEMENT_NODE)
+		return;
+
+	name = (char*)node->name;
+	if (g_ascii_strcasecmp(name, "b") == 0 ||
+		g_ascii_strcasecmp(name, "strong") == 0 ||
+		g_ascii_strcasecmp(name, "i") == 0 ||
+		g_ascii_strcasecmp(name, "blockquote") == 0) {
+		flag |= GNT_TEXT_FLAG_BOLD;
+	} else if (g_ascii_strcasecmp(name, "u") == 0) {
+		flag |= GNT_TEXT_FLAG_UNDERLINE;
+	} else if (g_ascii_strcasecmp(name, "br") == 0) {
+		insert_nl_e = TRUE;
+	} else if (g_ascii_strcasecmp(name, "a") == 0) {
+		flag |= GNT_TEXT_FLAG_UNDERLINE;
+		url = (char *)xmlGetProp(node, (xmlChar*)"href");
+	} else if (g_ascii_strcasecmp(name, "h1") == 0 ||
+			g_ascii_strcasecmp(name, "h2") == 0 ||
+			g_ascii_strcasecmp(name, "h3") == 0 ||
+			g_ascii_strcasecmp(name, "h4") == 0 ||
+			g_ascii_strcasecmp(name, "h5") == 0 ||
+			g_ascii_strcasecmp(name, "h6") == 0) {
+		insert_nl_s = TRUE;
+		insert_nl_e = TRUE;
+	} else if (g_ascii_strcasecmp(name, "title") == 0) {
+		insert_nl_s = TRUE;
+		insert_nl_e = TRUE;
+		flag |= GNT_TEXT_FLAG_BOLD | GNT_TEXT_FLAG_UNDERLINE;
+	} else {
+		/* XXX: Process other possible tags */
+	}
+
+	if (insert_nl_s)
+		gnt_text_view_append_text_with_flags(tv, "\n", flag);
+
+	for (ch = node->children; ch; ch = ch->next) {
+		if (ch->type == XML_ELEMENT_NODE) {
+			processed = TRUE;
+			util_parse_html_to_tv(ch, tv, flag);
+		}
+	}
+
+	if (!processed) {
+		content = (char*)xmlNodeGetContent(node);
+		gnt_text_view_append_text_with_flags(tv, content, flag);
+		xmlFree(content);
+	}
+
+	if (url) {
+		char *href = g_strdup_printf(" (%s)", url);
+		gnt_text_view_append_text_with_flags(tv, href, flag);
+		g_free(href);
+		xmlFree(url);
+	}
+
+	if (insert_nl_e)
+		gnt_text_view_append_text_with_flags(tv, "\n", flag);
+}
+#endif
+
+gboolean gnt_util_parse_xhtml_to_textview(const char *string, GntTextView *tv)
+{
+#ifdef NO_LIBXML
+	return FALSE;
+#else
+	xmlParserCtxtPtr ctxt;
+	xmlDocPtr doc;
+	xmlNodePtr node;
+	GntTextFormatFlags flag = GNT_TEXT_FLAG_NORMAL;
+	gboolean ret = FALSE;
+
+	ctxt = xmlNewParserCtxt();
+	doc = xmlCtxtReadDoc(ctxt, (xmlChar*)string, NULL, NULL, XML_PARSE_NOBLANKS | XML_PARSE_RECOVER);
+	if (doc) {
+		node = xmlDocGetRootElement(doc);
+		util_parse_html_to_tv(node, tv, flag);
+		xmlFreeDoc(doc);
+		ret = TRUE;
+	}
+	xmlCleanupParser();
+	return ret;
+#endif
+}
+
 /* Setup trigger widget */
 typedef struct {
 	char *text;
@@ -408,4 +503,3 @@
 	g_signal_connect(G_OBJECT(wid), "key_pressed", G_CALLBACK(key_pressed), tb);
 	g_signal_connect_swapped(G_OBJECT(button), "destroy", G_CALLBACK(free_trigger_button), tb);
 }
-
diff -ru pidgin-2.1.1/finch/libgnt/gntutils.h pidgin-2.2.0/finch/libgnt/gntutils.h
--- pidgin-2.1.1/finch/libgnt/gntutils.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntutils.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,12 +21,13 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
 
 #include "gnt.h"
+#include "gnttextview.h"
 #include "gntwidget.h"
 
 typedef gpointer (*GDupFunc)(gconstpointer data);
@@ -132,6 +133,16 @@
 void gnt_util_parse_widgets(const char *string, int num, ...);
 
 /**
+ * Parse an XHTML string and add it in a GntTextView with
+ * appropriate text flags.
+ *
+ * @param string   The XHTML string
+ * @param tv       The GntTextView
+ * @return  @c TRUE if the string was added to the textview properly, @c FALSE otherwise.
+ */
+gboolean gnt_util_parse_xhtml_to_textview(const char *string, GntTextView *tv);
+
+/**
  * Make some keypress activate a button when some key is pressed with 'wid' in focus.
  *
  * @param widget  The widget
diff -ru pidgin-2.1.1/finch/libgnt/gntwidget.c pidgin-2.2.0/finch/libgnt/gntwidget.c
--- pidgin-2.1.1/finch/libgnt/gntwidget.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwidget.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 /* Stuff brutally ripped from Gflib */
diff -ru pidgin-2.1.1/finch/libgnt/gntwidget.h pidgin-2.2.0/finch/libgnt/gntwidget.h
--- pidgin-2.1.1/finch/libgnt/gntwidget.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwidget.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_WIDGET_H
diff -ru pidgin-2.1.1/finch/libgnt/gntwindow.c pidgin-2.2.0/finch/libgnt/gntwindow.c
--- pidgin-2.1.1/finch/libgnt/gntwindow.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwindow.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gntstyle.h"
diff -ru pidgin-2.1.1/finch/libgnt/gntwindow.h pidgin-2.2.0/finch/libgnt/gntwindow.h
--- pidgin-2.1.1/finch/libgnt/gntwindow.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwindow.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNT_WINDOW_H
diff -ru pidgin-2.1.1/finch/libgnt/gntwm.c pidgin-2.2.0/finch/libgnt/gntwm.c
--- pidgin-2.1.1/finch/libgnt/gntwm.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwm.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #define _GNU_SOURCE
@@ -738,7 +738,7 @@
 			print = ch;
 #ifndef NO_WIDECHAR
 			if (wch.chars[0] > 255) {
-				snprintf(unicode, sizeof(unicode), "&#x%x;", wch.chars[0]);
+				snprintf(unicode, sizeof(unicode), "&#x%x;", (unsigned int)wch.chars[0]);
 				print = unicode;
 			}
 #endif
diff -ru pidgin-2.1.1/finch/libgnt/gntwm.h pidgin-2.2.0/finch/libgnt/gntwm.h
--- pidgin-2.1.1/finch/libgnt/gntwm.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntwm.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNTWM_H
diff -ru pidgin-2.1.1/finch/libgnt/gntws.h pidgin-2.2.0/finch/libgnt/gntws.h
--- pidgin-2.1.1/finch/libgnt/gntws.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/gntws.h	2007-09-14 00:45:39.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef GNTWS_H
diff -ru pidgin-2.1.1/finch/libgnt/Makefile.am pidgin-2.2.0/finch/libgnt/Makefile.am
--- pidgin-2.1.1/finch/libgnt/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/Makefile.am	2007-09-14 00:45:39.000000000 -0400
@@ -1,4 +1,4 @@
-EXTRA_DIST=genmarshal
+EXTRA_DIST=genmarshal pygnt
 
 SUBDIRS = . wms
 pkgconfigdir = $(libdir)/pkgconfig
diff -ru pidgin-2.1.1/finch/libgnt/Makefile.in pidgin-2.2.0/finch/libgnt/Makefile.in
--- pidgin-2.1.1/finch/libgnt/Makefile.in	2007-08-20 14:13:52.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -147,6 +147,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -175,6 +177,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -230,14 +234,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -249,7 +251,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -310,6 +311,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -330,6 +332,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -442,7 +446,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-EXTRA_DIST = genmarshal
+EXTRA_DIST = genmarshal pygnt
 SUBDIRS = . wms
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnt.pc
Only in pidgin-2.2.0/finch/libgnt: pygnt
diff -ru pidgin-2.1.1/finch/libgnt/wms/Makefile.in pidgin-2.2.0/finch/libgnt/wms/Makefile.in
--- pidgin-2.1.1/finch/libgnt/wms/Makefile.in	2007-08-20 14:13:53.000000000 -0400
+++ pidgin-2.2.0/finch/libgnt/wms/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -134,6 +134,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -162,6 +164,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -217,14 +221,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -236,7 +238,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -297,6 +298,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -317,6 +319,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/finch/Makefile.am pidgin-2.2.0/finch/Makefile.am
--- pidgin-2.1.1/finch/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/Makefile.am	2007-08-30 00:36:32.000000000 -0400
@@ -14,6 +14,7 @@
 finch_SOURCES = \
 	gntaccount.c \
 	gntblist.c \
+	gntcertmgr.c \
 	gntconn.c \
 	gntconv.c \
 	gntdebug.c \
@@ -32,6 +33,7 @@
 finch_headers = \
 	gntaccount.h \
 	gntblist.h \
+	gntcertmgr.h \
 	gntconn.h \
 	gntconv.h \
 	gntdebug.h \
diff -ru pidgin-2.1.1/finch/Makefile.in pidgin-2.2.0/finch/Makefile.in
--- pidgin-2.1.1/finch/Makefile.in	2007-08-20 14:13:52.000000000 -0400
+++ pidgin-2.2.0/finch/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -54,11 +54,11 @@
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_finch_OBJECTS = gntaccount.$(OBJEXT) gntblist.$(OBJEXT) \
-	gntconn.$(OBJEXT) gntconv.$(OBJEXT) gntdebug.$(OBJEXT) \
-	gntft.$(OBJEXT) finch.$(OBJEXT) gntidle.$(OBJEXT) \
-	gntnotify.$(OBJEXT) gntplugin.$(OBJEXT) gntpounce.$(OBJEXT) \
-	gntprefs.$(OBJEXT) gntrequest.$(OBJEXT) gntsound.$(OBJEXT) \
-	gntstatus.$(OBJEXT) gntui.$(OBJEXT)
+	gntcertmgr.$(OBJEXT) gntconn.$(OBJEXT) gntconv.$(OBJEXT) \
+	gntdebug.$(OBJEXT) gntft.$(OBJEXT) finch.$(OBJEXT) \
+	gntidle.$(OBJEXT) gntnotify.$(OBJEXT) gntplugin.$(OBJEXT) \
+	gntpounce.$(OBJEXT) gntprefs.$(OBJEXT) gntrequest.$(OBJEXT) \
+	gntsound.$(OBJEXT) gntstatus.$(OBJEXT) gntui.$(OBJEXT)
 finch_OBJECTS = $(am_finch_OBJECTS)
 am__DEPENDENCIES_1 =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -142,6 +142,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -170,6 +172,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -225,14 +229,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -244,7 +246,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -305,6 +306,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -325,6 +327,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -446,6 +450,7 @@
 finch_SOURCES = \
 	gntaccount.c \
 	gntblist.c \
+	gntcertmgr.c \
 	gntconn.c \
 	gntconv.c \
 	gntdebug.c \
@@ -464,6 +469,7 @@
 finch_headers = \
 	gntaccount.h \
 	gntblist.h \
+	gntcertmgr.h \
 	gntconn.h \
 	gntconv.h \
 	gntdebug.h \
@@ -589,6 +595,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/finch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntaccount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntblist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntcertmgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntconn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gntdebug.Po@am__quote@
diff -ru pidgin-2.1.1/finch/plugins/gntclipboard.c pidgin-2.2.0/finch/plugins/gntclipboard.c
--- pidgin-2.1.1/finch/plugins/gntclipboard.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/plugins/gntclipboard.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
@@ -38,10 +38,12 @@
 #include <plugin.h>
 #include <version.h>
 #include <debug.h>
+#include <notify.h>
 #include <gntwm.h>
 
 #include <gntplugin.h>
 
+#ifdef HAVE_X11
 static pid_t child = 0;
 
 static gulong sig_handle;
@@ -49,7 +51,6 @@
 static void
 set_clip(gchar *string)
 {
-#ifdef HAVE_X11
 	Window w;
 	XEvent e, respond;
 	XSelectionRequestEvent *req;
@@ -89,14 +90,12 @@
 			return;
 		}
 	}
-#endif
 	return;
 }
 
 static void
 clipboard_changed(GntWM *wm, gchar *string)
 {
-#ifdef HAVE_X11
 	if (child) {
 		kill(child, SIGTERM);
 	}
@@ -104,8 +103,8 @@
 		set_clip(string);
 		_exit(0);
 	}
-#endif
 }
+#endif
 
 static gboolean
 plugin_load(PurplePlugin *plugin)
@@ -113,25 +112,35 @@
 #ifdef HAVE_X11
 	if (!XOpenDisplay(NULL)) {
 		purple_debug_warning("gntclipboard", "Couldn't find X display\n");
+		purple_notify_error(NULL, _("Error"), _("Error loading the plugin."),
+				_("Couldn't find X display"));
 		return FALSE;
 	}
-#endif
 	if (!getenv("WINDOWID")) {
 		purple_debug_warning("gntclipboard", "Couldn't find window\n");
+		purple_notify_error(NULL, _("Error"), _("Error loading the plugin."),
+				_("Couldn't find window"));
 		return FALSE;
 	}
 	sig_handle = g_signal_connect(G_OBJECT(gnt_get_clipboard()), "clipboard_changed", G_CALLBACK(clipboard_changed), NULL);
 	return TRUE;
+#else
+	purple_notify_error(NULL, _("Error"), _("Error loading the plugin."),
+			_("This plugin cannot be loaded because it was not built with X11 support."));
+	return FALSE;
+#endif
 }
 
 static gboolean
 plugin_unload(PurplePlugin *plugin)
 {
+#ifdef HAVE_X11
 	if (child) {
 		kill(child, SIGTERM);
 		child = 0;
 	}
 	g_signal_handler_disconnect(G_OBJECT(gnt_get_clipboard()), sig_handle);
+#endif
 	return TRUE;
 }
 
diff -ru pidgin-2.1.1/finch/plugins/gntgf.c pidgin-2.2.0/finch/plugins/gntgf.c
--- pidgin-2.1.1/finch/plugins/gntgf.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/plugins/gntgf.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/finch/plugins/gnthistory.c pidgin-2.2.0/finch/plugins/gnthistory.c
--- pidgin-2.1.1/finch/plugins/gnthistory.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/plugins/gnthistory.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 /* Ripped from gtk/plugins/history.c */
diff -ru pidgin-2.1.1/finch/plugins/lastlog.c pidgin-2.2.0/finch/plugins/lastlog.c
--- pidgin-2.1.1/finch/plugins/lastlog.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/finch/plugins/lastlog.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/finch/plugins/Makefile.in pidgin-2.2.0/finch/plugins/Makefile.in
--- pidgin-2.1.1/finch/plugins/Makefile.in	2007-08-20 14:13:53.000000000 -0400
+++ pidgin-2.2.0/finch/plugins/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -150,6 +150,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -178,6 +180,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -233,14 +237,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -252,7 +254,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -313,6 +314,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -333,6 +335,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/intltool-extract.in pidgin-2.2.0/intltool-extract.in
--- pidgin-2.1.1/intltool-extract.in	2007-08-20 14:13:20.000000000 -0400
+++ pidgin-2.2.0/intltool-extract.in	2007-08-27 22:39:11.000000000 -0400
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.35.5";
+my $VERSION      = "0.36.1";
 
 ## Loaded modules
 use strict; 
@@ -237,9 +237,9 @@
 
     s/&apos;/'/g; # '
     s/&quot;/"/g; # "
-    s/&amp;/&/g;
     s/&lt;/</g;
     s/&gt;/>/g;
+    s/&amp;/&/g;
 
     return $_;
 }
diff -ru pidgin-2.1.1/intltool-merge.in pidgin-2.2.0/intltool-merge.in
--- pidgin-2.1.1/intltool-merge.in	2007-08-20 14:13:20.000000000 -0400
+++ pidgin-2.2.0/intltool-merge.in	2007-08-27 22:39:11.000000000 -0400
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
+my $VERSION = "0.36.1";
 
 ## Loaded modules
 use strict; 
@@ -93,9 +93,24 @@
 
 my %po_files_by_lang = ();
 my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || "iconv";
 my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
 
+sub isProgramInPath
+{
+    my ($file) = @_;
+    # If either a file exists, or when run it returns 0 exit status
+    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+    return 0;
+}
+
+if (! isProgramInPath ("$iconv"))
+{
+	print STDERR " *** iconv is not found on this system!\n".
+		     " *** Without it, intltool-merge can not convert encodings.\n";
+	exit;
+}
+
 # Use this instead of \w for XML files to handle more possible characters.
 my $w = "[-A-Za-z0-9._:]";
 
@@ -494,16 +509,15 @@
     return $string;
 }
 
-## NOTE: deal with < - &lt; but not > - &gt;  because it seems its ok to have 
-## > in the entity. For further info please look at #84738.
 sub entity_decode
 {
     local ($_) = @_;
 
     s/&apos;/'/g; # '
     s/&quot;/"/g; # "
-    s/&amp;/&/g;
     s/&lt;/</g;
+    s/&gt;/>/g;
+    s/&amp;/&/g;
 
     return $_;
 }
diff -ru pidgin-2.1.1/intltool-update.in pidgin-2.2.0/intltool-update.in
--- pidgin-2.1.1/intltool-update.in	2007-08-20 14:13:20.000000000 -0400
+++ pidgin-2.2.0/intltool-update.in	2007-08-27 22:39:11.000000000 -0400
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.5";
+my $VERSION = "0.36.1";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -71,7 +71,8 @@
 "sheet(?:\\.in)+|".	# ?
 "schemas(?:\\.in)+|".	# GConf specific
 "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+";	# GOK specific. 
+"kbd(?:\\.in)+|".	# GOK specific. 
+"policy(?:\\.in)+";	# PolicyKit files
 
 my $ini_support =
 "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
@@ -328,7 +329,12 @@
 	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
 	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
 	}, "..";
-
+    find sub { 
+	push @buf_i18n_plain,        "$File::Find::name" if /\.($buildin_gettext_support)$/;
+	push @buf_i18n_xml,          "$File::Find::name" if /\.($xml_support)$/;
+	push @buf_i18n_ini,          "$File::Find::name" if /\.($ini_support)$/;
+	push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+	}, "$SRCDIR/..";
 
     open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
     @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -489,11 +495,15 @@
     my %in2;
     foreach (@buf_potfiles_sorted) 
     {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
 	$in2{$_} = 1;
     }
 
     foreach (@buf_potfiles_ignore_sorted) 
     {
+        s#^$SRCDIR/../##;
+        s#^$SRCDIR/##;
 	$in2{$_} = 1;
     }
 
@@ -501,9 +511,16 @@
 
     foreach (@buf_allfiles_sorted)
     {
-	if (!exists($in2{$_}))
+        my $dummy = $_;
+        my $srcdir = $SRCDIR;
+
+        $srcdir =~ s#^../##;
+        $dummy =~ s#^$srcdir/../##;
+        $dummy =~ s#^$srcdir/##;
+        $dummy =~ s#_build/##;
+	if (!exists($in2{$dummy}))
 	{
-	    push @result, $_
+	    push @result, $dummy
 	}
     }
 
@@ -563,11 +580,23 @@
     exit 1;
 }
 
-sub isIntltoolExtractInPath
+sub isProgramInPath
 {
     my ($file) = @_;
     # If either a file exists, or when run it returns 0 exit status
-    return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+    return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+    return 0;
+}
+
+sub isGNUGettextTool
+{
+    my ($file) = @_;
+    # Check that we are using GNU gettext tools
+    if (isProgramInPath ($file))
+    {
+        my $version = `$file --version`;
+        return 1 if ($version =~ m/.*\(GNU .*\).*/);
+    }
     return 0;
 }
 
@@ -577,7 +606,7 @@
 
     ## Generate the .h header files, so we can allow glade and
     ## xml translation support
-    if (! isIntltoolExtractInPath("$EXTRACT"))
+    if (! isProgramInPath ("$EXTRACT"))
     {
 	print STDERR "\n *** The intltool-extract script wasn't found!"
 	     ."\n *** Without it, intltool-update can not generate files.\n";
@@ -624,13 +653,13 @@
 #
 sub GeneratePOTemplate
 {
-    my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
+    my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
     my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
     chomp $XGETTEXT;
 
-    if (! -x $XGETTEXT)
+    if (! isGNUGettextTool ("$XGETTEXT"))
     {
-	print STDERR " *** xgettext is not found on this system!\n".
+	print STDERR " *** GNU xgettext is not found on this system!\n".
 		     " *** Without it, intltool-update can not extract strings.\n";
 	exit;
     }
@@ -726,7 +755,23 @@
     unlink "$MODULE.pot";
     my @xgettext_argument=("$XGETTEXT",
 			   "--add-comments",
-			   "--directory\=\.",
+			   "--directory\=.",
+                           "--default-domain\=$MODULE",
+                           "--flag\=g_strdup_printf:1:c-format",
+                           "--flag\=g_string_printf:2:c-format",
+                           "--flag\=g_string_append_printf:2:c-format",
+                           "--flag\=g_error_new:3:c-format",
+                           "--flag\=g_set_error:4:c-format",
+                           "--flag\=g_markup_printf_escaped:1:c-format",
+                           "--flag\=g_log:3:c-format",
+                           "--flag\=g_print:1:c-format",
+                           "--flag\=g_printerr:1:c-format",
+                           "--flag\=g_printf:1:c-format",
+                           "--flag\=g_fprintf:2:c-format",
+                           "--flag\=g_sprintf:2:c-format",
+                           "--flag\=g_snprintf:3:c-format",
+                           "--flag\=g_scanner_error:2:c-format",
+                           "--flag\=g_scanner_warn:2:c-format",
 			   "--output\=$MODULE\.pot",
 			   "--files-from\=\.\/POTFILES\.in\.temp");
     my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
@@ -793,9 +838,16 @@
 {
     -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
 
-    my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
+    my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
     my ($lang, $outfile) = @_;
 
+    if (! isGNUGettextTool ("$MSGMERGE"))
+    {
+	print STDERR " *** GNU msgmerge is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
+
     print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
 
     my $infile = "$SRCDIR/$lang.po";
@@ -836,7 +888,14 @@
 sub Console_Write_TranslationStatus
 {
     my ($lang, $output_file) = @_;
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
 
     $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
 
@@ -845,21 +904,28 @@
 
 sub Console_Write_CoverageReport
 {
-    my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+    my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+
+    if (! isGNUGettextTool ("$MSGFMT"))
+    {
+	print STDERR " *** GNU msgfmt is not found on this system!\n".
+		     " *** Without it, intltool-update can not extract strings.\n";
+	exit;
+    }
 
     &GatherPOFiles;
 
     foreach my $lang (@languages) 
     {
-	print "$lang: ";
+	print STDERR "$lang: ";
 	&POFile_Update ($lang, "");
     }
 
-    print "\n\n * Current translation support in $MODULE \n\n";
+    print STDERR "\n\n * Current translation support in $MODULE \n\n";
 
     foreach my $lang (@languages)
     {
-	print "$lang: ";
+	print STDERR "$lang: ";
 	system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
     }
 }
@@ -933,13 +999,13 @@
 
 	    $conf_in || die "Cannot find top_builddir in Makevars.";
 	}
-	elsif (-f "../configure.ac") 
+	elsif (-f "$SRCDIR/../configure.ac") 
 	{
-	    $conf_in = "../configure.ac";
+	    $conf_in = "$SRCDIR/../configure.ac";
 	} 
-	elsif (-f "../configure.in") 
+	elsif (-f "$SRCDIR/../configure.in") 
 	{
-	    $conf_in = "../configure.in";
+	    $conf_in = "$SRCDIR/../configure.in";
 	} 
 	else 
 	{
diff -ru pidgin-2.1.1/libpurple/account.c pidgin-2.2.0/libpurple/account.c
--- pidgin-2.1.1/libpurple/account.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/account.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "account.h"
@@ -913,6 +913,15 @@
 }
 
 void
+purple_account_set_register_callback(PurpleAccount *account, PurpleAccountRegistrationCb cb, void *user_data)
+{
+	g_return_if_fail(account != NULL);
+	
+	account->registration_cb = cb;
+	account->registration_cb_user_data = user_data;
+}
+
+void
 purple_account_register(PurpleAccount *account)
 {
 	g_return_if_fail(account != NULL);
@@ -923,6 +932,17 @@
 	purple_connection_new(account, TRUE, purple_account_get_password(account));
 }
 
+void
+purple_account_unregister(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data)
+{
+	g_return_if_fail(account != NULL);
+	
+	purple_debug_info("account", "Unregistering account %s\n",
+					  purple_account_get_username(account));
+	
+	purple_connection_new_unregister(account, purple_account_get_password(account), cb, user_data);
+}
+
 static void
 request_password_ok_cb(PurpleAccount *account, PurpleRequestFields *fields)
 {
@@ -1720,15 +1740,6 @@
 purple_account_get_protocol_id(const PurpleAccount *account)
 {
 	g_return_val_if_fail(account != NULL, NULL);
-	/*
-	 * HACK by Seanegan
-	 */
-	if (!strcmp(account->protocol_id, "prpl-oscar")) {
-		if (isdigit(account->username[0]))
-			return "prpl-icq";
-		else
-			return "prpl-aim";
-	}
 	return account->protocol_id;
 }
 
diff -ru pidgin-2.1.1/libpurple/account.h pidgin-2.2.0/libpurple/account.h
--- pidgin-2.1.1/libpurple/account.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/account.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref account-signals
  */
@@ -36,6 +36,8 @@
 
 typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account);
 typedef void (*PurpleAccountRequestAuthorizationCb)(void *);
+typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
+typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
 
 #include "connection.h"
 #include "log.h"
@@ -136,6 +138,8 @@
 	PurpleLog *system_log;        /**< The system log                         */
 
 	void *ui_data;              /**< The UI can put data here.              */
+	PurpleAccountRegistrationCb registration_cb;
+	void *registration_cb_user_data;
 };
 
 #ifdef __cplusplus
@@ -172,6 +176,15 @@
 void purple_account_connect(PurpleAccount *account);
 
 /**
+ * Sets the callback for successful registration.
+ *
+ * @param account	The account for which this callback should be used
+ * @param cb	The callback
+ * @param user_data	The user data passed to the callback
+ */
+void purple_account_set_register_callback(PurpleAccount *account, PurpleAccountRegistrationCb cb, void *user_data);
+
+/**
  * Registers an account.
  *
  * @param account The account to register.
@@ -179,6 +192,15 @@
 void purple_account_register(PurpleAccount *account);
 
 /**
+ * Unregisters an account (deleting it from the server).
+ *
+ * @param account The account to unregister.
+ * @param cb Optional callback to be called when unregistration is complete
+ * @param user_data user data to pass to the callback
+ */
+void purple_account_unregister(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data);
+
+/**
  * Disconnects from an account.
  *
  * @param account The account to disconnect from.
diff -ru pidgin-2.1.1/libpurple/accountopt.c pidgin-2.2.0/libpurple/accountopt.c
--- pidgin-2.1.1/libpurple/accountopt.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/accountopt.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/accountopt.h pidgin-2.2.0/libpurple/accountopt.h
--- pidgin-2.1.1/libpurple/accountopt.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/accountopt.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_ACCOUNTOPT_H_
 #define _PURPLE_ACCOUNTOPT_H_
diff -ru pidgin-2.1.1/libpurple/blist.c pidgin-2.2.0/libpurple/blist.c
--- pidgin-2.1.1/libpurple/blist.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/blist.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -1190,6 +1190,12 @@
 			group = purple_group_new(_("Chats"));
 			purple_blist_add_group(group,
 					purple_blist_get_last_sibling(purplebuddylist->root));
+		} else {
+			/* Add group to blist if isn't already on it. Fixes #2752. */
+			if (!purple_find_group(group->name)) {
+				purple_blist_add_group(group,
+						purple_blist_get_last_sibling(purplebuddylist->root));
+			}
 		}
 	} else {
 		group = (PurpleGroup*)node->parent;
@@ -1284,6 +1290,12 @@
 		g = (PurpleGroup *)((PurpleBlistNode *)c)->parent;
 	} else {
 		if (group) {
+			/* Add chat to blist if isn't already on it. Fixes #2752. */
+			if (!purple_find_group(group->name)) {
+				purple_blist_add_group(group,
+						purple_blist_get_last_sibling(purplebuddylist->root));
+			}
+
 			g = group;
 		} else {
 			g = purple_group_new(_("Buddies"));
diff -ru pidgin-2.1.1/libpurple/blist.h pidgin-2.2.0/libpurple/blist.h
--- pidgin-2.1.1/libpurple/blist.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/blist.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref blist-signals
  */
diff -ru pidgin-2.1.1/libpurple/buddyicon.c pidgin-2.2.0/libpurple/buddyicon.c
--- pidgin-2.1.1/libpurple/buddyicon.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/buddyicon.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "buddyicon.h"
diff -ru pidgin-2.1.1/libpurple/buddyicon.h pidgin-2.2.0/libpurple/buddyicon.h
--- pidgin-2.1.1/libpurple/buddyicon.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/buddyicon.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_BUDDYICON_H_
 #define _PURPLE_BUDDYICON_H_
Only in pidgin-2.2.0/libpurple: certificate.c
Only in pidgin-2.2.0/libpurple: certificate.h
diff -ru pidgin-2.1.1/libpurple/cipher.c pidgin-2.2.0/libpurple/cipher.c
--- pidgin-2.1.1/libpurple/cipher.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/cipher.c	2007-09-14 00:45:39.000000000 -0400
@@ -48,7 +48,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <glib.h>
 #include <string.h>
@@ -2021,7 +2021,7 @@
 		if (client_nonce == NULL)
 		{
 			purple_cipher_context_destroy(context);
-			purple_debug_error("cipher", "Required client_nonce missing for MD5-sess digest calculation.");
+			purple_debug_error("cipher", "Required client_nonce missing for MD5-sess digest calculation.\n");
 			return NULL;
 		}
 
@@ -2091,7 +2091,7 @@
 		if (entity == NULL)
 		{
 			purple_cipher_context_destroy(context);
-			purple_debug_error("cipher", "Required entity missing for auth-int digest calculation.");
+			purple_debug_error("cipher", "Required entity missing for auth-int digest calculation.\n");
 			return NULL;
 		}
 
@@ -2118,14 +2118,14 @@
 		if (nonce_count == NULL)
 		{
 			purple_cipher_context_destroy(context);
-			purple_debug_error("cipher", "Required nonce_count missing for digest calculation.");
+			purple_debug_error("cipher", "Required nonce_count missing for digest calculation.\n");
 			return NULL;
 		}
 
 		if (client_nonce == NULL)
 		{
 			purple_cipher_context_destroy(context);
-			purple_debug_error("cipher", "Required client_nonce missing for digest calculation.");
+			purple_debug_error("cipher", "Required client_nonce missing for digest calculation.\n");
 			return NULL;
 		}
 
diff -ru pidgin-2.1.1/libpurple/cipher.h pidgin-2.2.0/libpurple/cipher.h
--- pidgin-2.1.1/libpurple/cipher.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/cipher.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref cipher-signals
  */
diff -ru pidgin-2.1.1/libpurple/circbuffer.c pidgin-2.2.0/libpurple/circbuffer.c
--- pidgin-2.1.1/libpurple/circbuffer.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/circbuffer.c	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/circbuffer.h pidgin-2.2.0/libpurple/circbuffer.h
--- pidgin-2.1.1/libpurple/circbuffer.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/circbuffer.h	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _CIRCBUFFER_H
 #define _CIRCBUFFER_H
diff -ru pidgin-2.1.1/libpurple/cmds.c pidgin-2.2.0/libpurple/cmds.c
--- pidgin-2.1.1/libpurple/cmds.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/cmds.c	2007-09-14 00:45:39.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/cmds.h pidgin-2.2.0/libpurple/cmds.h
--- pidgin-2.1.1/libpurple/cmds.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/cmds.h	2007-09-14 00:45:39.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PURPLE_CMDS_H_
diff -ru pidgin-2.1.1/libpurple/connection.c pidgin-2.2.0/libpurple/connection.c
--- pidgin-2.1.1/libpurple/connection.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/connection.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "account.h"
@@ -158,6 +158,62 @@
 }
 
 void
+purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data)
+{
+	/* Lots of copy/pasted code to avoid API changes. You might want to integrate that into the previous function when posssible. */
+	PurpleConnection *gc;
+	PurplePlugin *prpl;
+	PurplePluginProtocolInfo *prpl_info;
+	
+	g_return_if_fail(account != NULL);
+		
+	prpl = purple_find_prpl(purple_account_get_protocol_id(account));
+	
+	if (prpl != NULL)
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+	else {
+		gchar *message;
+		
+		message = g_strdup_printf(_("Missing protocol plugin for %s"),
+								  purple_account_get_username(account));
+		purple_notify_error(NULL, _("Unregistration Error"), message, NULL);
+		g_free(message);
+		return;
+	}
+
+	if (!purple_account_is_disconnected(account)) {
+		prpl_info->unregister_user(account, cb, user_data);
+		return;
+	}
+	
+	if (((password == NULL) || (*password == '\0')) &&
+		!(prpl_info->options & OPT_PROTO_NO_PASSWORD) &&
+		!(prpl_info->options & OPT_PROTO_PASSWORD_OPTIONAL))
+	{
+		purple_debug_error("connection", "Can not connect to account %s without "
+						   "a password.\n", purple_account_get_username(account));
+		return;
+	}
+	
+	gc = g_new0(PurpleConnection, 1);
+	PURPLE_DBUS_REGISTER_POINTER(gc, PurpleConnection);
+	
+	gc->prpl = prpl;
+	if ((password != NULL) && (*password != '\0'))
+		gc->password = g_strdup(password);
+	purple_connection_set_account(gc, account);
+	purple_connection_set_state(gc, PURPLE_CONNECTING);
+	connections = g_list_append(connections, gc);
+	purple_account_set_connection(account, gc);
+	
+	purple_signal_emit(purple_connections_get_handle(), "signing-on", gc);
+	
+	purple_debug_info("connection", "Unregistering.  gc = %p\n", gc);
+	
+	prpl_info->unregister_user(account, cb, user_data);
+}
+
+void
 purple_connection_destroy(PurpleConnection *gc)
 {
 	PurpleAccount *account;
@@ -436,7 +492,7 @@
 	g_return_if_fail(gc   != NULL);
 
 	if (text == NULL) {
-		purple_debug_error("connection", "purple_connection_error: check `text != NULL' failed");
+		purple_debug_error("connection", "purple_connection_error: check `text != NULL' failed\n");
 		text = _("Unknown error");
 	}
 
diff -ru pidgin-2.1.1/libpurple/connection.h pidgin-2.2.0/libpurple/connection.h
--- pidgin-2.1.1/libpurple/connection.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/connection.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref connection-signals
  */
@@ -171,6 +171,18 @@
 									const char *password);
 
 /**
+ * This function should only be called by purple_account_unregister()
+ * in account.c.
+ *
+ * Tries to unregister the account on the server. If the account is not
+ * connected, also creates a new connection.
+ *
+ * @param account  The account to unregister
+ * @param password The password to use.
+ */
+void purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data);
+
+/**
  * Disconnects and destroys a PurpleConnection.
  *
  * This function should only be called by purple_account_disconnect()
diff -ru pidgin-2.1.1/libpurple/conversation.c pidgin-2.2.0/libpurple/conversation.c
--- pidgin-2.1.1/libpurple/conversation.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/conversation.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "blist.h"
@@ -111,17 +111,17 @@
 
 	/* Always linkfy the text for display, unless we're
 	 * explicitly asked to do otheriwse*/
-	if(msgflags & PURPLE_MESSAGE_NO_LINKIFY)
-		displayed = g_strdup(message);
-	else
-		displayed = purple_markup_linkify(message);
+	if (!(msgflags & PURPLE_MESSAGE_INVISIBLE)) {
+		if(msgflags & PURPLE_MESSAGE_NO_LINKIFY)
+			displayed = g_strdup(message);
+		else
+			displayed = purple_markup_linkify(message);
+	}
 
-	if ((conv->features & PURPLE_CONNECTION_HTML) &&
-		!(msgflags & PURPLE_MESSAGE_RAW))
-	{
+	if (displayed && (conv->features & PURPLE_CONNECTION_HTML) &&
+		!(msgflags & PURPLE_MESSAGE_RAW)) {
 		sent = g_strdup(displayed);
-	}
-	else
+	} else
 		sent = g_strdup(message);
 
 	msgflags |= PURPLE_MESSAGE_SEND;
@@ -202,6 +202,48 @@
 							   conv, time(NULL), NULL));
 }
 
+/* Functions that deal with PurpleConvMessage */
+
+static void
+add_message_to_history(PurpleConversation *conv, const char *who, const char *message,
+		PurpleMessageFlags flags, time_t when)
+{
+	PurpleConvMessage *msg;
+
+	if (flags & PURPLE_MESSAGE_SEND) {
+		const char *me = NULL;
+		if (conv->account->gc)
+			me = conv->account->gc->display_name;
+		if (!me)
+			me = conv->account->username;
+		who = me;
+	}
+	
+	msg = g_new0(PurpleConvMessage, 1);
+	PURPLE_DBUS_REGISTER_POINTER(msg, PurpleConvMessage);
+	msg->who = g_strdup(who);
+	msg->flags = flags;
+	msg->what = g_strdup(message);
+	msg->when = when;
+
+	conv->message_history = g_list_prepend(conv->message_history, msg);
+}
+
+static void
+free_conv_message(PurpleConvMessage *msg)
+{
+	g_free(msg->who);
+	g_free(msg->what);
+	PURPLE_DBUS_UNREGISTER_POINTER(msg);
+	g_free(msg);
+}
+
+static void
+message_history_free(GList *list)
+{
+	g_list_foreach(list, (GFunc)free_conv_message, NULL);
+	g_list_free(list);
+}
 
 /**************************************************************************
  * Conversation API
@@ -473,6 +515,8 @@
 
 	purple_conversation_close_logs(conv);
 
+	purple_conversation_clear_message_history(conv);
+
 	PURPLE_DBUS_UNREGISTER_POINTER(conv);
 	g_free(conv);
 	conv = NULL;
@@ -805,9 +849,6 @@
 
 	ops = purple_conversation_get_ui_ops(conv);
 
-	if (ops == NULL || ops->write_conv == NULL)
-		return;
-
 	account = purple_conversation_get_account(conv);
 	type = purple_conversation_get_type(conv);
 
@@ -824,6 +865,10 @@
 
 	displayed = g_strdup(message);
 
+	if (who == NULL || *who == '\0')
+		who = purple_conversation_get_name(conv);
+	alias = who;
+
 	plugin_return =
 		GPOINTER_TO_INT(purple_signal_emit_return_1(
 			purple_conversations_get_handle(),
@@ -838,11 +883,6 @@
 		return;
 	}
 
-	if (who == NULL || *who == '\0')
-		who = purple_conversation_get_name(conv);
-
-	alias = who;
-
 	if (account != NULL) {
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account)));
 
@@ -891,7 +931,9 @@
 		}
 	}
 
-	ops->write_conv(conv, who, alias, displayed, flags, mtime);
+	if (ops && ops->write_conv)
+		ops->write_conv(conv, who, alias, displayed, flags, mtime);
+	add_message_to_history(conv, who, message, flags, mtime);
 
 	purple_signal_emit(purple_conversations_get_handle(),
 		(type == PURPLE_CONV_TYPE_IM ? "wrote-im-msg" : "wrote-chat-msg"),
@@ -2020,6 +2062,42 @@
 	return menu;
 }
 
+void purple_conversation_clear_message_history(PurpleConversation *conv)
+{
+	GList *list = conv->message_history;
+	message_history_free(list);
+	conv->message_history = NULL;
+}
+
+GList *purple_conversation_get_message_history(PurpleConversation *conv)
+{
+	return conv->message_history;
+}
+
+const char *purple_conversation_message_get_sender(PurpleConvMessage *msg)
+{
+	g_return_val_if_fail(msg, NULL);
+	return msg->who;
+}
+
+const char *purple_conversation_message_get_message(PurpleConvMessage *msg)
+{
+	g_return_val_if_fail(msg, NULL);
+	return msg->what;
+}
+
+PurpleMessageFlags purple_conversation_message_get_flags(PurpleConvMessage *msg)
+{
+	g_return_val_if_fail(msg, 0);
+	return msg->flags;
+}
+
+time_t purple_conversation_message_get_timestamp(PurpleConvMessage *msg)
+{
+	g_return_val_if_fail(msg, 0);
+	return msg->when;
+}
+
 gboolean
 purple_conversation_do_command(PurpleConversation *conv, const gchar *cmdline,
 				const gchar *markup, gchar **error)
@@ -2309,3 +2387,4 @@
 		purple_conversation_destroy((PurpleConversation*)conversations->data);
 	purple_signals_unregister_by_instance(purple_conversations_get_handle());
 }
+
diff -ru pidgin-2.1.1/libpurple/conversation.h pidgin-2.2.0/libpurple/conversation.h
--- pidgin-2.1.1/libpurple/conversation.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/conversation.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref conversation-signals
  */
@@ -37,6 +37,7 @@
 typedef struct _PurpleConvIm            PurpleConvIm;
 typedef struct _PurpleConvChat          PurpleConvChat;
 typedef struct _PurpleConvChatBuddy     PurpleConvChatBuddy;
+typedef struct _PurpleConvMessage       PurpleConvMessage;
 
 /**
  * A type of conversation.
@@ -117,9 +118,9 @@
 	                                        apply formatting         */
 	PURPLE_MESSAGE_IMAGES      = 0x1000, /**< Message contains images  */
 	PURPLE_MESSAGE_NOTIFY      = 0x2000, /**< Message is a notification */
-	PURPLE_MESSAGE_NO_LINKIFY  = 0x4000  /**< Message should not be auto-
+	PURPLE_MESSAGE_NO_LINKIFY  = 0x4000, /**< Message should not be auto-
 										   linkified */
-
+	PURPLE_MESSAGE_INVISIBLE   = 0x8000, /**< Message should not be displayed */
 } PurpleMessageFlags;
 
 /**
@@ -183,7 +184,7 @@
 	                   time_t mtime);
 
 	/** Add @a cbuddies to a chat.
-	 *  @param cbuddies      A @C GList of #PurpleConvChatBuddy structs.
+	 *  @param cbuddies      A @c GList of #PurpleConvChatBuddy structs.
 	 *  @param new_arrivals  Whether join notices should be shown.
 	 *                       (Join notices are actually written to the
 	 *                       conversation by #purple_conv_chat_add_users().)
@@ -199,7 +200,7 @@
 	void (*chat_rename_user)(PurpleConversation *conv, const char *old_name,
 	                         const char *new_name, const char *new_alias);
 	/** Remove @a users from a chat.
-	 *  @param users    A @C GList of <tt>const char *</tt>s.
+	 *  @param users    A @c GList of <tt>const char *</tt>s.
 	 *  @see purple_conv_chat_rename_user()
 	 */
 	void (*chat_remove_users)(PurpleConversation *conv, GList *users);
@@ -283,6 +284,17 @@
 };
 
 /**
+ * Description of a conversation message
+ */
+struct _PurpleConvMessage
+{
+	char *who;
+	char *what;
+	PurpleMessageFlags flags;
+	time_t when;
+};
+
+/**
  * A core representation of a conversation between two or more people.
  *
  * The conversation can be an IM or a chat.
@@ -315,7 +327,7 @@
 	GHashTable *data;                        /**< Plugin-specific data.   */
 
 	PurpleConnectionFlags features; /**< The supported features */
-
+	GList *message_history;         /**< Message history, as a GList of PurpleConvMessage's */
 };
 
 #ifdef __cplusplus
@@ -650,6 +662,60 @@
  */
 void purple_conversation_foreach(void (*func)(PurpleConversation *conv));
 
+/**
+ * Retrieve the message history of a conversation.
+ *
+ * @param conv   The conversation
+ *
+ * @return  A GList of PurpleConvMessage's. The must not modify the list or the data within.
+ *          The list contains the newest message at the beginning, and the oldest message at
+ *          the end.
+ */
+GList *purple_conversation_get_message_history(PurpleConversation *conv);
+
+/**
+ * Clear the message history of a conversation.
+ *
+ * @param conv  The conversation
+ */
+void purple_conversation_clear_message_history(PurpleConversation *conv);
+
+/**
+ * Get the sender from a PurpleConvMessage
+ *
+ * @param msg   A PurpleConvMessage
+ *
+ * @return   The name of the sender of the message
+ */
+const char *purple_conversation_message_get_sender(PurpleConvMessage *msg);
+
+/**
+ * Get the message from a PurpleConvMessage
+ *
+ * @param msg   A PurpleConvMessage
+ *
+ * @return   The name of the sender of the message
+ */
+const char *purple_conversation_message_get_message(PurpleConvMessage *msg);
+
+/**
+ * Get the message-flags of a PurpleConvMessage
+ *
+ * @param msg   A PurpleConvMessage
+ *
+ * @return   The name of the sender of the message
+ */
+PurpleMessageFlags purple_conversation_message_get_flags(PurpleConvMessage *msg);
+
+/**
+ * Get the timestamp of a PurpleConvMessage
+ *
+ * @param msg   A PurpleConvMessage
+ *
+ * @return   The name of the sender of the message
+ */
+time_t purple_conversation_message_get_timestamp(PurpleConvMessage *msg);
+
 /*@}*/
 
 
diff -ru pidgin-2.1.1/libpurple/core.c pidgin-2.2.0/libpurple/core.c
--- pidgin-2.1.1/libpurple/core.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/core.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,10 +20,11 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "cipher.h"
+#include "certificate.h"
 #include "connection.h"
 #include "conversation.h"
 #include "core.h"
@@ -141,6 +142,7 @@
 	purple_accounts_init();
 	purple_savedstatuses_init();
 	purple_notify_init();
+	purple_certificate_init();
 	purple_connections_init();
 	purple_conversations_init();
 	purple_blist_init();
@@ -159,9 +161,8 @@
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
-	 * TODO: do this here after purple_prefs_load() has been moved into purple_prefs_init()
 	 */
-	/*purple_network_get_my_ip(-1);*/
+	purple_network_get_my_ip(-1);
 
 	if (ops != NULL && ops->ui_init != NULL)
 		ops->ui_init();
@@ -192,6 +193,7 @@
 	purple_notify_uninit();
 	purple_conversations_uninit();
 	purple_connections_uninit();
+	purple_certificate_uninit();
 	purple_buddy_icons_uninit();
 	purple_accounts_uninit();
 	purple_savedstatuses_uninit();
diff -ru pidgin-2.1.1/libpurple/core.h pidgin-2.2.0/libpurple/core.h
--- pidgin-2.1.1/libpurple/core.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/core.h	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref core-signals
  */
diff -ru pidgin-2.1.1/libpurple/dbus-analyze-functions.py pidgin-2.2.0/libpurple/dbus-analyze-functions.py
--- pidgin-2.1.1/libpurple/dbus-analyze-functions.py	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-analyze-functions.py	2007-09-14 00:45:39.000000000 -0400
@@ -26,6 +26,11 @@
     "purple_conv_placement_get_current_func",
     "purple_conv_placement_set_current_func",
 
+    # Similar to the above:
+    "purple_account_set_register_callback",
+    "purple_account_unregister",
+    "purple_connection_new_unregister",
+
     # This is excluded because this script treats PurpleLogReadFlags*
     # as pointer to a struct, instead of a pointer to an enum.  This
     # causes a compilation error. Someone should fix this script.
@@ -66,6 +71,7 @@
     "purple_savedstatuses_get_all",
     "purple_status_type_get_attrs",
     "purple_presence_get_statuses",
+    "purple_conversation_get_message_history",
 ]
 
 pointer = "#pointer#"
diff -ru pidgin-2.1.1/libpurple/dbus-bindings.h pidgin-2.2.0/libpurple/dbus-bindings.h
--- pidgin-2.1.1/libpurple/dbus-bindings.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-bindings.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/dbus-purple.h pidgin-2.2.0/libpurple/dbus-purple.h
--- pidgin-2.1.1/libpurple/dbus-purple.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-purple.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/dbus-server.c pidgin-2.2.0/libpurple/dbus-server.c
--- pidgin-2.1.1/libpurple/dbus-server.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-server.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/dbus-server.h pidgin-2.2.0/libpurple/dbus-server.h
--- pidgin-2.1.1/libpurple/dbus-server.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-server.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref dbus-server-signals
  */
diff -ru pidgin-2.1.1/libpurple/dbus-types.h pidgin-2.2.0/libpurple/dbus-types.h
--- pidgin-2.1.1/libpurple/dbus-types.h	2007-08-20 14:14:45.000000000 -0400
+++ pidgin-2.2.0/libpurple/dbus-types.h	2007-09-14 03:32:49.000000000 -0400
@@ -11,6 +11,11 @@
 PURPLE_DBUS_DECLARE_TYPE(PurpleContact)
 PURPLE_DBUS_DECLARE_TYPE(PurpleBuddy)
 PURPLE_DBUS_DECLARE_TYPE(PurpleBuddyIcon)
+PURPLE_DBUS_DECLARE_TYPE(PurpleCertificate)
+PURPLE_DBUS_DECLARE_TYPE(PurpleCertificatePool)
+PURPLE_DBUS_DECLARE_TYPE(PurpleCertificateScheme)
+PURPLE_DBUS_DECLARE_TYPE(PurpleCertificateVerifier)
+PURPLE_DBUS_DECLARE_TYPE(PurpleCertificateVerificationRequest)
 PURPLE_DBUS_DECLARE_TYPE(PurpleCipher)
 PURPLE_DBUS_DECLARE_TYPE(PurpleCipherOps)
 PURPLE_DBUS_DECLARE_TYPE(PurpleCipherContext)
@@ -22,6 +27,7 @@
 PURPLE_DBUS_DECLARE_TYPE(PurpleConvIm)
 PURPLE_DBUS_DECLARE_TYPE(PurpleConvChat)
 PURPLE_DBUS_DECLARE_TYPE(PurpleConvChatBuddy)
+PURPLE_DBUS_DECLARE_TYPE(PurpleConvMessage)
 PURPLE_DBUS_DECLARE_TYPE(PurpleCore)
 PURPLE_DBUS_DECLARE_TYPE(PurpleCoreUiOps)
 PURPLE_DBUS_DECLARE_TYPE(PurpleDebugUiOps)
@@ -56,6 +62,7 @@
 PURPLE_DBUS_DECLARE_TYPE(PurpleProxyInfo)
 PURPLE_DBUS_DECLARE_TYPE(PurpleProxyConnectData)
 PURPLE_DBUS_DECLARE_TYPE(PurplePluginProtocolInfo)
+PURPLE_DBUS_DECLARE_TYPE(PurpleAttentionType)
 PURPLE_DBUS_DECLARE_TYPE(PurpleBuddyIconSpec)
 PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFields)
 PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFieldGroup)
diff -ru pidgin-2.1.1/libpurple/debug.c pidgin-2.2.0/libpurple/debug.c
--- pidgin-2.1.1/libpurple/debug.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/debug.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "debug.h"
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/debug.h pidgin-2.2.0/libpurple/debug.h
--- pidgin-2.1.1/libpurple/debug.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/debug.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_DEBUG_H_
 #define _PURPLE_DEBUG_H_
diff -ru pidgin-2.1.1/libpurple/desktopitem.c pidgin-2.2.0/libpurple/desktopitem.c
--- pidgin-2.1.1/libpurple/desktopitem.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/desktopitem.c	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -48,8 +48,8 @@
  * 
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #include <errno.h>
diff -ru pidgin-2.1.1/libpurple/desktopitem.h pidgin-2.2.0/libpurple/desktopitem.h
--- pidgin-2.1.1/libpurple/desktopitem.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/desktopitem.h	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -48,8 +48,8 @@
  * 
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef _PURPLE_DESKTOP_ITEM_H_
diff -ru pidgin-2.1.1/libpurple/dnsquery.c pidgin-2.2.0/libpurple/dnsquery.c
--- pidgin-2.1.1/libpurple/dnsquery.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dnsquery.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/dnsquery.h pidgin-2.2.0/libpurple/dnsquery.h
--- pidgin-2.1.1/libpurple/dnsquery.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dnsquery.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_DNSQUERY_H_
 #define _PURPLE_DNSQUERY_H_
@@ -45,16 +45,21 @@
 typedef void  (*PurpleDnsQueryFailedCallback) (PurpleDnsQueryData *query_data, const gchar *error_message);
 
 /**
- * DNS Request UI operations
+ * DNS Request UI operations;  UIs should implement this if they want to do DNS
+ * lookups themselves, rather than relying on the core.
+ *
+ * @see @ref ui-ops
  */
 typedef struct
 {
-	/* If implemented, the UI is responsible for DNS queries */
-	gboolean (*resolve_host)(PurpleDnsQueryData *query_data, PurpleDnsQueryResolvedCallback resolved_cb, PurpleDnsQueryFailedCallback failed_cb);
-
-	/* After destroy is called, query_data will be feed, so this must
-	 * cancel any further use of it the UI would do. Unneeded if 
-	 * resolve_host is not implemented.
+	/** If implemented, the UI is responsible for DNS queries */
+	gboolean (*resolve_host)(PurpleDnsQueryData *query_data,
+	                         PurpleDnsQueryResolvedCallback resolved_cb,
+	                         PurpleDnsQueryFailedCallback failed_cb);
+
+	/** Called just before @a query_data is freed; this should cancel any
+	 *  further use of @q query_data the UI would make. Unneeded if
+	 *  #resolve_host is not implemented.
 	 */
 	void (*destroy)(PurpleDnsQueryData *query_data);
 
diff -ru pidgin-2.1.1/libpurple/dnssrv.c pidgin-2.2.0/libpurple/dnssrv.c
--- pidgin-2.1.1/libpurple/dnssrv.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dnssrv.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/dnssrv.h pidgin-2.2.0/libpurple/dnssrv.h
--- pidgin-2.1.1/libpurple/dnssrv.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/dnssrv.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_DNSSRV_H
diff -ru pidgin-2.1.1/libpurple/eventloop.c pidgin-2.2.0/libpurple/eventloop.c
--- pidgin-2.1.1/libpurple/eventloop.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/eventloop.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "eventloop.h"
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/eventloop.h pidgin-2.2.0/libpurple/eventloop.h
--- pidgin-2.1.1/libpurple/eventloop.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/eventloop.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_EVENTLOOP_H_
 #define _PURPLE_EVENTLOOP_H_
diff -ru pidgin-2.1.1/libpurple/example/Makefile.in pidgin-2.2.0/libpurple/example/Makefile.in
--- pidgin-2.1.1/libpurple/example/Makefile.in	2007-08-20 14:13:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/example/Makefile.in	2007-09-14 03:31:21.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/example/nullclient.c pidgin-2.2.0/libpurple/example/nullclient.c
--- pidgin-2.1.1/libpurple/example/nullclient.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/example/nullclient.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/ft.c pidgin-2.2.0/libpurple/ft.c
--- pidgin-2.1.1/libpurple/ft.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/ft.c	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/ft.h pidgin-2.2.0/libpurple/ft.h
--- pidgin-2.1.1/libpurple/ft.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/ft.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref xfer-signals
  */
diff -ru pidgin-2.1.1/libpurple/gaim-compat.h pidgin-2.2.0/libpurple/gaim-compat.h
--- pidgin-2.1.1/libpurple/gaim-compat.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/gaim-compat.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref account-signals
  */
@@ -1654,7 +1654,7 @@
 #define gaim_request_choice_varg        purple_request_choice_varg
 #define gaim_request_action             purple_request_action
 #define gaim_request_action_varg        purple_request_action_varg
-#define gaim_request_fields             purple_request_fields
+#define gaim_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, user_data)             purple_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, NULL, NULL, NULL, user_data)
 #define gaim_request_close              purple_request_close
 #define gaim_request_close_with_handle  purple_request_close_with_handle
 
diff -ru pidgin-2.1.1/libpurple/gconf/Makefile.in pidgin-2.2.0/libpurple/gconf/Makefile.in
--- pidgin-2.1.1/libpurple/gconf/Makefile.in	2007-08-20 14:13:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/gconf/Makefile.in	2007-09-14 03:31:21.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/idle.c pidgin-2.2.0/libpurple/idle.c
--- pidgin-2.1.1/libpurple/idle.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/idle.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -163,8 +163,8 @@
 		{
 			if (!no_away)
 			{
-				purple_savedstatus_set_idleaway(FALSE);
 				no_away = TRUE;
+				purple_savedstatus_set_idleaway(FALSE);
 			}
 			time_until_next_idle_event = 0;
 			return;
diff -ru pidgin-2.1.1/libpurple/idle.h pidgin-2.2.0/libpurple/idle.h
--- pidgin-2.1.1/libpurple/idle.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/idle.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_IDLE_H_
 #define _PURPLE_IDLE_H_
diff -ru pidgin-2.1.1/libpurple/imgstore.c pidgin-2.2.0/libpurple/imgstore.c
--- pidgin-2.1.1/libpurple/imgstore.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/imgstore.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
 */
 
diff -ru pidgin-2.1.1/libpurple/imgstore.h pidgin-2.2.0/libpurple/imgstore.h
--- pidgin-2.1.1/libpurple/imgstore.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/imgstore.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref imgstore-signals
  */
diff -ru pidgin-2.1.1/libpurple/internal.h pidgin-2.2.0/libpurple/internal.h
--- pidgin-2.1.1/libpurple/internal.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/internal.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_INTERNAL_H_
 #define _PURPLE_INTERNAL_H_
@@ -29,6 +29,10 @@
 # include <config.h>
 #endif
 
+/* for SIOCGIFCONF  in SKYOS */
+#ifdef SKYOS
+#include <net/sockios.h>
+#endif
 /*
  * If we're using NLS, make sure gettext works.  If not, then define
  * dummy macros in place of the normal gettext macros.
diff -ru pidgin-2.1.1/libpurple/log.c pidgin-2.2.0/libpurple/log.c
--- pidgin-2.1.1/libpurple/log.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/log.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -1380,7 +1380,7 @@
 				written += fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
 						date, from, msg_fixed);
 		} else {
-			purple_debug_error("log", "Unhandled message type.");
+			purple_debug_error("log", "Unhandled message type.\n");
 			written += fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
 						date, from, msg_fixed);
 		}
diff -ru pidgin-2.1.1/libpurple/log.h pidgin-2.2.0/libpurple/log.h
--- pidgin-2.1.1/libpurple/log.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/log.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref log-signals
  */
diff -ru pidgin-2.1.1/libpurple/Makefile.am pidgin-2.2.0/libpurple/Makefile.am
--- pidgin-2.1.1/libpurple/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/Makefile.am	2007-08-30 00:36:32.000000000 -0400
@@ -36,6 +36,7 @@
 	accountopt.c \
 	blist.c \
 	buddyicon.c \
+	certificate.c \
 	cipher.c \
 	circbuffer.c \
 	cmds.c \
@@ -85,6 +86,7 @@
 	accountopt.h \
 	blist.h \
 	buddyicon.h \
+	certificate.h \
 	cipher.h \
 	circbuffer.h \
 	cmds.h \
diff -ru pidgin-2.1.1/libpurple/Makefile.in pidgin-2.2.0/libpurple/Makefile.in
--- pidgin-2.1.1/libpurple/Makefile.in	2007-08-20 14:13:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/Makefile.in	2007-09-14 03:31:20.000000000 -0400
@@ -74,19 +74,20 @@
 libpurple_client_la_OBJECTS = $(am_libpurple_client_la_OBJECTS)
 @ENABLE_DBUS_TRUE@am_libpurple_client_la_rpath = -rpath $(libdir)
 am__libpurple_la_SOURCES_DIST = account.c accountopt.c blist.c \
-	buddyicon.c cipher.c circbuffer.c cmds.c connection.c \
-	conversation.c core.c debug.c desktopitem.c eventloop.c ft.c \
-	idle.c imgstore.c log.c mime.c nat-pmp.c network.c ntlm.c \
-	notify.c plugin.c pluginpref.c pounce.c prefs.c privacy.c \
-	proxy.c prpl.c request.c roomlist.c savedstatuses.c server.c \
-	signals.c dnsquery.c dnssrv.c status.c stringref.c stun.c \
-	sound.c sslconn.c upnp.c util.c value.c version.c xmlnode.c \
-	whiteboard.c dbus-server.c dbus-useful.c
+	buddyicon.c certificate.c cipher.c circbuffer.c cmds.c \
+	connection.c conversation.c core.c debug.c desktopitem.c \
+	eventloop.c ft.c idle.c imgstore.c log.c mime.c nat-pmp.c \
+	network.c ntlm.c notify.c plugin.c pluginpref.c pounce.c \
+	prefs.c privacy.c proxy.c prpl.c request.c roomlist.c \
+	savedstatuses.c server.c signals.c dnsquery.c dnssrv.c \
+	status.c stringref.c stun.c sound.c sslconn.c upnp.c util.c \
+	value.c version.c xmlnode.c whiteboard.c dbus-server.c \
+	dbus-useful.c
 am__objects_1 = account.lo accountopt.lo blist.lo buddyicon.lo \
-	cipher.lo circbuffer.lo cmds.lo connection.lo conversation.lo \
-	core.lo debug.lo desktopitem.lo eventloop.lo ft.lo idle.lo \
-	imgstore.lo log.lo mime.lo nat-pmp.lo network.lo ntlm.lo \
-	notify.lo plugin.lo pluginpref.lo pounce.lo prefs.lo \
+	certificate.lo cipher.lo circbuffer.lo cmds.lo connection.lo \
+	conversation.lo core.lo debug.lo desktopitem.lo eventloop.lo \
+	ft.lo idle.lo imgstore.lo log.lo mime.lo nat-pmp.lo network.lo \
+	ntlm.lo notify.lo plugin.lo pluginpref.lo pounce.lo prefs.lo \
 	privacy.lo proxy.lo prpl.lo request.lo roomlist.lo \
 	savedstatuses.lo server.lo signals.lo dnsquery.lo dnssrv.lo \
 	status.lo stringref.lo stun.lo sound.lo sslconn.lo upnp.lo \
@@ -127,16 +128,16 @@
 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
 am__libpurpleinclude_HEADERS_DIST = account.h accountopt.h blist.h \
-	buddyicon.h cipher.h circbuffer.h cmds.h connection.h \
-	conversation.h core.h dbus-maybe.h debug.h desktopitem.h \
-	eventloop.h ft.h gaim-compat.h idle.h imgstore.h log.h mime.h \
-	nat-pmp.h network.h notify.h ntlm.h plugin.h pluginpref.h \
-	pounce.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h \
-	savedstatuses.h server.h signals.h dnsquery.h dnssrv.h \
-	status.h stringref.h stun.h sound.h sslconn.h upnp.h util.h \
-	value.h version.h xmlnode.h whiteboard.h dbus-bindings.h \
-	dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h \
-	dbus-types.h
+	buddyicon.h certificate.h cipher.h circbuffer.h cmds.h \
+	connection.h conversation.h core.h dbus-maybe.h debug.h \
+	desktopitem.h eventloop.h ft.h gaim-compat.h idle.h imgstore.h \
+	log.h mime.h nat-pmp.h network.h notify.h ntlm.h plugin.h \
+	pluginpref.h pounce.h prefs.h privacy.h proxy.h prpl.h \
+	request.h roomlist.h savedstatuses.h server.h signals.h \
+	dnsquery.h dnssrv.h status.h stringref.h stun.h sound.h \
+	sslconn.h upnp.h util.h value.h version.h xmlnode.h \
+	whiteboard.h dbus-bindings.h dbus-purple.h dbus-server.h \
+	dbus-useful.h dbus-define-api.h dbus-types.h
 libpurpleincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libpurpleinclude_HEADERS) $(noinst_HEADERS)
 ETAGS = etags
@@ -193,6 +194,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -221,6 +224,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -276,14 +281,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -295,7 +298,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -356,6 +358,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -376,6 +379,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -521,6 +526,7 @@
 	accountopt.c \
 	blist.c \
 	buddyicon.c \
+	certificate.c \
 	cipher.c \
 	circbuffer.c \
 	cmds.c \
@@ -570,6 +576,7 @@
 	accountopt.h \
 	blist.h \
 	buddyicon.h \
+	certificate.h \
 	cipher.h \
 	circbuffer.h \
 	cmds.h \
@@ -823,6 +830,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accountopt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blist.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buddyicon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/certificate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipher.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/circbuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmds.Plo@am__quote@
diff -ru pidgin-2.1.1/libpurple/Makefile.mingw pidgin-2.2.0/libpurple/Makefile.mingw
--- pidgin-2.1.1/libpurple/Makefile.mingw	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -33,6 +33,7 @@
 			accountopt.c \
 			blist.c \
 			buddyicon.c \
+			certificate.c \
 			cipher.c \
 			cmds.c \
 			connection.c \
diff -ru pidgin-2.1.1/libpurple/mime.c pidgin-2.2.0/libpurple/mime.c
--- pidgin-2.1.1/libpurple/mime.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/mime.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  * USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/mime.h pidgin-2.2.0/libpurple/mime.h
--- pidgin-2.1.1/libpurple/mime.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/mime.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  * USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/nat-pmp.c pidgin-2.2.0/libpurple/nat-pmp.c
--- pidgin-2.1.1/libpurple/nat-pmp.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/nat-pmp.c	2007-09-06 00:09:40.000000000 -0400
@@ -175,20 +175,20 @@
 	/* Determine the buffer side needed to get the full routing table */
     if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) 
 	{
-		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump estimate");
+		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump estimate\n");
 		return NULL;
     }
 
     if (!(buf = malloc(needed)))
 	{
-		purple_debug_warning("nat-pmp", "malloc");
+		purple_debug_warning("nat-pmp", "malloc\n");
 		return NULL;
     }
 
 	/* Read the routing table into buf */
     if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) 
 	{
-		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump");
+		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump\n");
 		return NULL;
     }
 
@@ -231,7 +231,7 @@
 						sin->sin_addr.s_addr = rti_sin->sin_addr.s_addr;
 						memcpy(sin, rti_info[RTAX_GATEWAY], sizeof(struct sockaddr_in));
 
-						purple_debug_info("nat-pmp", "found a default gateway");
+						purple_debug_info("nat-pmp", "found a default gateway\n");
 						found = TRUE;
 						break;
 					}
@@ -266,7 +266,7 @@
 	if ((pmp_info.status == PURPLE_PMP_STATUS_DISCOVERED) && (pmp_info.publicip != NULL))
 	{
 #ifdef PMP_DEBUG
-		purple_debug_info("nat-pmp", "Returning cached publicip %s",pmp_info.publicip);
+		purple_debug_info("nat-pmp", "Returning cached publicip %s\n",pmp_info.publicip);
 #endif
 		return pmp_info.publicip;
 	}
diff -ru pidgin-2.1.1/libpurple/network.c pidgin-2.2.0/libpurple/network.c
--- pidgin-2.1.1/libpurple/network.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/network.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -351,12 +351,13 @@
 	listen_data->retry = TRUE;
 	listen_data->cb = cb;
 	listen_data->cb_data = cb_data;
+	listen_data->socket_type = socket_type;
 
 	/* Attempt a NAT-PMP Mapping, which will return immediately */
 	if (purple_pmp_create_map(((socket_type == SOCK_STREAM) ? PURPLE_PMP_TYPE_TCP : PURPLE_PMP_TYPE_UDP),
 							  actual_port, actual_port, PURPLE_PMP_LIFETIME))
 	{
-		purple_debug_info("network", "Created NAT-PMP mapping on port %i",actual_port);
+		purple_debug_info("network", "Created NAT-PMP mapping on port %i\n",actual_port);
 		/* We want to return listen_data now, and on the next run loop trigger the cb and destroy listen_data */
 		purple_timeout_add(0, purple_network_finish_pmp_map_cb, listen_data);
 	}
@@ -436,7 +437,7 @@
 static gint
 wpurple_get_connected_network_count(void)
 {
-	guint net_cnt = 0;
+	gint net_cnt = 0;
 
 	WSAQUERYSET qs;
 	HANDLE h;
@@ -521,7 +522,7 @@
 		HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer,
 		DWORD cbInBuffer, LPVOID lpvOutBuffer, DWORD cbOutBuffer,
 		LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion) = NULL;
- 
+
 	if (!(MyWSANSPIoctl = (void*) wpurple_find_and_loadproc("ws2_32.dll", "WSANSPIoctl"))) {
 		g_thread_exit(NULL);
 		return NULL;
@@ -636,7 +637,7 @@
 purple_network_get_handle(void)
 {
 	static int handle;
-	
+
 	return &handle;
 }
 
@@ -675,7 +676,7 @@
 
 	purple_signal_register(purple_network_get_handle(), "network-configuration-changed",
 						   purple_marshal_VOID, NULL, 0);
-	
+
 	purple_pmp_init();
 	purple_upnp_init();
 }
diff -ru pidgin-2.1.1/libpurple/network.h pidgin-2.2.0/libpurple/network.h
--- pidgin-2.1.1/libpurple/network.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/network.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_NETWORK_H_
 #define _PURPLE_NETWORK_H_
diff -ru pidgin-2.1.1/libpurple/notify.c pidgin-2.2.0/libpurple/notify.c
--- pidgin-2.1.1/libpurple/notify.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/notify.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "dbus-maybe.h"
diff -ru pidgin-2.1.1/libpurple/notify.h pidgin-2.2.0/libpurple/notify.h
--- pidgin-2.1.1/libpurple/notify.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/notify.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref notify-signals
  */
@@ -213,6 +213,11 @@
 								PurpleNotifySearchResults *results, PurpleNotifyCloseCallback cb,
 								gpointer user_data);
 
+/**
+ * Frees a PurpleNotifySearchResults object.
+ *
+ * @param results The PurpleNotifySearchResults to free.
+ */
 void purple_notify_searchresults_free(PurpleNotifySearchResults *results);
 
 /**
diff -ru pidgin-2.1.1/libpurple/ntlm.c pidgin-2.2.0/libpurple/ntlm.c
--- pidgin-2.1.1/libpurple/ntlm.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/ntlm.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
@@ -131,7 +131,7 @@
 	tmsg->protocol[6] = 'P';
 	tmsg->protocol[7] = '\0';
 	tmsg->type      = 0x00000001;
-	tmsg->flags     = 0x0000b202;
+	tmsg->flags     = 0x0000b203;
 	tmsg->dom_len1  = tmsg->dom_len2 = domainlen;
 	tmsg->dom_off   = sizeof(struct type1_message) + hostnamelen;
 	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
@@ -286,7 +286,7 @@
 		tmsg->sess_len1 = tmsg->sess_len2 = 0x0010;
 	}
 
-	tmsg->flags = 0x00008200;
+	tmsg->flags = 0x00008201;
 
 	tmp = (char *)tmsg + sizeof(struct type3_message);
 
diff -ru pidgin-2.1.1/libpurple/ntlm.h pidgin-2.2.0/libpurple/ntlm.h
--- pidgin-2.1.1/libpurple/ntlm.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/ntlm.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_NTLM_H
diff -ru pidgin-2.1.1/libpurple/plugin.c pidgin-2.2.0/libpurple/plugin.c
--- pidgin-2.1.1/libpurple/plugin.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugin.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/plugin.h pidgin-2.2.0/libpurple/plugin.h
--- pidgin-2.1.1/libpurple/plugin.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugin.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref plugin-signals
  * @see @ref plugin-ids
@@ -188,6 +188,8 @@
 	/** NULL for plugin actions menu, set to the PurpleConnection for
 	    account actions menu */
 	gpointer context;
+	
+	gpointer user_data;
 };
 
 #define PURPLE_PLUGIN_HAS_ACTIONS(plugin) \
diff -ru pidgin-2.1.1/libpurple/pluginpref.c pidgin-2.2.0/libpurple/pluginpref.c
--- pidgin-2.1.1/libpurple/pluginpref.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/pluginpref.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -ru pidgin-2.1.1/libpurple/pluginpref.h pidgin-2.2.0/libpurple/pluginpref.h
--- pidgin-2.1.1/libpurple/pluginpref.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/pluginpref.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PURPLE_PLUGINPREF_H_
diff -ru pidgin-2.1.1/libpurple/plugins/autoaccept.c pidgin-2.2.0/libpurple/plugins/autoaccept.c
--- pidgin-2.1.1/libpurple/plugins/autoaccept.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/autoaccept.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/plugins/buddynote.c pidgin-2.2.0/libpurple/plugins/buddynote.c
--- pidgin-2.1.1/libpurple/plugins/buddynote.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/buddynote.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/plugins/ciphertest.c pidgin-2.2.0/libpurple/plugins/ciphertest.c
--- pidgin-2.1.1/libpurple/plugins/ciphertest.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ciphertest.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff -ru pidgin-2.1.1/libpurple/plugins/codeinline.c pidgin-2.2.0/libpurple/plugins/codeinline.c
--- pidgin-2.1.1/libpurple/plugins/codeinline.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/codeinline.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/plugins/dbus-buddyicons-example.py pidgin-2.2.0/libpurple/plugins/dbus-buddyicons-example.py
--- pidgin-2.1.1/libpurple/plugins/dbus-buddyicons-example.py	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/dbus-buddyicons-example.py	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 #
 
 import dbus
diff -ru pidgin-2.1.1/libpurple/plugins/dbus-example.c pidgin-2.2.0/libpurple/plugins/dbus-example.c
--- pidgin-2.1.1/libpurple/plugins/dbus-example.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/dbus-example.c	2007-09-14 00:45:39.000000000 -0400
@@ -32,7 +32,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
Only in pidgin-2.2.0/libpurple/plugins: debug_example.c
diff -ru pidgin-2.1.1/libpurple/plugins/fortuneprofile.pl pidgin-2.2.0/libpurple/plugins/fortuneprofile.pl
--- pidgin-2.1.1/libpurple/plugins/fortuneprofile.pl	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/fortuneprofile.pl	2007-09-14 00:45:39.000000000 -0400
@@ -40,7 +40,7 @@
 #
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301 USA
 
 use Gaim;
 
Only in pidgin-2.2.0/libpurple/plugins: helloworld.c
diff -ru pidgin-2.1.1/libpurple/plugins/idle.c pidgin-2.2.0/libpurple/plugins/idle.c
--- pidgin-2.1.1/libpurple/plugins/idle.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/idle.c	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/plugins/ipc-test-client.c pidgin-2.2.0/libpurple/plugins/ipc-test-client.c
--- pidgin-2.1.1/libpurple/plugins/ipc-test-client.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ipc-test-client.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/plugins/ipc-test-server.c pidgin-2.2.0/libpurple/plugins/ipc-test-server.c
--- pidgin-2.1.1/libpurple/plugins/ipc-test-server.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ipc-test-server.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #define IPC_TEST_SERVER_PLUGIN_ID "core-ipc-test-server"
 
diff -ru pidgin-2.1.1/libpurple/plugins/joinpart.c pidgin-2.2.0/libpurple/plugins/joinpart.c
--- pidgin-2.1.1/libpurple/plugins/joinpart.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/joinpart.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/plugins/Makefile.am pidgin-2.2.0/libpurple/plugins/Makefile.am
--- pidgin-2.1.1/libpurple/plugins/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/Makefile.am	2007-09-14 00:45:39.000000000 -0400
@@ -28,10 +28,13 @@
 buddynote_la_LDFLAGS        = -module -avoid-version
 ciphertest_la_LDFLAGS		= -module -avoid-version
 codeinline_la_LDFLAGS		= -module -avoid-version
+debug_example_la_LDFLAGS    = -module -avoid-version
+helloworld_la_LDFLAGS       = -module -avoid-version
 idle_la_LDFLAGS             = -module -avoid-version
 joinpart_la_LDFLAGS         = -module -avoid-version
 log_reader_la_LDFLAGS       = -module -avoid-version
 newline_la_LDFLAGS          = -module -avoid-version
+notify_example_la_LDFLAGS   = -module -avoid-version
 offlinemsg_la_LDFLAGS       = -module -avoid-version
 pluginpref_example_la_LDFLAGS = -module -avoid-version
 psychic_la_LDFLAGS          = -module -avoid-version
@@ -59,6 +62,9 @@
 noinst_LTLIBRARIES = \
 	ciphertest.la \
 	codeinline.la \
+	debug_example.la \
+	helloworld.la \
+	notify_example.la \
 	pluginpref_example.la \
 	signals_test.la \
 	simple.la
@@ -67,10 +73,13 @@
 buddynote_la_SOURCES        = buddynote.c
 ciphertest_la_SOURCES		= ciphertest.c
 codeinline_la_SOURCES		= codeinline.c
+debug_example_la_SOURCES = debug_example.c
+helloworld_la_SOURCES       = helloworld.c
 idle_la_SOURCES             = idle.c
 joinpart_la_SOURCES         = joinpart.c
 log_reader_la_SOURCES       = log_reader.c
 newline_la_SOURCES          = newline.c
+notify_example_la_SOURCES   = notify_example.c
 offlinemsg_la_SOURCES       = offlinemsg.c
 pluginpref_example_la_SOURCES = pluginpref_example.c
 psychic_la_SOURCES          = psychic.c
@@ -86,6 +95,7 @@
 joinpart_la_LIBADD          = $(GLIB_LIBS)
 log_reader_la_LIBADD        = $(GLIB_LIBS)
 newline_la_LIBADD           = $(GLIB_LIBS)
+notify_example_la_LIBADD    = $(GLIB_LIBS)
 offlinemsg_la_LIBADD        = $(GLIB_LIBS)
 pluginpref_example_la_LIBADD = $(GLIB_LIBS)
 psychic_la_LIBADD           = $(GLIB_LIBS)
diff -ru pidgin-2.1.1/libpurple/plugins/Makefile.in pidgin-2.2.0/libpurple/plugins/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/Makefile.in	2007-09-14 03:31:21.000000000 -0400
@@ -86,6 +86,16 @@
 dbus_example_la_OBJECTS = $(am_dbus_example_la_OBJECTS)
 @ENABLE_DBUS_TRUE@@PLUGINS_TRUE@am_dbus_example_la_rpath = -rpath \
 @ENABLE_DBUS_TRUE@@PLUGINS_TRUE@	$(plugindir)
+debug_example_la_LIBADD =
+am__debug_example_la_SOURCES_DIST = debug_example.c
+@PLUGINS_TRUE@am_debug_example_la_OBJECTS = debug_example.lo
+debug_example_la_OBJECTS = $(am_debug_example_la_OBJECTS)
+@PLUGINS_TRUE@am_debug_example_la_rpath =
+helloworld_la_LIBADD =
+am__helloworld_la_SOURCES_DIST = helloworld.c
+@PLUGINS_TRUE@am_helloworld_la_OBJECTS = helloworld.lo
+helloworld_la_OBJECTS = $(am_helloworld_la_OBJECTS)
+@PLUGINS_TRUE@am_helloworld_la_rpath =
 @PLUGINS_TRUE@idle_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__idle_la_SOURCES_DIST = idle.c
 @PLUGINS_TRUE@am_idle_la_OBJECTS = idle.lo
@@ -106,6 +116,11 @@
 @PLUGINS_TRUE@am_newline_la_OBJECTS = newline.lo
 newline_la_OBJECTS = $(am_newline_la_OBJECTS)
 @PLUGINS_TRUE@am_newline_la_rpath = -rpath $(plugindir)
+@PLUGINS_TRUE@notify_example_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__notify_example_la_SOURCES_DIST = notify_example.c
+@PLUGINS_TRUE@am_notify_example_la_OBJECTS = notify_example.lo
+notify_example_la_OBJECTS = $(am_notify_example_la_OBJECTS)
+@PLUGINS_TRUE@am_notify_example_la_rpath =
 @PLUGINS_TRUE@offlinemsg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__offlinemsg_la_SOURCES_DIST = offlinemsg.c
 @PLUGINS_TRUE@am_offlinemsg_la_OBJECTS = offlinemsg.lo
@@ -151,20 +166,24 @@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(autoaccept_la_SOURCES) $(buddynote_la_SOURCES) \
 	$(ciphertest_la_SOURCES) $(codeinline_la_SOURCES) \
-	$(dbus_example_la_SOURCES) $(idle_la_SOURCES) \
+	$(dbus_example_la_SOURCES) $(debug_example_la_SOURCES) \
+	$(helloworld_la_SOURCES) $(idle_la_SOURCES) \
 	$(joinpart_la_SOURCES) $(log_reader_la_SOURCES) \
-	$(newline_la_SOURCES) $(offlinemsg_la_SOURCES) \
-	$(pluginpref_example_la_SOURCES) $(psychic_la_SOURCES) \
-	$(signals_test_la_SOURCES) $(simple_la_SOURCES) \
-	$(statenotify_la_SOURCES)
+	$(newline_la_SOURCES) $(notify_example_la_SOURCES) \
+	$(offlinemsg_la_SOURCES) $(pluginpref_example_la_SOURCES) \
+	$(psychic_la_SOURCES) $(signals_test_la_SOURCES) \
+	$(simple_la_SOURCES) $(statenotify_la_SOURCES)
 DIST_SOURCES = $(am__autoaccept_la_SOURCES_DIST) \
 	$(am__buddynote_la_SOURCES_DIST) \
 	$(am__ciphertest_la_SOURCES_DIST) \
 	$(am__codeinline_la_SOURCES_DIST) \
 	$(am__dbus_example_la_SOURCES_DIST) \
-	$(am__idle_la_SOURCES_DIST) $(am__joinpart_la_SOURCES_DIST) \
+	$(am__debug_example_la_SOURCES_DIST) \
+	$(am__helloworld_la_SOURCES_DIST) $(am__idle_la_SOURCES_DIST) \
+	$(am__joinpart_la_SOURCES_DIST) \
 	$(am__log_reader_la_SOURCES_DIST) \
 	$(am__newline_la_SOURCES_DIST) \
+	$(am__notify_example_la_SOURCES_DIST) \
 	$(am__offlinemsg_la_SOURCES_DIST) \
 	$(am__pluginpref_example_la_SOURCES_DIST) \
 	$(am__psychic_la_SOURCES_DIST) \
@@ -230,6 +249,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -258,6 +279,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -313,14 +336,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -332,7 +353,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -393,6 +413,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -413,6 +434,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -541,10 +564,13 @@
 buddynote_la_LDFLAGS = -module -avoid-version
 ciphertest_la_LDFLAGS = -module -avoid-version
 codeinline_la_LDFLAGS = -module -avoid-version
+debug_example_la_LDFLAGS = -module -avoid-version
+helloworld_la_LDFLAGS = -module -avoid-version
 idle_la_LDFLAGS = -module -avoid-version
 joinpart_la_LDFLAGS = -module -avoid-version
 log_reader_la_LDFLAGS = -module -avoid-version
 newline_la_LDFLAGS = -module -avoid-version
+notify_example_la_LDFLAGS = -module -avoid-version
 offlinemsg_la_LDFLAGS = -module -avoid-version
 pluginpref_example_la_LDFLAGS = -module -avoid-version
 psychic_la_LDFLAGS = -module -avoid-version
@@ -569,6 +595,9 @@
 @PLUGINS_TRUE@noinst_LTLIBRARIES = \
 @PLUGINS_TRUE@	ciphertest.la \
 @PLUGINS_TRUE@	codeinline.la \
+@PLUGINS_TRUE@	debug_example.la \
+@PLUGINS_TRUE@	helloworld.la \
+@PLUGINS_TRUE@	notify_example.la \
 @PLUGINS_TRUE@	pluginpref_example.la \
 @PLUGINS_TRUE@	signals_test.la \
 @PLUGINS_TRUE@	simple.la
@@ -577,10 +606,13 @@
 @PLUGINS_TRUE@buddynote_la_SOURCES = buddynote.c
 @PLUGINS_TRUE@ciphertest_la_SOURCES = ciphertest.c
 @PLUGINS_TRUE@codeinline_la_SOURCES = codeinline.c
+@PLUGINS_TRUE@debug_example_la_SOURCES = debug_example.c
+@PLUGINS_TRUE@helloworld_la_SOURCES = helloworld.c
 @PLUGINS_TRUE@idle_la_SOURCES = idle.c
 @PLUGINS_TRUE@joinpart_la_SOURCES = joinpart.c
 @PLUGINS_TRUE@log_reader_la_SOURCES = log_reader.c
 @PLUGINS_TRUE@newline_la_SOURCES = newline.c
+@PLUGINS_TRUE@notify_example_la_SOURCES = notify_example.c
 @PLUGINS_TRUE@offlinemsg_la_SOURCES = offlinemsg.c
 @PLUGINS_TRUE@pluginpref_example_la_SOURCES = pluginpref_example.c
 @PLUGINS_TRUE@psychic_la_SOURCES = psychic.c
@@ -595,6 +627,7 @@
 @PLUGINS_TRUE@joinpart_la_LIBADD = $(GLIB_LIBS)
 @PLUGINS_TRUE@log_reader_la_LIBADD = $(GLIB_LIBS)
 @PLUGINS_TRUE@newline_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@notify_example_la_LIBADD = $(GLIB_LIBS)
 @PLUGINS_TRUE@offlinemsg_la_LIBADD = $(GLIB_LIBS)
 @PLUGINS_TRUE@pluginpref_example_la_LIBADD = $(GLIB_LIBS)
 @PLUGINS_TRUE@psychic_la_LIBADD = $(GLIB_LIBS)
@@ -707,6 +740,10 @@
 	$(LINK) $(am_codeinline_la_rpath) $(codeinline_la_LDFLAGS) $(codeinline_la_OBJECTS) $(codeinline_la_LIBADD) $(LIBS)
 dbus-example.la: $(dbus_example_la_OBJECTS) $(dbus_example_la_DEPENDENCIES) 
 	$(LINK) $(am_dbus_example_la_rpath) $(dbus_example_la_LDFLAGS) $(dbus_example_la_OBJECTS) $(dbus_example_la_LIBADD) $(LIBS)
+debug_example.la: $(debug_example_la_OBJECTS) $(debug_example_la_DEPENDENCIES) 
+	$(LINK) $(am_debug_example_la_rpath) $(debug_example_la_LDFLAGS) $(debug_example_la_OBJECTS) $(debug_example_la_LIBADD) $(LIBS)
+helloworld.la: $(helloworld_la_OBJECTS) $(helloworld_la_DEPENDENCIES) 
+	$(LINK) $(am_helloworld_la_rpath) $(helloworld_la_LDFLAGS) $(helloworld_la_OBJECTS) $(helloworld_la_LIBADD) $(LIBS)
 idle.la: $(idle_la_OBJECTS) $(idle_la_DEPENDENCIES) 
 	$(LINK) $(am_idle_la_rpath) $(idle_la_LDFLAGS) $(idle_la_OBJECTS) $(idle_la_LIBADD) $(LIBS)
 joinpart.la: $(joinpart_la_OBJECTS) $(joinpart_la_DEPENDENCIES) 
@@ -715,6 +752,8 @@
 	$(LINK) $(am_log_reader_la_rpath) $(log_reader_la_LDFLAGS) $(log_reader_la_OBJECTS) $(log_reader_la_LIBADD) $(LIBS)
 newline.la: $(newline_la_OBJECTS) $(newline_la_DEPENDENCIES) 
 	$(LINK) $(am_newline_la_rpath) $(newline_la_LDFLAGS) $(newline_la_OBJECTS) $(newline_la_LIBADD) $(LIBS)
+notify_example.la: $(notify_example_la_OBJECTS) $(notify_example_la_DEPENDENCIES) 
+	$(LINK) $(am_notify_example_la_rpath) $(notify_example_la_LDFLAGS) $(notify_example_la_OBJECTS) $(notify_example_la_LIBADD) $(LIBS)
 offlinemsg.la: $(offlinemsg_la_OBJECTS) $(offlinemsg_la_DEPENDENCIES) 
 	$(LINK) $(am_offlinemsg_la_rpath) $(offlinemsg_la_LDFLAGS) $(offlinemsg_la_OBJECTS) $(offlinemsg_la_LIBADD) $(LIBS)
 pluginpref_example.la: $(pluginpref_example_la_OBJECTS) $(pluginpref_example_la_DEPENDENCIES) 
@@ -739,10 +778,13 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ciphertest.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/codeinline.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-example.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_example.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helloworld.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idle.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/joinpart.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_reader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify_example.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/offlinemsg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pluginpref_example.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psychic.Plo@am__quote@
diff -ru pidgin-2.1.1/libpurple/plugins/mono/api/Makefile.in pidgin-2.2.0/libpurple/plugins/mono/api/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/mono/api/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/mono/api/Makefile.in	2007-09-14 03:31:21.000000000 -0400
@@ -103,6 +103,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -131,6 +133,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -186,14 +190,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -205,7 +207,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -266,6 +267,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -286,6 +288,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/mono/loader/Makefile.in pidgin-2.2.0/libpurple/plugins/mono/loader/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/mono/loader/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/mono/loader/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -127,6 +127,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -155,6 +157,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -210,14 +214,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -229,7 +231,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -290,6 +291,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -310,6 +312,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/mono/Makefile.in pidgin-2.2.0/libpurple/plugins/mono/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/mono/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/mono/Makefile.in	2007-09-14 03:31:21.000000000 -0400
@@ -112,6 +112,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -140,6 +142,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -195,14 +199,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -214,7 +216,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -275,6 +276,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -295,6 +297,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/newline.c pidgin-2.2.0/libpurple/plugins/newline.c
--- pidgin-2.1.1/libpurple/plugins/newline.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/newline.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 #include "internal.h"
 
Only in pidgin-2.2.0/libpurple/plugins: notify_example.c
diff -ru pidgin-2.1.1/libpurple/plugins/offlinemsg.c pidgin-2.2.0/libpurple/plugins/offlinemsg.c
--- pidgin-2.1.1/libpurple/plugins/offlinemsg.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/offlinemsg.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 
@@ -113,6 +113,10 @@
 	PurpleConversation *conv;
 	OfflineMessageSetting setting;
 
+	if (message == NULL || *message == NULL ||
+			**message == '\0')
+		return;
+
 	buddy = purple_find_buddy(account, who);
 	if (!buddy)
 		return;
@@ -122,7 +126,7 @@
 
 	if (purple_account_supports_offline_message(account, buddy))
 	{
-		purple_debug_info("offlinemsg", "Account \"%s\" supports offline message.",
+		purple_debug_info("offlinemsg", "Account \"%s\" supports offline messages.\n",
 					purple_account_get_username(account));
 		return;
 	}
@@ -167,8 +171,8 @@
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
-	purple_signal_connect(purple_conversations_get_handle(), "sending-im-msg",
-					plugin, PURPLE_CALLBACK(sending_msg_cb), plugin);
+	purple_signal_connect_priority(purple_conversations_get_handle(), "sending-im-msg",
+					plugin, PURPLE_CALLBACK(sending_msg_cb), plugin, PURPLE_SIGNAL_PRIORITY_HIGHEST);
 	return TRUE;
 }
 
diff -ru pidgin-2.1.1/libpurple/plugins/perl/Makefile.in pidgin-2.2.0/libpurple/plugins/perl/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/perl/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/perl/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -125,6 +125,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -153,6 +155,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -208,14 +212,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -227,7 +229,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -288,6 +289,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -308,6 +310,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/perl/perl.c pidgin-2.2.0/libpurple/plugins/perl/perl.c
--- pidgin-2.1.1/libpurple/plugins/perl/perl.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/perl/perl.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff -ru pidgin-2.1.1/libpurple/plugins/pluginpref_example.c pidgin-2.2.0/libpurple/plugins/pluginpref_example.c
--- pidgin-2.1.1/libpurple/plugins/pluginpref_example.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/pluginpref_example.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff -ru pidgin-2.1.1/libpurple/plugins/psychic.c pidgin-2.2.0/libpurple/plugins/psychic.c
--- pidgin-2.1.1/libpurple/plugins/psychic.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/psychic.c	2007-09-06 00:09:40.000000000 -0400
@@ -49,7 +49,7 @@
   }
 
   if(FALSE == purple_privacy_check(acct, name)) {
-    purple_debug_info("psychic", "user %s is blocked", name);
+    purple_debug_info("psychic", "user %s is blocked\n", name);
     return;
   }
 
diff -ru pidgin-2.1.1/libpurple/plugins/signals-test.c pidgin-2.2.0/libpurple/plugins/signals-test.c
--- pidgin-2.1.1/libpurple/plugins/signals-test.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/signals-test.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
 
diff -ru pidgin-2.1.1/libpurple/plugins/ssl/Makefile.in pidgin-2.2.0/libpurple/plugins/ssl/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/ssl/Makefile.in	2007-08-20 14:13:54.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ssl/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -142,6 +142,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -170,6 +172,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -225,14 +229,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -244,7 +246,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -305,6 +306,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -325,6 +327,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/ssl/Makefile.mingw pidgin-2.2.0/libpurple/plugins/ssl/Makefile.mingw
--- pidgin-2.1.1/libpurple/plugins/ssl/Makefile.mingw	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ssl/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -18,6 +18,7 @@
 			$(NSS_TOP)/lib/nss3.dll \
 			$(NSS_TOP)/lib/nssckbi.dll \
 			$(NSS_TOP)/lib/softokn3.dll \
+			$(NSS_TOP)/lib/smime3.dll \
 			$(NSS_TOP)/lib/ssl3.dll \
 			$(NSPR_TOP)/lib/nspr4.dll \
 			$(NSPR_TOP)/lib/plc4.dll \
@@ -59,7 +60,8 @@
 			-lpurple \
 			-lnss3 \
 			-lnspr4 \
-			-lssl3
+			-lssl3 \
+			-lsmime3
 
 include $(PIDGIN_COMMON_RULES)
 
diff -ru pidgin-2.1.1/libpurple/plugins/ssl/ssl.c pidgin-2.2.0/libpurple/plugins/ssl/ssl.c
--- pidgin-2.1.1/libpurple/plugins/ssl/ssl.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ssl/ssl.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/plugins/ssl/ssl-gnutls.c pidgin-2.2.0/libpurple/plugins/ssl/ssl-gnutls.c
--- pidgin-2.1.1/libpurple/plugins/ssl/ssl-gnutls.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ssl/ssl-gnutls.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,19 +17,22 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "debug.h"
+#include "certificate.h"
 #include "plugin.h"
 #include "sslconn.h"
 #include "version.h"
+#include "util.h"
 
 #define SSL_GNUTLS_PLUGIN_ID "ssl-gnutls"
 
 #ifdef HAVE_GNUTLS
 
 #include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
 
 typedef struct
 {
@@ -44,9 +47,25 @@
 static void
 ssl_gnutls_init_gnutls(void)
 {
+	/* Configure GnuTLS to use glib memory management */
+	/* I expect that this isn't really necessary, but it may prevent
+	   some bugs */
+	/* TODO: It may be necessary to wrap this allocators for GnuTLS.
+	   If there are strange bugs, perhaps look here (yes, I am a
+	   hypocrite) */
+	gnutls_global_set_mem_functions(
+		(gnutls_alloc_function)   g_malloc0, /* malloc */
+		(gnutls_alloc_function)   g_malloc0, /* secure malloc */
+		NULL,      /* mem_is_secure */
+		(gnutls_realloc_function) g_realloc, /* realloc */
+		(gnutls_free_function)    g_free     /* free */
+		);
+
 	gnutls_global_init();
 
 	gnutls_certificate_allocate_credentials(&xcred);
+
+	/* TODO: I can likely remove this */
 	gnutls_certificate_set_x509_trust_file(xcred, "ca.pem",
 		GNUTLS_X509_FMT_PEM);
 }
@@ -54,7 +73,7 @@
 static gboolean
 ssl_gnutls_init(void)
 {
-   return TRUE;
+	return TRUE;
 }
 
 static void
@@ -65,6 +84,25 @@
 	gnutls_certificate_free_credentials(xcred);
 }
 
+static void
+ssl_gnutls_verified_cb(PurpleCertificateVerificationStatus st,
+		       gpointer userdata)
+{
+	PurpleSslConnection *gsc = (PurpleSslConnection *) userdata;
+
+	if (st == PURPLE_CERTIFICATE_VALID) {
+		/* Certificate valid? Good! Do the connection! */
+		gsc->connect_cb(gsc->connect_cb_data, gsc, PURPLE_INPUT_READ);
+	} else {
+		/* Otherwise, signal an error */
+		if(gsc->error_cb != NULL)
+			gsc->error_cb(gsc, PURPLE_SSL_CERTIFICATE_INVALID,
+				      gsc->connect_cb_data);
+		purple_ssl_close(gsc);
+	}
+}
+
+
 
 static void ssl_gnutls_handshake_cb(gpointer data, gint source,
 		PurpleInputCondition cond)
@@ -73,7 +111,7 @@
 	PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
 	ssize_t ret;
 
-	purple_debug_info("gnutls", "Handshaking\n");
+	purple_debug_info("gnutls", "Handshaking with %s\n", gsc->host);
 	ret = gnutls_handshake(gnutls_data->session);
 
 	if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
@@ -92,9 +130,119 @@
 
 		purple_ssl_close(gsc);
 	} else {
+		/* Now we are cooking with gas! */
+		PurpleSslOps *ops = purple_ssl_get_ops();
+		GList * peers = ops->get_peer_certificates(gsc);
+
+		PurpleCertificateScheme *x509 =
+			purple_certificate_find_scheme("x509");
+
+		GList * l;
+
+		/* TODO: Remove all this debugging babble */
 		purple_debug_info("gnutls", "Handshake complete\n");
 
-		gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
+		for (l=peers; l; l = l->next) {
+			PurpleCertificate *crt = l->data;
+			GByteArray *z =
+				x509->get_fingerprint_sha1(crt);
+			gchar * fpr =
+				purple_base16_encode_chunked(z->data,
+							     z->len);
+
+			purple_debug_info("gnutls/x509",
+					  "Key print: %s\n",
+					  fpr);
+
+			/* Kill the cert! */
+			x509->destroy_certificate(crt);
+
+			g_free(fpr);
+			g_byte_array_free(z, TRUE);
+		}
+		g_list_free(peers);
+
+		{
+			const gnutls_datum_t *cert_list;
+			unsigned int cert_list_size = 0;
+			gnutls_session_t session=gnutls_data->session;
+			int i;
+
+			cert_list =
+				gnutls_certificate_get_peers(session, &cert_list_size);
+
+			purple_debug_info("gnutls",
+					    "Peer provided %d certs\n",
+					    cert_list_size);
+			for (i=0; i<cert_list_size; i++)
+			{
+				gchar fpr_bin[256];
+				gsize fpr_bin_sz = sizeof(fpr_bin);
+				gchar * fpr_asc = NULL;
+				gchar tbuf[256];
+				gsize tsz=sizeof(tbuf);
+				gchar * tasc = NULL;
+				gnutls_x509_crt_t cert;
+
+				gnutls_x509_crt_init(&cert);
+				gnutls_x509_crt_import (cert, &cert_list[i],
+						GNUTLS_X509_FMT_DER);
+
+				gnutls_x509_crt_get_fingerprint(cert, GNUTLS_MAC_SHA,
+						fpr_bin, &fpr_bin_sz);
+
+				fpr_asc =
+						purple_base16_encode_chunked((const guchar *)fpr_bin, fpr_bin_sz);
+
+				purple_debug_info("gnutls",
+						"Lvl %d SHA1 fingerprint: %s\n",
+						i, fpr_asc);
+
+				tsz=sizeof(tbuf);
+				gnutls_x509_crt_get_serial(cert,tbuf,&tsz);
+				tasc=purple_base16_encode_chunked((const guchar *)tbuf, tsz);
+				purple_debug_info("gnutls",
+						"Serial: %s\n",
+						tasc);
+				g_free(tasc);
+
+				tsz=sizeof(tbuf);
+				gnutls_x509_crt_get_dn (cert, tbuf, &tsz);
+				purple_debug_info("gnutls",
+						"Cert DN: %s\n",
+						tbuf);
+				tsz=sizeof(tbuf);
+				gnutls_x509_crt_get_issuer_dn (cert, tbuf, &tsz);
+				purple_debug_info("gnutls",
+						"Cert Issuer DN: %s\n",
+						tbuf);
+
+				g_free(fpr_asc);
+				fpr_asc = NULL;
+				gnutls_x509_crt_deinit(cert);
+			}
+		}
+
+		/* TODO: The following logic should really be in libpurple */
+		/* If a Verifier was given, hand control over to it */
+		if (gsc->verifier) {
+			GList *peers;
+			/* First, get the peer cert chain */
+			peers = purple_ssl_get_peer_certificates(gsc);
+
+			/* Now kick off the verification process */
+			purple_certificate_verify(gsc->verifier,
+						  gsc->host,
+						  peers,
+						  ssl_gnutls_verified_cb,
+						  gsc);
+
+			purple_certificate_destroy_list(peers);
+		} else {
+			/* Otherwise, just call the "connection complete"
+			   callback */
+			gsc->connect_cb(gsc->connect_cb_data, gsc, cond);
+		}
 	}
 
 }
@@ -213,6 +361,565 @@
 	return s;
 }
 
+/* Forward declarations are fun! */
+static PurpleCertificate *
+x509_import_from_datum(const gnutls_datum_t dt, gnutls_x509_crt_fmt_t mode);
+
+static GList *
+ssl_gnutls_get_peer_certificates(PurpleSslConnection * gsc)
+{
+	PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
+
+	/* List of Certificate instances to return */
+	GList * peer_certs = NULL;
+
+	/* List of raw certificates as given by GnuTLS */
+	const gnutls_datum_t *cert_list;
+	unsigned int cert_list_size = 0;
+
+	unsigned int i;
+
+	/* This should never, ever happen. */
+	g_return_val_if_fail( gnutls_certificate_type_get (gnutls_data->session) == GNUTLS_CRT_X509, NULL);
+
+	/* Get the certificate list from GnuTLS */
+	/* TODO: I am _pretty sure_ this doesn't block or do other exciting things */
+	cert_list = gnutls_certificate_get_peers(gnutls_data->session,
+						 &cert_list_size);
+
+	/* Convert each certificate to a Certificate and append it to the list */
+	for (i = 0; i < cert_list_size; i++) {
+		PurpleCertificate * newcrt = x509_import_from_datum(cert_list[i],
+							      GNUTLS_X509_FMT_DER);
+		/* Append is somewhat inefficient on linked lists, but is easy
+		   to read. If someone complains, I'll change it.
+		   TODO: Is anyone complaining? (Maybe elb?) */
+		peer_certs = g_list_append(peer_certs, newcrt);
+	}
+
+	/* cert_list doesn't need free()-ing */
+
+	return peer_certs;
+}
+
+/************************************************************************/
+/* X.509 functionality                                                  */
+/************************************************************************/
+const gchar * SCHEME_NAME = "x509";
+
+static PurpleCertificateScheme x509_gnutls;
+
+/** Refcounted GnuTLS certificate data instance */
+typedef struct {
+	gint refcount;
+	gnutls_x509_crt_t crt;
+} x509_crtdata_t;
+
+/** Helper functions for reference counting */
+static x509_crtdata_t *
+x509_crtdata_addref(x509_crtdata_t *cd)
+{
+	(cd->refcount)++;
+	return cd;
+}
+
+static void
+x509_crtdata_delref(x509_crtdata_t *cd)
+{
+	(cd->refcount)--;
+
+	if (cd->refcount < 0)
+		g_critical("Refcount of x509_crtdata_t is %d, which is less "
+				"than zero!\n", cd->refcount);
+
+	/* If the refcount reaches zero, kill the structure */
+	if (cd->refcount <= 0) {
+		purple_debug_info("gnutls/x509",
+				  "Freeing unused cert data at %p\n",
+				  cd);
+		/* Kill the internal data */
+		gnutls_x509_crt_deinit( cd->crt );
+		/* And kill the struct */
+		g_free( cd );
+	}
+}
+
+/** Helper macro to retrieve the GnuTLS crt_t from a PurpleCertificate */
+#define X509_GET_GNUTLS_DATA(pcrt) ( ((x509_crtdata_t *) (pcrt->data))->crt)
+
+/** Transforms a gnutls_datum_t containing an X.509 certificate into a Certificate instance under the x509_gnutls scheme
+ *
+ * @param dt   Datum to transform
+ * @param mode GnuTLS certificate format specifier (GNUTLS_X509_FMT_PEM for
+ *             reading from files, and GNUTLS_X509_FMT_DER for converting
+ *             "over the wire" certs for SSL)
+ *
+ * @return A newly allocated Certificate structure of the x509_gnutls scheme
+ */
+static PurpleCertificate *
+x509_import_from_datum(const gnutls_datum_t dt, gnutls_x509_crt_fmt_t mode)
+{
+	/* Internal certificate data structure */
+	x509_crtdata_t *certdat;
+	/* New certificate to return */
+	PurpleCertificate * crt;
+
+	/* Allocate and prepare the internal certificate data */
+	certdat = g_new0(x509_crtdata_t, 1);
+	gnutls_x509_crt_init(&(certdat->crt));
+	certdat->refcount = 0;
+
+	/* Perform the actual certificate parse */
+	/* Yes, certdat->crt should be passed as-is */
+	gnutls_x509_crt_import(certdat->crt, &dt, mode);
+
+	/* Allocate the certificate and load it with data */
+	crt = g_new0(PurpleCertificate, 1);
+	crt->scheme = &x509_gnutls;
+	crt->data = x509_crtdata_addref(certdat);
+
+	return crt;
+}
+
+/** Imports a PEM-formatted X.509 certificate from the specified file.
+ * @param filename Filename to import from. Format is PEM
+ *
+ * @return A newly allocated Certificate structure of the x509_gnutls scheme
+ */
+static PurpleCertificate *
+x509_import_from_file(const gchar * filename)
+{
+	PurpleCertificate *crt;  /* Certificate being constructed */
+	gchar *buf;        /* Used to load the raw file data */
+	gsize buf_sz;      /* Size of the above */
+	gnutls_datum_t dt; /* Struct to pass down to GnuTLS */
+
+	purple_debug_info("gnutls",
+			  "Attempting to load X.509 certificate from %s\n",
+			  filename);
+
+	/* Next, we'll simply yank the entire contents of the file
+	   into memory */
+	/* TODO: Should I worry about very large files here? */
+	g_return_val_if_fail(
+		g_file_get_contents(filename,
+			    &buf,
+			    &buf_sz,
+			    NULL      /* No error checking for now */
+		),
+		NULL);
+
+	/* Load the datum struct */
+	dt.data = (unsigned char *) buf;
+	dt.size = buf_sz;
+
+	/* Perform the conversion */
+	crt = x509_import_from_datum(dt,
+				     GNUTLS_X509_FMT_PEM); // files should be in PEM format
+
+	/* Cleanup */
+	g_free(buf);
+
+	return crt;
+}
+
+/**
+ * Exports a PEM-formatted X.509 certificate to the specified file.
+ * @param filename Filename to export to. Format will be PEM
+ * @param crt      Certificate to export
+ *
+ * @return TRUE if success, otherwise FALSE
+ */
+static gboolean
+x509_export_certificate(const gchar *filename, PurpleCertificate *crt)
+{
+	gnutls_x509_crt_t crt_dat; /* GnuTLS cert struct */
+	int ret;
+	gchar * out_buf; /* Data to output */
+	size_t out_size; /* Output size */
+	gboolean success = FALSE;
+
+	/* Paranoia paranoia paranoia! */
+	g_return_val_if_fail(filename, FALSE);
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);
+	g_return_val_if_fail(crt->data, FALSE);
+
+	crt_dat = X509_GET_GNUTLS_DATA(crt);
+
+	/* Obtain the output size required */
+	out_size = 0;
+	ret = gnutls_x509_crt_export(crt_dat, GNUTLS_X509_FMT_PEM,
+				     NULL, /* Provide no buffer yet */
+				     &out_size /* Put size here */
+		);
+	g_return_val_if_fail(ret == GNUTLS_E_SHORT_MEMORY_BUFFER, FALSE);
+
+	/* Now allocate a buffer and *really* export it */
+	out_buf = g_new0(gchar, out_size);
+	ret = gnutls_x509_crt_export(crt_dat, GNUTLS_X509_FMT_PEM,
+				     out_buf, /* Export to our new buffer */
+				     &out_size /* Put size here */
+		);
+	if (ret != 0) {
+		purple_debug_error("gnutls/x509",
+				   "Failed to export cert to buffer with code %d\n",
+				   ret);
+		g_free(out_buf);
+		return FALSE;
+	}
+
+	/* Write it out to an actual file */
+	success = purple_util_write_data_to_file_absolute(filename,
+							  out_buf, out_size);
+
+	g_free(out_buf);
+	g_return_val_if_fail(success, FALSE);
+	return success;
+}
+
+static PurpleCertificate *
+x509_copy_certificate(PurpleCertificate *crt)
+{
+	x509_crtdata_t *crtdat;
+	PurpleCertificate *newcrt;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL);
+
+	crtdat = (x509_crtdata_t *) crt->data;
+
+	newcrt = g_new0(PurpleCertificate, 1);
+	newcrt->scheme = &x509_gnutls;
+	newcrt->data = x509_crtdata_addref(crtdat);
+
+	return newcrt;
+}
+/** Frees a Certificate
+ *
+ * Destroys a Certificate's internal data structures and frees the pointer
+ * given.
+ * @param crt Certificate instance to be destroyed. It WILL NOT be destroyed
+ *            if it is not of the correct CertificateScheme. Can be NULL
+ *
+ */
+static void
+x509_destroy_certificate(PurpleCertificate * crt)
+{
+	if (NULL == crt) return;
+
+	/* Check that the scheme is x509_gnutls */
+	if ( crt->scheme != &x509_gnutls ) {
+		purple_debug_error("gnutls",
+				   "destroy_certificate attempted on certificate of wrong scheme (scheme was %s, expected %s)\n",
+				   crt->scheme->name,
+				   SCHEME_NAME);
+		return;
+	}
+
+	g_return_if_fail(crt->data != NULL);
+	g_return_if_fail(crt->scheme != NULL);
+
+	/* Use the reference counting system to free (or not) the
+	   underlying data */
+	x509_crtdata_delref((x509_crtdata_t *)crt->data);
+
+	/* Kill the structure itself */
+	g_free(crt);
+}
+
+/** Determines whether one certificate has been issued and signed by another
+ *
+ * @param crt       Certificate to check the signature of
+ * @param issuer    Issuer's certificate
+ *
+ * @return TRUE if crt was signed and issued by issuer, otherwise FALSE
+ * @TODO  Modify this function to return a reason for invalidity?
+ */
+static gboolean
+x509_certificate_signed_by(PurpleCertificate * crt,
+			   PurpleCertificate * issuer)
+{
+	gnutls_x509_crt_t crt_dat;
+	gnutls_x509_crt_t issuer_dat;
+	unsigned int verify; /* used to store result from GnuTLS verifier */
+	int ret;
+
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(issuer, FALSE);
+
+	/* Verify that both certs are the correct scheme */
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);
+	g_return_val_if_fail(issuer->scheme == &x509_gnutls, FALSE);
+
+	/* TODO: check for more nullness? */
+
+	crt_dat = X509_GET_GNUTLS_DATA(crt);
+	issuer_dat = X509_GET_GNUTLS_DATA(issuer);
+
+	/* First, let's check that crt.issuer is actually issuer */
+	ret = gnutls_x509_crt_check_issuer(crt_dat, issuer_dat);
+	if (ret <= 0) {
+
+		if (ret < 0) {
+			purple_debug_error("gnutls/x509",
+					   "GnuTLS error %d while checking certificate issuer match.",
+					   ret);
+		} else {
+			gchar *crt_id, *issuer_id, *crt_issuer_id;
+			crt_id = purple_certificate_get_unique_id(crt);
+			issuer_id = purple_certificate_get_unique_id(issuer);
+			crt_issuer_id =
+				purple_certificate_get_issuer_unique_id(crt);
+			purple_debug_info("gnutls/x509",
+					  "Certificate for %s claims to be "
+					  "issued by %s, but the certificate "
+					  "for %s does not match. A strcmp "
+					  "says %d\n",
+					  crt_id, crt_issuer_id, issuer_id,
+					  strcmp(crt_issuer_id, issuer_id));
+			g_free(crt_id);
+			g_free(issuer_id);
+			g_free(crt_issuer_id);
+		}
+
+		/* The issuer is not correct, or there were errors */
+		return FALSE;
+	}
+
+	/* Now, check the signature */
+	/* The second argument is a ptr to an array of "trusted" issuer certs,
+	   but we're only using one trusted one */
+	ret = gnutls_x509_crt_verify(crt_dat, &issuer_dat, 1,
+				     /* Permit signings by X.509v1 certs
+					(Verisign and possibly others have
+					root certificates that predate the
+					current standard) */
+				     GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
+				     &verify);
+
+	if (ret != 0) {
+		purple_debug_error("gnutls/x509",
+				   "Attempted certificate verification caused a GnuTLS error code %d. I will just say the signature is bad, but you should look into this.\n", ret);
+		return FALSE;
+	}
+
+	if (verify & GNUTLS_CERT_INVALID) {
+		/* Signature didn't check out, but at least
+		   there were no errors*/
+		gchar *crt_id = purple_certificate_get_unique_id(crt);
+		gchar *issuer_id = purple_certificate_get_issuer_unique_id(crt);
+		purple_debug_info("gnutls/x509",
+				  "Bad signature for %s on %s\n",
+				  issuer_id, crt_id);
+		g_free(crt_id);
+		g_free(issuer_id);
+
+		return FALSE;
+	} /* if (ret, etc.) */
+
+	/* If we got here, the signature is good */
+	return TRUE;
+}
+
+static GByteArray *
+x509_sha1sum(PurpleCertificate *crt)
+{
+	size_t hashlen = 20; /* SHA1 hashes are 20 bytes */
+	size_t tmpsz = hashlen; /* Throw-away variable for GnuTLS to stomp on*/
+	gnutls_x509_crt_t crt_dat;
+	GByteArray *hash; /**< Final hash container */
+	guchar hashbuf[hashlen]; /**< Temporary buffer to contain hash */
+
+	g_return_val_if_fail(crt, NULL);
+
+	crt_dat = X509_GET_GNUTLS_DATA(crt);
+
+	/* Extract the fingerprint */
+	g_return_val_if_fail(
+		0 == gnutls_x509_crt_get_fingerprint(crt_dat, GNUTLS_MAC_SHA,
+						     hashbuf, &tmpsz),
+		NULL);
+
+	/* This shouldn't happen */
+	g_return_val_if_fail(tmpsz == hashlen, NULL);
+
+	/* Okay, now create and fill hash array */
+	hash = g_byte_array_new();
+	g_byte_array_append(hash, hashbuf, hashlen);
+
+	return hash;
+}
+
+static gchar *
+x509_cert_dn (PurpleCertificate *crt)
+{
+	gnutls_x509_crt_t cert_dat;
+	gchar *dn = NULL;
+	size_t dn_size;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL);
+
+	cert_dat = X509_GET_GNUTLS_DATA(crt);
+
+	/* Figure out the length of the Distinguished Name */
+	/* Claim that the buffer is size 0 so GnuTLS just tells us how much
+	   space it needs */
+	dn_size = 0;
+	gnutls_x509_crt_get_dn(cert_dat, dn, &dn_size);
+
+	/* Now allocate and get the Distinguished Name */
+	dn = g_new0(gchar, dn_size);
+	if (0 != gnutls_x509_crt_get_dn(cert_dat, dn, &dn_size)) {
+		purple_debug_error("gnutls/x509",
+				   "Failed to get Distinguished Name\n");
+		g_free(dn);
+		return NULL;
+	}
+
+	return dn;
+}
+
+static gchar *
+x509_issuer_dn (PurpleCertificate *crt)
+{
+	gnutls_x509_crt_t cert_dat;
+	gchar *dn = NULL;
+	size_t dn_size;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL);
+
+	cert_dat = X509_GET_GNUTLS_DATA(crt);
+
+	/* Figure out the length of the Distinguished Name */
+	/* Claim that the buffer is size 0 so GnuTLS just tells us how much
+	   space it needs */
+	dn_size = 0;
+	gnutls_x509_crt_get_issuer_dn(cert_dat, dn, &dn_size);
+
+	/* Now allocate and get the Distinguished Name */
+	dn = g_new0(gchar, dn_size);
+	if (0 != gnutls_x509_crt_get_issuer_dn(cert_dat, dn, &dn_size)) {
+		purple_debug_error("gnutls/x509",
+				   "Failed to get issuer's Distinguished "
+				   "Name\n");
+		g_free(dn);
+		return NULL;
+	}
+
+	return dn;
+}
+
+static gchar *
+x509_common_name (PurpleCertificate *crt)
+{
+	gnutls_x509_crt_t cert_dat;
+	gchar *cn = NULL;
+	size_t cn_size;
+	int ret;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, NULL);
+
+	cert_dat = X509_GET_GNUTLS_DATA(crt);
+
+	/* Figure out the length of the Common Name */
+	/* Claim that the buffer is size 0 so GnuTLS just tells us how much
+	   space it needs */
+	cn_size = 0;
+	gnutls_x509_crt_get_dn_by_oid(cert_dat,
+				      GNUTLS_OID_X520_COMMON_NAME,
+				      0, /* First CN found, please */
+				      0, /* Not in raw mode */
+				      cn, &cn_size);
+
+	/* Now allocate and get the Common Name */
+	cn = g_new0(gchar, cn_size);
+	ret = gnutls_x509_crt_get_dn_by_oid(cert_dat,
+					    GNUTLS_OID_X520_COMMON_NAME,
+					    0, /* First CN found, please */
+					    0, /* Not in raw mode */
+					    cn, &cn_size);
+	if (ret != 0) {
+		purple_debug_error("gnutls/x509",
+				   "Failed to get Common Name\n");
+		g_free(cn);
+		return NULL;
+	}
+
+	return cn;
+}
+
+static gboolean
+x509_check_name (PurpleCertificate *crt, const gchar *name)
+{
+	gnutls_x509_crt_t crt_dat;
+
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);
+	g_return_val_if_fail(name, FALSE);
+
+	crt_dat = X509_GET_GNUTLS_DATA(crt);
+
+	if (gnutls_x509_crt_check_hostname(crt_dat, name)) {
+		return TRUE;
+	} else {
+		return FALSE;
+	}
+}
+
+static gboolean
+x509_times (PurpleCertificate *crt, time_t *activation, time_t *expiration)
+{
+	gnutls_x509_crt_t crt_dat;
+	/* GnuTLS time functions return this on error */
+	const time_t errval = (time_t) (-1);
+
+
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_gnutls, FALSE);
+
+	crt_dat = X509_GET_GNUTLS_DATA(crt);
+
+	if (activation) {
+		*activation = gnutls_x509_crt_get_activation_time(crt_dat);
+	}
+	if (expiration) {
+		*expiration = gnutls_x509_crt_get_expiration_time(crt_dat);
+	}
+
+	if (*activation == errval || *expiration == errval) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* X.509 certificate operations provided by this plugin */
+static PurpleCertificateScheme x509_gnutls = {
+	"x509",                          /* Scheme name */
+	N_("X.509 Certificates"),        /* User-visible scheme name */
+	x509_import_from_file,           /* Certificate import function */
+	x509_export_certificate,         /* Certificate export function */
+	x509_copy_certificate,           /* Copy */
+	x509_destroy_certificate,        /* Destroy cert */
+	x509_certificate_signed_by,      /* Signature checker */
+	x509_sha1sum,                    /* SHA1 fingerprint */
+	x509_cert_dn,                    /* Unique ID */
+	x509_issuer_dn,                  /* Issuer Unique ID */
+	x509_common_name,                /* Subject name */
+	x509_check_name,                 /* Check subject name */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+
+};
+
 static PurpleSslOps ssl_ops =
 {
 	ssl_gnutls_init,
@@ -221,11 +928,11 @@
 	ssl_gnutls_close,
 	ssl_gnutls_read,
 	ssl_gnutls_write,
+	ssl_gnutls_get_peer_certificates,
 
 	/* padding */
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 
@@ -242,6 +949,9 @@
 	/* Init GNUTLS now so others can use it even if sslconn never does */
 	ssl_gnutls_init_gnutls();
 
+	/* Register that we're providing an X.509 CertScheme */
+	purple_certificate_register_scheme( &x509_gnutls );
+
 	return TRUE;
 #else
 	return FALSE;
@@ -255,6 +965,8 @@
 	if(purple_ssl_get_ops() == &ssl_ops) {
 		purple_ssl_set_ops(NULL);
 	}
+
+	purple_certificate_unregister_scheme( &x509_gnutls );
 #endif
 
 	return TRUE;
diff -ru pidgin-2.1.1/libpurple/plugins/ssl/ssl-nss.c pidgin-2.2.0/libpurple/plugins/ssl/ssl-nss.c
--- pidgin-2.1.1/libpurple/plugins/ssl/ssl-nss.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/ssl/ssl-nss.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,12 +17,14 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "debug.h"
+#include "certificate.h"
 #include "plugin.h"
 #include "sslconn.h"
+#include "util.h"
 #include "version.h"
 
 #define SSL_NSS_PLUGIN_ID "ssl-nss"
@@ -33,6 +35,7 @@
 
 #include <nspr.h>
 #include <nss.h>
+#include <nssb64.h>
 #include <pk11func.h>
 #include <prio.h>
 #include <secerr.h>
@@ -106,6 +109,20 @@
 	}
 }
 
+static gchar *get_error_text()
+{
+	PRInt32 len = PR_GetErrorTextLength();
+	gchar *ret = NULL;
+
+	if (len > 0) {
+		ret = g_malloc(len + 1);
+		len = PR_GetErrorText(ret);
+		ret[len] = '\0';
+	}
+
+	return ret;
+}
+
 static void
 ssl_nss_init_nss(void)
 {
@@ -219,11 +236,14 @@
 	 * It seems to work because it'll eventually use the cached value
 	 */
 	if(SSL_ForceHandshake(nss_data->in) != SECSuccess) {
+		gchar *error_txt;
 		set_errno(PR_GetError());
 		if (errno == EAGAIN || errno == EWOULDBLOCK)
 			return;
 
-		purple_debug_error("nss", "Handshake failed %d\n", PR_GetError());
+		error_txt = get_error_text();
+		purple_debug_error("nss", "Handshake failed %s (%d)\n", error_txt ? error_txt : "", PR_GetError());
+		g_free(error_txt);
 
 		if (gsc->error_cb != NULL)
 			gsc->error_cb(gsc, PURPLE_SSL_HANDSHAKE_FAILED, gsc->connect_cb_data);
@@ -264,8 +284,11 @@
 	socket_opt.option = PR_SockOpt_Nonblocking;
 	socket_opt.value.non_blocking = PR_TRUE;
 
-	if (PR_SetSocketOption(nss_data->fd, &socket_opt) != PR_SUCCESS)
-		purple_debug_warning("nss", "unable to set socket into non-blocking mode: %d\n", PR_GetError());
+	if (PR_SetSocketOption(nss_data->fd, &socket_opt) != PR_SUCCESS) {
+		gchar *error_txt = get_error_text();
+		purple_debug_warning("nss", "unable to set socket into non-blocking mode: %s (%d)\n", error_txt ? error_txt : "", PR_GetError());
+		g_free(error_txt);
+	}
 
 	nss_data->in = SSL_ImportFD(NULL, nss_data->fd);
 
@@ -360,6 +383,364 @@
 	return ret;
 }
 
+static GList *
+ssl_nss_peer_certs(PurpleSslConnection *gsc)
+{
+	PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc);
+	CERTCertificate *cert;
+/*
+	GList *chain = NULL;
+	void *pinArg;
+	SECStatus status;
+*/
+
+	/* TODO: this is a blind guess */
+	cert = SSL_PeerCertificate(nss_data->fd);
+
+	
+
+	return NULL;
+}
+
+/************************************************************************/
+/* X.509 functionality                                                  */
+/************************************************************************/
+static PurpleCertificateScheme x509_nss;
+
+/** Helpr macro to retrieve the NSS certdata from a PurpleCertificate */
+#define X509_NSS_DATA(pcrt) ( (CERTCertificate * ) (pcrt->data) )
+
+/** Imports a PEM-formatted X.509 certificate from the specified file.
+ * @param filename Filename to import from. Format is PEM
+ *
+ * @return A newly allocated Certificate structure of the x509_gnutls scheme
+ */
+static PurpleCertificate *
+x509_import_from_file(const gchar *filename)
+{
+	gchar *rawcert;
+	gsize len = 0;
+	CERTCertificate *crt_dat;
+	PurpleCertificate *crt;
+
+	g_return_val_if_fail(filename, NULL);
+
+	purple_debug_info("nss/x509",
+			  "Loading certificate from %s\n",
+			  filename);
+	
+	/* Load the raw data up */
+	g_return_val_if_fail(
+		g_file_get_contents(filename,
+				    &rawcert, &len,
+				    NULL ),
+		NULL);
+
+	/* Decode the certificate */
+	crt_dat = CERT_DecodeCertFromPackage(rawcert, len);
+	g_free(rawcert);
+
+	g_return_val_if_fail(crt_dat, NULL);
+	
+	crt = g_new0(PurpleCertificate, 1);
+	crt->scheme = &x509_nss;
+	crt->data = crt_dat;
+	
+	return crt;
+}
+
+/**
+ * Exports a PEM-formatted X.509 certificate to the specified file.
+ * @param filename Filename to export to. Format will be PEM
+ * @param crt      Certificate to export
+ *
+ * @return TRUE if success, otherwise FALSE
+ */
+/* This function should not be so complicated, but NSS doesn't seem to have a
+   "convert yon certificate to PEM format" function. */
+static gboolean
+x509_export_certificate(const gchar *filename, PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	SECItem *dercrt;
+	gchar *b64crt;
+	gchar *pemcrt;
+	gboolean ret = FALSE;
+
+	g_return_val_if_fail(filename, FALSE);
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_nss, FALSE);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, FALSE);
+
+	purple_debug_info("nss/x509",
+			  "Exporting certificate to %s\n", filename);
+	
+	/* First, use NSS voodoo to create a DER-formatted certificate */
+	dercrt = SEC_ASN1EncodeItem(NULL, NULL, crt_dat,
+				    SEC_ASN1_GET(SEC_SignedCertificateTemplate));
+	g_return_val_if_fail(dercrt != NULL, FALSE);
+
+	/* Now encode it to b64 */
+	b64crt = NSSBase64_EncodeItem(NULL, NULL, 0, dercrt);
+	SECITEM_FreeItem(dercrt, PR_TRUE);
+	g_return_val_if_fail(b64crt, FALSE);
+
+	/* Wrap it in nice PEM header things */
+	pemcrt = g_strdup_printf("-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----\n", b64crt);
+	PORT_Free(b64crt); /* Notice that b64crt was allocated by an NSS
+			      function; hence, we'll let NSPR free it. */
+
+	/* Finally, dump the silly thing to a file. */
+	ret =  purple_util_write_data_to_file_absolute(filename, pemcrt, -1);
+
+	g_free(pemcrt);
+	
+	return ret;
+}
+
+static PurpleCertificate *
+x509_copy_certificate(PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	PurpleCertificate *newcrt;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_nss, NULL);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, NULL);
+
+	/* Create the certificate copy */
+	newcrt = g_new0(PurpleCertificate, 1);
+	newcrt->scheme = &x509_nss;
+	/* NSS does refcounting automatically */
+	newcrt->data = CERT_DupCertificate(crt_dat);
+	
+	return newcrt;
+}
+
+/** Frees a Certificate
+ *
+ *  Destroys a Certificate's internal data structures and frees the pointer
+ *  given.
+ *  @param crt  Certificate instance to be destroyed. It WILL NOT be destroyed
+ *              if it is not of the correct CertificateScheme. Can be NULL
+ *
+ */
+static void
+x509_destroy_certificate(PurpleCertificate * crt)
+{
+	CERTCertificate *crt_dat;
+
+	g_return_if_fail(crt);
+	g_return_if_fail(crt->scheme == &x509_nss);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_if_fail(crt_dat);
+
+	/* Finally we have the certificate. So let's kill it */
+	/* NSS does refcounting automatically */
+	CERT_DestroyCertificate(crt_dat);
+
+	/* Delete the PurpleCertificate as well */
+	g_free(crt);
+}
+
+/** Determines whether one certificate has been issued and signed by another
+ *
+ * @param crt       Certificate to check the signature of
+ * @param issuer    Issuer's certificate
+ *
+ * @return TRUE if crt was signed and issued by issuer, otherwise FALSE
+ * @TODO  Modify this function to return a reason for invalidity?
+ */
+static gboolean
+x509_signed_by(PurpleCertificate * crt,
+	       PurpleCertificate * issuer)
+{
+	return TRUE;
+}
+
+static GByteArray *
+x509_sha1sum(PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	size_t hashlen = 20; /* Size of an sha1sum */
+	GByteArray *sha1sum;
+	SECItem *derCert; /* DER representation of the cert */
+	SECStatus st;
+
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_nss, NULL);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, NULL);
+
+	/* Get the certificate DER representation */
+	derCert = &(crt_dat->derCert);
+
+	/* Make a hash! */
+	sha1sum = g_byte_array_sized_new(hashlen);
+	/* glib leaves the size as 0 by default */
+	sha1sum->len = hashlen;
+	
+	st = PK11_HashBuf(SEC_OID_SHA1, sha1sum->data,
+			  derCert->data, derCert->len);
+
+	/* Check for errors */
+	if (st != SECSuccess) {
+		g_byte_array_free(sha1sum, TRUE);
+		purple_debug_error("nss/x509",
+				   "Error: hashing failed!\n");
+		return NULL;
+	}
+
+	return sha1sum;
+}
+
+static gchar *
+x509_dn (PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_nss, NULL);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, NULL);
+
+	return g_strdup(crt_dat->subjectName);
+}
+
+static gchar *
+x509_issuer_dn (PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_nss, NULL);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, NULL);
+
+	return g_strdup(crt_dat->subjectName);
+}
+
+static gchar *
+x509_common_name (PurpleCertificate *crt)
+{
+	CERTCertificate *crt_dat;
+	char *nss_cn;
+	gchar *ret_cn;
+	
+	g_return_val_if_fail(crt, NULL);
+	g_return_val_if_fail(crt->scheme == &x509_nss, NULL);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, NULL);
+
+	/* Q:
+	   Why get a newly allocated string out of NSS, strdup it, and then
+	   return the new copy?
+
+	   A:
+	   The NSS LXR docs state that I should use the NSPR free functions on
+	   the strings that the NSS cert functions return. Since the libpurple
+	   API expects a g_free()-able string, we make our own copy and return
+	   that.
+
+	   NSPR is something of a prima donna. */
+
+	nss_cn = CERT_GetCommonName( &(crt_dat->subject) );
+	ret_cn = g_strdup(nss_cn);
+	PORT_Free(nss_cn);
+
+	return ret_cn;
+}
+
+static gboolean
+x509_check_name (PurpleCertificate *crt, const gchar *name)
+{
+	CERTCertificate *crt_dat;
+	SECStatus st;
+	
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_nss, FALSE);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, FALSE);
+
+	st = CERT_VerifyCertName(crt_dat, name);
+
+	if (st == SECSuccess) {
+		return TRUE;
+	}
+	else if (st == SECFailure) {
+		return FALSE;
+	}
+	
+	/* If we get here...bad things! */
+	purple_debug_error("nss/x509",
+			   "x509_check_name fell through where it shouldn't "
+			   "have.\n");
+	return FALSE;
+}
+
+static gboolean
+x509_times (PurpleCertificate *crt, time_t *activation, time_t *expiration)
+{
+	CERTCertificate *crt_dat;
+	PRTime nss_activ, nss_expir;
+	
+	g_return_val_if_fail(crt, FALSE);
+	g_return_val_if_fail(crt->scheme == &x509_nss, FALSE);
+
+	crt_dat = X509_NSS_DATA(crt);
+	g_return_val_if_fail(crt_dat, FALSE);
+
+	/* Extract the times into ugly PRTime thingies */
+	/* TODO: Maybe this shouldn't throw an error? */
+	g_return_val_if_fail(
+		SECSuccess == CERT_GetCertTimes(crt_dat,
+						&nss_activ, &nss_expir),
+		FALSE);
+
+	/* NSS's native PRTime type *almost* corresponds to time_t; however,
+	   it measures *microseconds* since the epoch, not seconds. Hence
+	   the funny conversion. */
+	if (activation) {
+		*activation = nss_activ / 1000000;
+	}
+	if (expiration) {
+		*expiration = nss_expir / 1000000;
+	}
+	
+	return TRUE;
+}
+
+static PurpleCertificateScheme x509_nss = {
+	"x509",                          /* Scheme name */
+	N_("X.509 Certificates"),        /* User-visible scheme name */
+	x509_import_from_file,           /* Certificate import function */
+	x509_export_certificate,         /* Certificate export function */
+	x509_copy_certificate,           /* Copy */
+	x509_destroy_certificate,        /* Destroy cert */
+	x509_signed_by,                  /* Signed-by */
+	x509_sha1sum,                    /* SHA1 fingerprint */
+	x509_dn,                         /* Unique ID */
+	x509_issuer_dn,                  /* Issuer Unique ID */
+	x509_common_name,                /* Subject name */
+	x509_check_name,                 /* Check subject name */
+	x509_times,                      /* Activation/Expiration time */
+
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
 static PurpleSslOps ssl_ops =
 {
 	ssl_nss_init,
@@ -368,11 +749,11 @@
 	ssl_nss_close,
 	ssl_nss_read,
 	ssl_nss_write,
+	ssl_nss_peer_certs,
 
 	/* padding */
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 
@@ -390,6 +771,9 @@
 	/* Init NSS now, so others can use it even if sslconn never does */
 	ssl_nss_init_nss();
 
+	/* Register the X.509 functions we provide */
+	purple_certificate_register_scheme(&x509_nss);
+
 	return TRUE;
 #else
 	return FALSE;
@@ -403,6 +787,9 @@
 	if (purple_ssl_get_ops() == &ssl_ops) {
 		purple_ssl_set_ops(NULL);
 	}
+
+	/* Unregister our X.509 functions */
+	purple_certificate_unregister_scheme(&x509_nss);
 #endif
 
 	return TRUE;
diff -ru pidgin-2.1.1/libpurple/plugins/startup.py pidgin-2.2.0/libpurple/plugins/startup.py
--- pidgin-2.1.1/libpurple/plugins/startup.py	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/startup.py	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
 #
 # 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 #
 
 import sys
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/Makefile.in pidgin-2.2.0/libpurple/plugins/tcl/Makefile.in
--- pidgin-2.1.1/libpurple/plugins/tcl/Makefile.in	2007-08-20 14:13:55.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -128,6 +128,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -156,6 +158,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -211,14 +215,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -230,7 +232,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -291,6 +292,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -311,6 +313,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl.c pidgin-2.2.0/libpurple/plugins/tcl/tcl.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "config.h"
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_cmd.c pidgin-2.2.0/libpurple/plugins/tcl/tcl_cmd.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_cmd.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_cmd.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <tcl.h>
 
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_cmds.c pidgin-2.2.0/libpurple/plugins/tcl/tcl_cmds.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_cmds.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_cmds.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <tcl.h>
@@ -544,12 +544,16 @@
 
 int tcl_cmd_cmd(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	const char *cmds[] = { "register", "unregister", NULL };
-	enum { CMD_CMD_REGISTER, CMD_CMD_UNREGISTER } cmd;
+	const char *cmds[] = { "do", "help", "list", "register", "unregister", NULL };
+	enum { CMD_CMD_DO, CMD_CMD_HELP, CMD_CMD_LIST, CMD_CMD_REGISTER, CMD_CMD_UNREGISTER } cmd;
 	struct tcl_cmd_handler *handler;
-	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *list, *elem, *result = Tcl_GetObjResult(interp);
+	PurpleConversation *convo;
 	PurpleCmdId id;
+	PurpleCmdStatus status;
 	int error;
+	GList *l, *cur;
+	gchar *escaped, *errstr = NULL;
 
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -560,6 +564,57 @@
 		return error;
 
 	switch (cmd) {
+	case CMD_CMD_DO:
+		if (objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "conversation command");
+			return TCL_ERROR;
+		}
+		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		escaped = g_markup_escape_text(Tcl_GetString(objv[3]), -1);
+		status = purple_cmd_do_command(convo, Tcl_GetString(objv[3]),
+				escaped, &errstr);
+		g_free(escaped);
+		Tcl_SetStringObj(result, errstr ? (char *)errstr : "", -1);
+		g_free(errstr);
+		if (status != PURPLE_CMD_STATUS_OK) {
+			return TCL_ERROR;
+		}
+		break;
+	case CMD_CMD_HELP:
+		if (objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "conversation name");
+			return TCL_ERROR;
+		}
+		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		l = cur = purple_cmd_help(convo, Tcl_GetString(objv[3]));
+		list = Tcl_NewListObj(0, NULL);
+		while (cur != NULL) {
+			elem = Tcl_NewStringObj((char *)cur->data, -1);
+			Tcl_ListObjAppendElement(interp, list, elem);
+			cur = g_list_next(cur);
+		}
+		g_list_free(l);
+		Tcl_SetObjResult(interp, list);
+		break;
+	case CMD_CMD_LIST:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "conversation");
+			return TCL_ERROR;
+		}
+		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		l = cur = purple_cmd_list(convo);
+		list = Tcl_NewListObj(0, NULL);
+		while (cur != NULL) {
+			elem = Tcl_NewStringObj((char *)cur->data, -1);
+			Tcl_ListObjAppendElement(interp, list, elem);
+			cur = g_list_next(cur);
+		}
+		g_list_free(l);
+		Tcl_SetObjResult(interp, list);
+		break;
 	case CMD_CMD_REGISTER:
 		if (objc != 9) {
 			Tcl_WrongNumArgs(interp, 2, objv, "cmd arglist priority flags prpl_id proc helpstr");
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_glib.c pidgin-2.2.0/libpurple/plugins/tcl/tcl_glib.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_glib.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_glib.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * TERMS 2
  *
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_glib.h pidgin-2.2.0/libpurple/plugins/tcl/tcl_glib.h
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_glib.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_glib.h	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_TCL_GLIB_H_
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_purple.h pidgin-2.2.0/libpurple/plugins/tcl/tcl_purple.h
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_purple.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_purple.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_TCL_PURPLE_H_
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_ref.c pidgin-2.2.0/libpurple/plugins/tcl/tcl_ref.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_ref.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_ref.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <tcl.h>
diff -ru pidgin-2.1.1/libpurple/plugins/tcl/tcl_signals.c pidgin-2.2.0/libpurple/plugins/tcl/tcl_signals.c
--- pidgin-2.1.1/libpurple/plugins/tcl/tcl_signals.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/plugins/tcl/tcl_signals.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <tcl.h>
 #include <stdarg.h>
diff -ru pidgin-2.1.1/libpurple/pounce.c pidgin-2.2.0/libpurple/pounce.c
--- pidgin-2.1.1/libpurple/pounce.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/pounce.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "conversation.h"
diff -ru pidgin-2.1.1/libpurple/pounce.h pidgin-2.2.0/libpurple/pounce.h
--- pidgin-2.1.1/libpurple/pounce.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/pounce.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_POUNCE_H_
 #define _PURPLE_POUNCE_H_
diff -ru pidgin-2.1.1/libpurple/prefs.c pidgin-2.2.0/libpurple/prefs.c
--- pidgin-2.1.1/libpurple/prefs.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/prefs.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -329,9 +329,13 @@
 				purple_prefs_set_string_list(pref_name_full->str, NULL);
 				break;
 			case PURPLE_PREF_PATH:
-				decoded = g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL);
-				purple_prefs_set_path(pref_name_full->str, decoded);
-				g_free(decoded);
+				if (pref_value) {
+					decoded = g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL);
+					purple_prefs_set_path(pref_name_full->str, decoded);
+					g_free(decoded);
+				} else {
+					purple_prefs_set_path(pref_name_full->str, NULL);
+				}
 				break;
 			case PURPLE_PREF_PATH_LIST:
 				purple_prefs_set_path_list(pref_name_full->str, NULL);
@@ -1446,6 +1450,9 @@
 	purple_prefs_remove("/purple/contact/offline_score");
 	purple_prefs_remove("/purple/contact/away_score");
 	purple_prefs_remove("/purple/contact/idle_score");
+
+	purple_prefs_load();
+	purple_prefs_update_old();
 }
 
 void
diff -ru pidgin-2.1.1/libpurple/prefs.h pidgin-2.2.0/libpurple/prefs.h
--- pidgin-2.1.1/libpurple/prefs.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/prefs.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PURPLE_PREFS_H_
@@ -55,7 +55,9 @@
 #endif
 
 /**************************************************************************/
-/** @name Prefs API                                                       */
+/** @name Prefs API                                                       
+    Preferences are named according to a directory-like structure.        
+    Example: "/plugins/core/potato/is_from_idaho" (probably a boolean)    */
 /**************************************************************************/
 /*@{*/
 
diff -ru pidgin-2.1.1/libpurple/privacy.c pidgin-2.2.0/libpurple/privacy.c
--- pidgin-2.1.1/libpurple/privacy.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/privacy.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/privacy.h pidgin-2.2.0/libpurple/privacy.h
--- pidgin-2.1.1/libpurple/privacy.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/privacy.h	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_PRIVACY_H_
 #define _PURPLE_PRIVACY_H_
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/bonjour.c pidgin-2.2.0/libpurple/protocols/bonjour/bonjour.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/bonjour.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/bonjour.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <glib.h>
 #ifndef _WIN32
@@ -235,6 +235,13 @@
 	g_free(stripped);
 }
 
+static void bonjour_remove_buddy(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group) {
+	if (buddy->proto_data) {
+		bonjour_buddy_delete(buddy->proto_data);
+		buddy->proto_data = NULL;
+	}
+}
+
 static GList *
 bonjour_status_types(PurpleAccount *account)
 {
@@ -395,7 +402,7 @@
 	NULL,                                                    /* change_passwd */
 	NULL,                                                    /* add_buddy */
 	NULL,                                                    /* add_buddies */
-	NULL,                                                    /* remove_buddy */
+	bonjour_remove_buddy,                                    /* remove_buddy */
 	NULL,                                                    /* remove_buddies */
 	NULL,                                                    /* add_permit */
 	NULL,                                                    /* add_deny */
@@ -479,45 +486,50 @@
 	NULL
 };
 
-static void
-initialize_default_account_values()
-{
-#ifdef _WIN32
-	char *fullname = NULL;
-#else
-	struct passwd *info;
-	const char *fullname = NULL;
-#endif
-	char *splitpoint = NULL;
-	char *tmp;
-	char hostname[255];
+#ifdef WIN32
+static gboolean _set_default_name_cb(gpointer data) {
+	gchar *fullname = data;
+	const char *splitpoint;
+	GList *tmp = prpl_info.protocol_options;
+	PurpleAccountOption *option;
 
-#ifndef _WIN32
-	/* Try to figure out the user's real name */
-	info = getpwuid(getuid());
-	if ((info != NULL) && (info->pw_gecos != NULL) && (info->pw_gecos[0] != '\0'))
-		fullname = info->pw_gecos;
-	else if ((info != NULL) && (info->pw_name != NULL) && (info->pw_name[0] != '\0'))
-		fullname = info->pw_name;
-	else if (((fullname = getlogin()) != NULL) && (fullname[0] != '\0'))
-		;
-	else
-		fullname = _("Purple Person");
-	/* Make sure fullname is valid UTF-8.  If not, try to convert it. */
-	if (!g_utf8_validate(fullname, -1, NULL))
-	{
-		gchar *tmp;
-		tmp = g_locale_to_utf8(fullname, -1, NULL, NULL, NULL);
-		if ((tmp == NULL) || (*tmp == '\0'))
-			fullname = _("Purple Person");
+	if (!fullname) {
+		purple_debug_info("bonjour", "Unable to look up First and Last name or Username from system; using defaults.\n");
+		return FALSE;
 	}
 
-#else
+	g_free(default_firstname);
+	g_free(default_lastname);
+
+	/* Split the real name into a first and last name */
+	splitpoint = strchr(fullname, ' ');
+	if (splitpoint != NULL) {
+		default_firstname = g_strndup(fullname, splitpoint - fullname);
+		default_lastname = g_strdup(&splitpoint[1]);
+	} else {
+		default_firstname = g_strdup(fullname);
+		default_lastname = g_strdup("");
+	}
+	g_free(fullname);
+
+
+	for(; tmp != NULL; tmp = tmp->next) {
+		option = tmp->data;
+		if (strcmp("first", purple_account_option_get_setting(option)) == 0)
+			purple_account_option_set_default_string(option, default_firstname);
+		else if (strcmp("last", purple_account_option_get_setting(option)) == 0)
+			purple_account_option_set_default_string(option, default_lastname);
+	}
+
+	return FALSE;
+}
+
+static gpointer _win32_name_lookup_thread(gpointer data) {
+	gchar *fullname = NULL;
 	wchar_t username[UNLEN + 1];
 	DWORD dwLenUsername = UNLEN + 1;
 
-	if (!GetUserNameW((LPWSTR) &username, &dwLenUsername))
-		purple_debug_warning("bonjour", "Unable to look up username\n");
+	GetUserNameW((LPWSTR) &username, &dwLenUsername);
 
 	if (username != NULL && *username != '\0') {
 		LPBYTE servername = NULL;
@@ -525,7 +537,7 @@
 
 		NetGetDCName(NULL, NULL, &servername);
 
-		purple_debug_info("bonjour", "Looking up the full name from the %s.\n", (servername ? "domain controller" : "local machine"));
+		/* purple_debug_info("bonjour", "Looking up the full name from the %s.\n", (servername ? "domain controller" : "local machine")); */
 
 		if (NetUserGetInfo((LPCWSTR) servername, username, 10, &info) == NERR_Success
 				&& info != NULL && ((LPUSER_INFO_10) info)->usri10_full_name != NULL
@@ -536,7 +548,7 @@
 		}
 		/* Fall back to the local machine if we didn't get the full name from the domain controller */
 		else if (servername != NULL) {
-			purple_debug_info("bonjour", "Looking up the full name from the local machine");
+			/* purple_debug_info("bonjour", "Looking up the full name from the local machine"); */
 
 			if (info != NULL) NetApiBufferFree(info);
 			info = NULL;
@@ -552,20 +564,54 @@
 
 		if (info != NULL) NetApiBufferFree(info);
 		if (servername != NULL) NetApiBufferFree(servername);
-	}
 
-	if (!fullname) {
-		if (username != NULL && *username != '\0')
+		if (!fullname)
 			fullname = g_utf16_to_utf8(username, -1, NULL, NULL, NULL);
-		else
-			fullname = g_strdup(_("Purple Person"));
 	}
+
+	g_idle_add(_set_default_name_cb, fullname);
+
+	return NULL;
+}
 #endif
 
+static void
+initialize_default_account_values()
+{
+#ifndef _WIN32
+	struct passwd *info;
+#endif
+	const char *fullname = NULL, *splitpoint, *tmp;
+	char hostname[255];
+	gchar *conv = NULL;
+
+#ifndef _WIN32
+	/* Try to figure out the user's real name */
+	info = getpwuid(getuid());
+	if ((info != NULL) && (info->pw_gecos != NULL) && (info->pw_gecos[0] != '\0'))
+		fullname = info->pw_gecos;
+	else if ((info != NULL) && (info->pw_name != NULL) && (info->pw_name[0] != '\0'))
+		fullname = info->pw_name;
+	else if (((fullname = getlogin()) != NULL) && (fullname[0] == '\0'))
+		fullname = NULL;
+#else
+	/* The Win32 username lookup functions are synchronous so we do it in a thread */
+	g_thread_create(_win32_name_lookup_thread, NULL, FALSE, NULL);
+#endif
+
+	/* Make sure fullname is valid UTF-8.  If not, try to convert it. */
+	if (fullname != NULL && !g_utf8_validate(fullname, -1, NULL)) {
+		fullname = conv = g_locale_to_utf8(fullname, -1, NULL, NULL, NULL);
+		if (conv == NULL || *conv == '\0')
+			fullname = NULL;
+	}
+
+	if (fullname == NULL)
+		fullname = _("Purple Person");
+
 	/* Split the real name into a first and last name */
 	splitpoint = strchr(fullname, ' ');
-	if (splitpoint != NULL)
-	{
+	if (splitpoint != NULL) {
 		default_firstname = g_strndup(fullname, splitpoint - fullname);
 		tmp = &splitpoint[1];
 
@@ -577,16 +623,12 @@
 			default_lastname = g_strndup(tmp, splitpoint - tmp);
 		else
 			default_lastname = g_strdup(tmp);
-	}
-	else
-	{
+	} else {
 		default_firstname = g_strdup(fullname);
 		default_lastname = g_strdup("");
 	}
 
-#ifdef _WIN32
-	g_free(fullname);
-#endif
+	g_free(conv);
 
 	/* Try to figure out a good host name to use */
 	/* TODO: Avoid 'localhost,' if possible */
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/bonjour.h pidgin-2.2.0/libpurple/protocols/bonjour/bonjour.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/bonjour.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/bonjour.h	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/buddy.c pidgin-2.2.0/libpurple/protocols/bonjour/buddy.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/buddy.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/buddy.c	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include <glib.h>
@@ -121,9 +121,8 @@
  * the buddy.
  */
 void
-bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy)
+bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy, PurpleBuddy *buddy)
 {
-	PurpleBuddy *buddy;
 	PurpleGroup *group;
 	PurpleAccount *account = bonjour_buddy->account;
 	const char *status_id, *old_hash, *new_hash;
@@ -147,7 +146,8 @@
 	}
 
 	/* Make sure the buddy exists in our buddy list */
-	buddy = purple_find_buddy(account, bonjour_buddy->name);
+	if (buddy == NULL)
+		buddy = purple_find_buddy(account, bonjour_buddy->name);
 
 	if (buddy == NULL) {
 		buddy = purple_buddy_new(account, bonjour_buddy->name, NULL);
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/buddy.h pidgin-2.2.0/libpurple/protocols/bonjour/buddy.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/buddy.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/buddy.h	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #ifndef _BONJOUR_BUDDY
@@ -92,8 +92,9 @@
 
 /**
  * If the buddy doesn't previoulsy exists, it is created. Else, its data is changed (???)
+ * purple_buddy is optional; it saves an additional lookup if we already have it
  */
-void bonjour_buddy_add_to_purple(BonjourBuddy *buddy);
+void bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy, PurpleBuddy *purple_buddy);
 
 /**
  * We got the buddy icon data; deal with it
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/jabber.c pidgin-2.2.0/libpurple/protocols/bonjour/jabber.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/jabber.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/jabber.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _WIN32
 #include <sys/socket.h>
@@ -82,8 +82,8 @@
 	BonjourJabberConversation *bconv = g_new0(BonjourJabberConversation, 1);
 	bconv->socket = -1;
 	bconv->tx_buf = purple_circ_buffer_new(512);
-	bconv->tx_handler = -1;
-	bconv->rx_handler = -1;
+	bconv->tx_handler = 0;
+	bconv->rx_handler = 0;
 
 	return bconv;
 }
@@ -234,7 +234,7 @@
 
 	if (writelen == 0) {
 		purple_input_remove(bconv->tx_handler);
-		bconv->tx_handler = -1;
+		bconv->tx_handler = 0;
 		return;
 	}
 
@@ -272,7 +272,7 @@
 	BonjourJabberConversation *bconv = bb->conversation;
 
 	/* If we're not ready to actually send, append it to the buffer */
-	if (bconv->tx_handler != -1
+	if (bconv->tx_handler != 0
 			|| bconv->connect_data != NULL
 			|| !bconv->sent_stream_start
 			|| !bconv->recv_stream_start
@@ -304,7 +304,7 @@
 	}
 
 	if (ret < len) {
-		if (bconv->tx_handler == -1)
+		if (bconv->tx_handler == 0)
 			bconv->tx_handler = purple_input_add(bconv->socket, PURPLE_INPUT_WRITE,
 				_send_data_write_cb, pb);
 		purple_circ_buffer_append(bconv->tx_buf, message + ret, len - ret);
@@ -373,17 +373,19 @@
 
 	g_return_if_fail(bb != NULL);
 
-	/* Close the socket, clear the watcher and free memory */
-	bonjour_jabber_close_conversation(bb->conversation);
-	bb->conversation = NULL;
-
 	/* Inform the user that the conversation has been closed */
-	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account);
-	if (conv != NULL) {
-		char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
-		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
-		g_free(tmp);
+	if (bb->conversation != NULL) {
+		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account);
+		if (conv != NULL) {
+			char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
+			purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
+			g_free(tmp);
+		}
+		/* Close the socket, clear the watcher and free memory */
+		bonjour_jabber_close_conversation(bb->conversation);
+		bb->conversation = NULL;
 	}
+
 }
 
 void bonjour_jabber_stream_started(PurpleBuddy *pb) {
@@ -455,7 +457,7 @@
 
 	/* Stream started; process the send buffer if there is one */
 	purple_input_remove(bconv->tx_handler);
-	bconv->tx_handler= -1;
+	bconv->tx_handler= 0;
 	bconv->sent_stream_start = TRUE;
 
 	bonjour_jabber_stream_started(pb);
@@ -535,7 +537,7 @@
 
 	/* Look for the buddy that has opened the conversation and fill information */
 	address_text = inet_ntoa(their_addr.sin_addr);
-	purple_debug_info("bonjour", "Received incoming connection from %s\n.", address_text);
+	purple_debug_info("bonjour", "Received incoming connection from %s.\n", address_text);
 	cbba = g_new0(struct _check_buddy_by_address_t, 1);
 	cbba->address = address_text;
 	cbba->pb = &pb;
@@ -779,7 +781,7 @@
 			/* TODO: We're really supposed to wait for "</stream:stream>" before closing the socket */
 			close(bconv->socket);
 		}
-		if (bconv->rx_handler != -1)
+		if (bconv->rx_handler != 0)
 			purple_input_remove(bconv->rx_handler);
 		if (bconv->tx_handler > 0)
 			purple_input_remove(bconv->tx_handler);
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/jabber.h pidgin-2.2.0/libpurple/protocols/bonjour/jabber.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/jabber.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/jabber.h	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/Makefile.in pidgin-2.2.0/libpurple/protocols/bonjour/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/bonjour/Makefile.in	2007-08-20 14:13:55.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -172,6 +172,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -200,6 +202,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -255,14 +259,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -274,7 +276,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -335,6 +336,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -355,6 +357,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_avahi.c pidgin-2.2.0/libpurple/protocols/bonjour/mdns_avahi.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_avahi.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_avahi.c	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "internal.h"
@@ -33,7 +33,7 @@
 #include <avahi-glib/glib-malloc.h>
 #include <avahi-glib/glib-watch.h>
 
-/* For some reason, this is missing from the Avahi type defines */
+/* Avahi only defines the types that it actually uses (which at this time doesn't include NULL) */
 #ifndef AVAHI_DNS_TYPE_NULL
 #define AVAHI_DNS_TYPE_NULL 0x0A
 #endif
@@ -58,7 +58,8 @@
 		  const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
 		  AvahiLookupResultFlags flags, void *userdata) {
 
-	BonjourBuddy *buddy;
+	PurpleBuddy *pb;
+	BonjourBuddy *bb;
 	PurpleAccount *account = userdata;
 	AvahiStringList *l;
 	size_t size;
@@ -67,44 +68,62 @@
 
 	g_return_if_fail(r != NULL);
 
+	pb = purple_find_buddy(account, name);
+	bb = (pb != NULL) ? pb->proto_data : NULL;
+
 	switch (event) {
 		case AVAHI_RESOLVER_FAILURE:
 			purple_debug_error("bonjour", "_resolve_callback - Failure: %s\n",
 				avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(r))));
+
 			avahi_service_resolver_free(r);
+			if (bb != NULL) {
+				/* We've already freed the resolver */
+				if (r == ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver)
+					((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver = NULL;
+				purple_blist_remove_buddy(pb);
+			}
 			break;
 		case AVAHI_RESOLVER_FOUND:
 			/* create a buddy record */
-			buddy = bonjour_buddy_new(name, account);
+			if (bb == NULL)
+				bb = bonjour_buddy_new(name, account);
 
-			((AvahiBuddyImplData *)buddy->mdns_impl_data)->resolver = r;
+			/* If we're reusing an existing buddy, make sure if it is a different resolver to clean up the old one.
+			 * I don't think this should ever happen, but I'm afraid we might get events out of sequence. */
+			if (((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver != NULL
+					&& ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver != r) {
+				avahi_service_resolver_free(((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver);
+			}
+			((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver = r;
 
+			g_free(bb->ip);
 			/* Get the ip as a string */
-			buddy->ip = g_malloc(AVAHI_ADDRESS_STR_MAX);
-			avahi_address_snprint(buddy->ip, AVAHI_ADDRESS_STR_MAX, a);
+			bb->ip = g_malloc(AVAHI_ADDRESS_STR_MAX);
+			avahi_address_snprint(bb->ip, AVAHI_ADDRESS_STR_MAX, a);
 
-			buddy->port_p2pj = port;
+			bb->port_p2pj = port;
 
 			/* Obtain the parameters from the text_record */
-			clear_bonjour_buddy_values(buddy);
-			l = txt;
-			while (l != NULL) {
-				ret = avahi_string_list_get_pair(l, &key, &value, &size);
-				l = l->next;
-				if (ret < 0)
+			clear_bonjour_buddy_values(bb);
+			for(l = txt; l != NULL; l = l->next) {
+				if ((ret = avahi_string_list_get_pair(l, &key, &value, &size)) < 0)
 					continue;
-				set_bonjour_buddy_value(buddy, key, value, size);
+				set_bonjour_buddy_value(bb, key, value, size);
 				/* TODO: Since we're using the glib allocator, I think we
 				 * can use the values instead of re-copying them */
 				avahi_free(key);
 				avahi_free(value);
 			}
 
-			if (!bonjour_buddy_check(buddy))
-				bonjour_buddy_delete(buddy);
-			else
+			if (!bonjour_buddy_check(bb)) {
+				if (pb != NULL)
+					purple_blist_remove_buddy(pb);
+				else
+					bonjour_buddy_delete(bb);
+			} else
 				/* Add or update the buddy in our buddy list */
-				bonjour_buddy_add_to_purple(buddy);
+				bonjour_buddy_add_to_purple(bb, pb);
 
 			break;
 		default:
@@ -120,7 +139,7 @@
 		  AvahiLookupResultFlags flags, void *userdata) {
 
 	PurpleAccount *account = userdata;
-	PurpleBuddy *gb = NULL;
+	PurpleBuddy *pb = NULL;
 
 	switch (event) {
 		case AVAHI_BROWSER_FAILURE:
@@ -132,7 +151,7 @@
 			/* A new peer has joined the network and uses iChat bonjour */
 			purple_debug_info("bonjour", "_browser_callback - new service\n");
 			/* Make sure it isn't us */
-			if (g_ascii_strcasecmp(name, account->username) != 0) {
+			if (purple_utf8_strcasecmp(name, account->username) != 0) {
 				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
 						interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC,
 						0, _resolver_callback, account)) {
@@ -143,16 +162,12 @@
 			break;
 		case AVAHI_BROWSER_REMOVE:
 			purple_debug_info("bonjour", "_browser_callback - Remove service\n");
-			gb = purple_find_buddy(account, name);
-			if (gb != NULL) {
-				bonjour_buddy_delete(gb->proto_data);
-				purple_blist_remove_buddy(gb);
-			}
+			pb = purple_find_buddy(account, name);
+			if (pb != NULL)
+				purple_blist_remove_buddy(pb);
 			break;
 		case AVAHI_BROWSER_ALL_FOR_NOW:
 		case AVAHI_BROWSER_CACHE_EXHAUSTED:
-			purple_debug_warning("bonjour", "(Browser) %s\n",
-				event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW");
 			break;
 		default:
 			purple_debug_info("bonjour", "Unrecognized Service browser event: %d.\n", event);
@@ -173,7 +188,7 @@
 			purple_debug_error("bonjour", "Collision registering buddy icon data.\n");
 			break;
 		case AVAHI_ENTRY_GROUP_FAILURE:
-			purple_debug_error("bonjour", "Error registering buddy icon data: %s\n.",
+			purple_debug_error("bonjour", "Error registering buddy icon data: %s.\n",
 				avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
 			break;
 		case AVAHI_ENTRY_GROUP_UNCOMMITED:
@@ -256,7 +271,7 @@
 	idata->client = avahi_client_new(poll_api, 0, NULL, data, &error);
 
 	if (idata->client == NULL) {
-		purple_debug_error("bonjour", "Error initializing Avahi: %s", avahi_strerror(error));
+		purple_debug_error("bonjour", "Error initializing Avahi: %s\n", avahi_strerror(error));
 		avahi_glib_poll_free(idata->glib_poll);
 		g_free(idata);
 		return FALSE;
@@ -339,7 +354,7 @@
 	if (!idata->sb) {
 
 		purple_debug_error("bonjour",
-			"Unable to initialize service browser.  Error: %s\n.",
+			"Unable to initialize service browser.  Error: %s.\n",
 			avahi_strerror(avahi_client_errno(idata->client)));
 		return FALSE;
 	}
@@ -473,7 +488,7 @@
 
 	if (!idata->buddy_icon_rec_browser) {
 		purple_debug_error("bonjour",
-			"Unable to initialize buddy icon record browser.  Error: %s\n.",
+			"Unable to initialize buddy icon record browser.  Error: %s.\n",
 			avahi_strerror(avahi_client_errno(session_idata->client)));
 	}
 
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_common.c pidgin-2.2.0/libpurple/protocols/bonjour/mdns_common.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_common.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_common.c	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include <string.h>
@@ -207,7 +207,7 @@
 
 	/* Advise the daemon that we are waiting for connections */
 	if (!_mdns_browse(data)) {
-		purple_debug_error("bonjour", "Unable to get service.");
+		purple_debug_error("bonjour", "Unable to get service.\n");
 		return FALSE;
 	}
 
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_common.h pidgin-2.2.0/libpurple/protocols/bonjour/mdns_common.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_common.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_common.h	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #ifndef _BONJOUR_MDNS_COMMON
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_howl.c pidgin-2.2.0/libpurple/protocols/bonjour/mdns_howl.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_howl.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_howl.c	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "internal.h"
@@ -71,6 +71,7 @@
 	char value[SW_TEXT_RECORD_MAX_LEN];
 	sw_uint32 value_length;
 
+	/* TODO: We want to keep listening for updates*/
 	sw_discovery_cancel(discovery, oid);
 
 	/* create a buddy record */
@@ -100,7 +101,7 @@
 	}
 
 	/* Add or update the buddy in our buddy list */
-	bonjour_buddy_add_to_purple(buddy);
+	bonjour_buddy_add_to_purple(buddy, NULL);
 
 	return SW_OKAY;
 }
@@ -149,10 +150,7 @@
 			purple_debug_info("bonjour", "_browser_reply --> Remove service\n");
 			gb = purple_find_buddy(account, name);
 			if (gb != NULL)
-			{
-				bonjour_buddy_delete(gb->proto_data);
 				purple_blist_remove_buddy(gb);
-			}
 			break;
 		case SW_DISCOVERY_BROWSE_RESOLVED:
 			purple_debug_info("bonjour", "_browse_reply --> Resolved\n");
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_interface.h pidgin-2.2.0/libpurple/protocols/bonjour/mdns_interface.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_interface.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_interface.h	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #ifndef _BONJOUR_MDNS_INTERFACE
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_types.h pidgin-2.2.0/libpurple/protocols/bonjour/mdns_types.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_types.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_types.h	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #ifndef _BONJOUR_MDNS_TYPES
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/mdns_win32.c pidgin-2.2.0/libpurple/protocols/bonjour/mdns_win32.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/mdns_win32.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/mdns_win32.c	2007-09-14 00:45:39.000000000 -0400
@@ -11,7 +11,7 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "internal.h"
@@ -79,27 +79,27 @@
 	uint32_t ttl, void *context)
 {
 
-	if (kDNSServiceErr_NoError != errorCode)
+	if (kDNSServiceErr_NoError != errorCode) {
 		purple_debug_error("bonjour", "record query - callback error.\n");
-	else if (flags & kDNSServiceFlagsAdd)
-	{
+		/* TODO: Probably should remove the buddy when this happens */
+	} else if (flags & kDNSServiceFlagsAdd) {
 		if (rrtype == kDNSServiceType_TXT) {
 			/* New Buddy */
-			BonjourBuddy *buddy = (BonjourBuddy*) context;
-			_mdns_parse_text_record(buddy, rdata, rdlen);
-			bonjour_buddy_add_to_purple(buddy);
+			BonjourBuddy *bb = (BonjourBuddy*) context;
+			_mdns_parse_text_record(bb, rdata, rdlen);
+			bonjour_buddy_add_to_purple(bb, NULL);
 		} else if (rrtype == kDNSServiceType_NULL) {
 			/* Buddy Icon response */
-			BonjourBuddy *buddy = (BonjourBuddy*) context;
-			Win32BuddyImplData *idata = buddy->mdns_impl_data;
+			BonjourBuddy *bb = (BonjourBuddy*) context;
+			Win32BuddyImplData *idata = bb->mdns_impl_data;
 
 			g_return_if_fail(idata != NULL);
 
-			bonjour_buddy_got_buddy_icon(buddy, rdata, rdlen);
+			bonjour_buddy_got_buddy_icon(bb, rdata, rdlen);
 
 			/* We've got what we need; stop listening */
 			purple_input_remove(idata->null_query_handler);
-			idata->null_query_handler = -1;
+			idata->null_query_handler = 0;
 			DNSServiceRefDeallocate(idata->null_query);
 			idata->null_query = NULL;
 		}
@@ -110,32 +110,34 @@
 _mdns_resolve_host_callback(GSList *hosts, gpointer data, const char *error_message)
 {
 	ResolveCallbackArgs* args = (ResolveCallbackArgs*)data;
+	BonjourBuddy* bb = args->buddy;
 
-	if (!hosts || !hosts->data)
+	if (!hosts || !hosts->data) {
 		purple_debug_error("bonjour", "host resolution - callback error.\n");
-	else {
+		bonjour_buddy_delete(bb);
+	} else {
 		struct sockaddr_in *addr = (struct sockaddr_in*)g_slist_nth_data(hosts, 1);
-		BonjourBuddy* buddy = args->buddy;
-		Win32BuddyImplData *idata = buddy->mdns_impl_data;
+		Win32BuddyImplData *idata = bb->mdns_impl_data;
 
 		g_return_if_fail(idata != NULL);
 
-		buddy->ip = g_strdup(inet_ntoa(addr->sin_addr));
+		g_free(bb->ip);
+		bb->ip = g_strdup(inet_ntoa(addr->sin_addr));
 
 		/* finally, set up the continuous txt record watcher, and add the buddy to purple */
 
 		if (kDNSServiceErr_NoError == DNSServiceQueryRecord(&idata->txt_query, kDNSServiceFlagsLongLivedQuery,
 				kDNSServiceInterfaceIndexAny, args->full_service_name, kDNSServiceType_TXT,
-				kDNSServiceClass_IN, _mdns_record_query_callback, buddy)) {
+				kDNSServiceClass_IN, _mdns_record_query_callback, bb)) {
 
-			purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", buddy->name, buddy->ip, buddy->port_p2pj);
+			purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", bb->name, bb->ip, bb->port_p2pj);
 
 			idata->txt_query_handler = purple_input_add(DNSServiceRefSockFD(idata->txt_query),
 				PURPLE_INPUT_READ, _mdns_handle_event, idata->txt_query);
 
-			bonjour_buddy_add_to_purple(buddy);
+			bonjour_buddy_add_to_purple(bb, NULL);
 		} else
-			bonjour_buddy_delete(buddy);
+			bonjour_buddy_delete(bb);
 
 	}
 
@@ -202,18 +204,19 @@
     DNSServiceErrorType errorCode, const char *serviceName, const char *regtype, const char *replyDomain, void *context)
 {
 	PurpleAccount *account = (PurpleAccount*)context;
-	PurpleBuddy *gb = NULL;
+	PurpleBuddy *pb = NULL;
 
 	if (kDNSServiceErr_NoError != errorCode)
-		purple_debug_error("bonjour", "service browser - callback error");
+		purple_debug_error("bonjour", "service browser - callback error\n");
 	else if (flags & kDNSServiceFlagsAdd) {
 		/* A presence service instance has been discovered... check it isn't us! */
-		if (g_ascii_strcasecmp(serviceName, account->username) != 0) {
+		if (purple_utf8_strcasecmp(serviceName, account->username) != 0) {
 			/* OK, lets go ahead and resolve it to add to the buddy list */
 			ResolveCallbackArgs *args = g_new0(ResolveCallbackArgs, 1);
 			args->buddy = bonjour_buddy_new(serviceName, account);
 
-			if (kDNSServiceErr_NoError != DNSServiceResolve(&args->resolver, 0, 0, serviceName, regtype, replyDomain, _mdns_service_resolve_callback, args)) {
+			if (kDNSServiceErr_NoError != DNSServiceResolve(&args->resolver, 0, 0, serviceName, regtype,
+					replyDomain, _mdns_service_resolve_callback, args)) {
 				bonjour_buddy_delete(args->buddy);
 				g_free(args);
 				purple_debug_error("bonjour", "service browser - failed to resolve service.\n");
@@ -226,11 +229,9 @@
 	} else {
 		/* A peer has sent a goodbye packet, remove them from the buddy list */
 		purple_debug_info("bonjour", "service browser - remove notification\n");
-		gb = purple_find_buddy(account, serviceName);
-		if (gb != NULL) {
-			bonjour_buddy_delete(gb->proto_data);
-			purple_blist_remove_buddy(gb);
-		}
+		pb = purple_find_buddy(account, serviceName);
+		if (pb != NULL)
+			purple_blist_remove_buddy(pb);
 	}
 }
 
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/parser.c pidgin-2.2.0/libpurple/protocols/bonjour/parser.c
--- pidgin-2.1.1/libpurple/protocols/bonjour/parser.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/parser.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/bonjour/parser.h pidgin-2.2.0/libpurple/protocols/bonjour/parser.h
--- pidgin-2.1.1/libpurple/protocols/bonjour/parser.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/bonjour/parser.h	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_BONJOUR_PARSER_H_
 #define _PURPLE_BONJOUR_PARSER_H_
diff -ru pidgin-2.1.1/libpurple/protocols/gg/buddylist.c pidgin-2.2.0/libpurple/protocols/gg/buddylist.c
--- pidgin-2.1.1/libpurple/protocols/gg/buddylist.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/buddylist.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/buddylist.h pidgin-2.2.0/libpurple/protocols/gg/buddylist.h
--- pidgin-2.1.1/libpurple/protocols/gg/buddylist.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/buddylist.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/confer.c pidgin-2.2.0/libpurple/protocols/gg/confer.c
--- pidgin-2.1.1/libpurple/protocols/gg/confer.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/confer.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/confer.h pidgin-2.2.0/libpurple/protocols/gg/confer.h
--- pidgin-2.1.1/libpurple/protocols/gg/confer.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/confer.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/gg.c pidgin-2.2.0/libpurple/protocols/gg/gg.c
--- pidgin-2.1.1/libpurple/protocols/gg/gg.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/gg.c	2007-09-14 00:45:39.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -411,6 +411,8 @@
 	purple_notify_info(NULL, _("New Gadu-Gadu Account Registered"),
 			 _("Registration completed successfully!"), NULL);
 
+	if(account->registration_cb)
+		(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
 	/* TODO: the currently open Accounts Window will not be updated withthe
 	 * new username and etc, we need to somehow have it refresh at this
 	 * point
@@ -420,6 +422,9 @@
 	purple_connection_destroy(gc);
 
 exit_err:
+	if(account->registration_cb)
+		(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
+
 	gg_register_free(h);
 	g_free(email);
 	g_free(p1);
diff -ru pidgin-2.1.1/libpurple/protocols/gg/gg.h pidgin-2.2.0/libpurple/protocols/gg/gg.h
--- pidgin-2.1.1/libpurple/protocols/gg/gg.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/gg.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/gg-utils.c pidgin-2.2.0/libpurple/protocols/gg/gg-utils.c
--- pidgin-2.1.1/libpurple/protocols/gg/gg-utils.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/gg-utils.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/gg-utils.h pidgin-2.2.0/libpurple/protocols/gg/gg-utils.h
--- pidgin-2.1.1/libpurple/protocols/gg/gg-utils.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/gg-utils.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_GG_UTILS_H
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/common.c pidgin-2.2.0/libpurple/protocols/gg/lib/common.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/common.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/common.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/compat.h pidgin-2.2.0/libpurple/protocols/gg/lib/compat.h
--- pidgin-2.1.1/libpurple/protocols/gg/lib/compat.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/compat.h	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/COPYING pidgin-2.2.0/libpurple/protocols/gg/lib/COPYING
--- pidgin-2.1.1/libpurple/protocols/gg/lib/COPYING	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/COPYING	2007-09-14 00:45:39.000000000 -0400
@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/dcc.c pidgin-2.2.0/libpurple/protocols/gg/lib/dcc.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/dcc.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/dcc.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/events.c pidgin-2.2.0/libpurple/protocols/gg/lib/events.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/events.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/events.c	2007-09-14 00:45:39.000000000 -0400
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/http.c pidgin-2.2.0/libpurple/protocols/gg/lib/http.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/http.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/http.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/libgadu.c pidgin-2.2.0/libpurple/protocols/gg/lib/libgadu.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/libgadu.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/libgadu.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/libgadu.h pidgin-2.2.0/libpurple/protocols/gg/lib/libgadu.h
--- pidgin-2.1.1/libpurple/protocols/gg/lib/libgadu.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/libgadu.h	2007-09-14 00:45:39.000000000 -0400
@@ -19,7 +19,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/obsolete.c pidgin-2.2.0/libpurple/protocols/gg/lib/obsolete.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/obsolete.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/obsolete.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/pubdir50.c pidgin-2.2.0/libpurple/protocols/gg/lib/pubdir50.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/pubdir50.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/pubdir50.c	2007-09-14 00:45:39.000000000 -0400
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/lib/pubdir.c pidgin-2.2.0/libpurple/protocols/gg/lib/pubdir.c
--- pidgin-2.1.1/libpurple/protocols/gg/lib/pubdir.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/lib/pubdir.c	2007-09-14 00:45:39.000000000 -0400
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
  *  USA.
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/Makefile.in pidgin-2.2.0/libpurple/protocols/gg/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/gg/Makefile.in	2007-08-20 14:13:55.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/Makefile.in	2007-09-14 03:31:23.000000000 -0400
@@ -162,6 +162,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -190,6 +192,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -245,14 +249,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -264,7 +266,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -325,6 +326,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -345,6 +347,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/gg/search.c pidgin-2.2.0/libpurple/protocols/gg/search.c
--- pidgin-2.1.1/libpurple/protocols/gg/search.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/search.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/gg/search.h pidgin-2.2.0/libpurple/protocols/gg/search.h
--- pidgin-2.1.1/libpurple/protocols/gg/search.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/gg/search.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/irc/cmds.c pidgin-2.2.0/libpurple/protocols/irc/cmds.c
--- pidgin-2.1.1/libpurple/protocols/irc/cmds.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/cmds.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/irc/dcc_send.c pidgin-2.2.0/libpurple/protocols/irc/dcc_send.c
--- pidgin-2.1.1/libpurple/protocols/irc/dcc_send.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/dcc_send.c	2007-09-14 00:45:39.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/irc/irc.c pidgin-2.2.0/libpurple/protocols/irc/irc.c
--- pidgin-2.1.1/libpurple/protocols/irc/irc.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/irc.c	2007-09-14 00:45:39.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -347,6 +347,7 @@
 	const char *username, *realname;
 	struct irc_conn *irc = gc->proto_data;
 	const char *pass = purple_connection_get_password(gc);
+	int ret;
 
 	if (pass && *pass) {
 		buf = irc_format(irc, "vv", "PASS", pass);
@@ -359,8 +360,12 @@
 	}
 
 
-	gethostname(hostname, sizeof(hostname));
+	ret = gethostname(hostname, sizeof(hostname));
 	hostname[sizeof(hostname) - 1] = '\0';
+	if (ret < 0 || hostname[0] == '\0') {
+		purple_debug_warning("irc", "gethostname() failed -- is your hostname set?");
+		strcpy(hostname, "localhost");
+	}
 	realname = purple_account_get_string(irc->account, "realname", "");
 	username = purple_account_get_string(irc->account, "username", "");
 
@@ -433,14 +438,7 @@
 
 	irc->gsc = NULL;
 
-	switch(error) {
-		case PURPLE_SSL_CONNECT_FAILED:
-			purple_connection_error(gc, _("Connection Failed"));
-			break;
-		case PURPLE_SSL_HANDSHAKE_FAILED:
-			purple_connection_error(gc, _("SSL Handshake Failed"));
-			break;
-	}
+	purple_connection_error(gc, purple_ssl_strerror(error));
 }
 
 static void irc_close(PurpleConnection *gc)
diff -ru pidgin-2.1.1/libpurple/protocols/irc/irc.h pidgin-2.2.0/libpurple/protocols/irc/irc.h
--- pidgin-2.1.1/libpurple/protocols/irc/irc.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/irc.h	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_IRC_H
diff -ru pidgin-2.1.1/libpurple/protocols/irc/Makefile.in pidgin-2.2.0/libpurple/protocols/irc/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/irc/Makefile.in	2007-08-20 14:13:56.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/Makefile.in	2007-09-14 03:31:23.000000000 -0400
@@ -143,6 +143,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -171,6 +173,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -226,14 +230,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -245,7 +247,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -306,6 +307,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -326,6 +328,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/irc/msgs.c pidgin-2.2.0/libpurple/protocols/irc/msgs.c
--- pidgin-2.1.1/libpurple/protocols/irc/msgs.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/msgs.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/irc/parse.c pidgin-2.2.0/libpurple/protocols/irc/parse.c
--- pidgin-2.1.1/libpurple/protocols/irc/parse.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/irc/parse.c	2007-09-14 00:45:39.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
Only in pidgin-2.2.0/libpurple/protocols/jabber: adhoccommands.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: adhoccommands.h
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/auth.c pidgin-2.2.0/libpurple/protocols/jabber/auth.c
--- pidgin-2.1.1/libpurple/protocols/jabber/auth.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/auth.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -203,8 +203,15 @@
 	return TRUE;
 }
 	
-static void auth_pass_cb(JabberStream *js, PurpleRequestFields *fields)
+static void auth_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
 {
+	JabberStream *js;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(conn))
+		return;
+
+	js = conn->proto_data;
 
 	if (!auth_pass_generic(js, fields))
 		return;
@@ -217,8 +224,16 @@
 }
 
 static void
-auth_old_pass_cb(JabberStream *js, PurpleRequestFields *fields)
+auth_old_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
 {
+	JabberStream *js;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(conn))
+		return;
+
+	js = conn->proto_data;
+
 	if (!auth_pass_generic(js, fields))
 		return;
 	
@@ -228,9 +243,17 @@
 
 
 static void
-auth_no_pass_cb(JabberStream *js, PurpleRequestFields *fields)
+auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
 {
-	purple_connection_error(js->gc, _("Password is required to sign on."));
+	JabberStream *js;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(conn))
+		return;
+
+	js = conn->proto_data;
+
+	purple_connection_error(conn, _("Password is required to sign on."));
 }
 
 static void jabber_auth_start_cyrus(JabberStream *js)
@@ -283,7 +306,7 @@
 				 */
 
 				if (!purple_account_get_password(js->gc->account)) {
-					purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js);
+					purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
 					return;
 
 				/* If we've got a password, but aren't sending
@@ -515,6 +538,9 @@
 					(err_code = xmlnode_get_attrib(error, "code")) &&
 					!strcmp(err_code, "401")) {
 			js->gc->wants_to_die = TRUE;
+			/* Clear the pasword if it isn't being saved */
+			if (!purple_account_get_remember_password(js->gc->account))
+				purple_account_set_password(js->gc->account, NULL);
 		}
 
 		purple_connection_error(js->gc, msg);
@@ -597,7 +623,7 @@
 	 */
 	
 	if (!purple_account_get_password(js->gc->account)) {
-		purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js);
+		purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
 		return;
 	}
 #endif
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/auth.h pidgin-2.2.0/libpurple/protocols/jabber/auth.h
--- pidgin-2.1.1/libpurple/protocols/jabber/auth.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/auth.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_AUTH_H_
 #define _PURPLE_JABBER_AUTH_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/buddy.c pidgin-2.2.0/libpurple/protocols/jabber/buddy.c
--- pidgin-2.1.1/libpurple/protocols/jabber/buddy.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/buddy.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -34,6 +34,8 @@
 #include "iq.h"
 #include "presence.h"
 #include "xdata.h"
+#include "pep.h"
+#include "adhoccommands.h"
 
 typedef struct {
 	long idle_seconds;
@@ -116,7 +118,6 @@
 		int priority, JabberBuddyState state, const char *status)
 {
 	JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource);
-
 	if(!jbr) {
 		jbr = g_new0(JabberBuddyResource, 1);
 		jbr->jb = jb;
@@ -128,7 +129,7 @@
 	jbr->state = state;
 	if(jbr->status)
 		g_free(jbr->status);
-        if (status)
+	if (status)
 		jbr->status = g_markup_escape_text(status, -1);
 	else
 		jbr->status = NULL;
@@ -141,6 +142,17 @@
 	g_return_if_fail(jbr != NULL);
 
 	jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr);
+	
+	while(jbr->commands) {
+		JabberAdHocCommands *cmd = jbr->commands->data;
+		g_free(cmd->jid);
+		g_free(cmd->node);
+		g_free(cmd->name);
+		g_free(cmd);
+		jbr->commands = g_list_delete_link(jbr->commands, jbr->commands);
+	}
+	
+	jabber_caps_free_clientinfo(jbr->caps);
 
 	g_free(jbr->name);
 	g_free(jbr->status);
@@ -411,7 +423,7 @@
 		if ((img = purple_buddy_icons_find_account_icon(gc->account))) {
 			gconstpointer avatar_data;
 			gsize avatar_len;
-			xmlnode *photo, *binval;
+			xmlnode *photo, *binval, *type;
 			gchar *enc;
 			int i;
 			unsigned char hashval[20];
@@ -424,6 +436,8 @@
 				xmlnode_free(photo);
 			}
 			photo = xmlnode_new_child(vc_node, "PHOTO");
+			type = xmlnode_new_child(photo, "TYPE");
+			xmlnode_insert_data(type, "image/png", -1);
 			binval = xmlnode_new_child(photo, "BINVAL");
 			enc = purple_base64_encode(avatar_data, avatar_len);
 
@@ -452,9 +466,135 @@
 
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 {
+	PurplePresence *gpresence;
+	PurpleStatus *status;
+	
+	if(((JabberStream*)gc->proto_data)->pep) {
+		/* XEP-0084: User Avatars */
+		if(img) {
+			/* A PNG header, including the IHDR, but nothing else */
+			const struct {
+				guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */
+				struct {
+					guint32 length; /* must be 0x0d */
+					guchar type[4]; /* must be 'I' 'H' 'D' 'R' */
+					guint32 width;
+					guint32 height;
+					guchar bitdepth;
+					guchar colortype;
+					guchar compression;
+					guchar filter;
+					guchar interlace;
+				} ihdr;
+			} *png = purple_imgstore_get_data(img); /* ATTN: this is in network byte order! */
+
+			/* check if the data is a valid png file (well, at least to some extend) */
+			if(png->signature[0] == 0x89 &&
+			   png->signature[1] == 0x50 &&
+			   png->signature[2] == 0x4e &&
+			   png->signature[3] == 0x47 &&
+			   png->signature[4] == 0x0d &&
+			   png->signature[5] == 0x0a &&
+			   png->signature[6] == 0x1a &&
+			   png->signature[7] == 0x0a &&
+			   ntohl(png->ihdr.length) == 0x0d &&
+			   png->ihdr.type[0] == 'I' &&
+			   png->ihdr.type[1] == 'H' &&
+			   png->ihdr.type[2] == 'D' &&
+			   png->ihdr.type[3] == 'R') {
+				/* parse PNG header to get the size of the image (yes, this is required) */
+				guint32 width = ntohl(png->ihdr.width);
+				guint32 height = ntohl(png->ihdr.height);
+				xmlnode *publish, *item, *data, *metadata, *info;
+				char *lengthstring, *widthstring, *heightstring;
+				
+				/* compute the sha1 hash */
+				PurpleCipherContext *ctx;
+				unsigned char digest[20];
+				char *hash;
+				char *base64avatar;
+				
+				ctx = purple_cipher_context_new_by_name("sha1", NULL);
+				purple_cipher_context_append(ctx, purple_imgstore_get_data(img), purple_imgstore_get_size(img));
+				purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL);
+				
+				/* convert digest to a string */
+				hash = g_strdup_printf("%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",digest[0],digest[1],digest[2],digest[3],digest[4],digest[5],digest[6],digest[7],digest[8],digest[9],digest[10],digest[11],digest[12],digest[13],digest[14],digest[15],digest[16],digest[17],digest[18],digest[19]);
+				
+				publish = xmlnode_new("publish");
+				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEDATA);
+				
+				item = xmlnode_new_child(publish, "item");
+				xmlnode_set_attrib(item, "id", hash);
+				
+				data = xmlnode_new_child(item, "data");
+				xmlnode_set_namespace(data,AVATARNAMESPACEDATA);
+				
+				base64avatar = purple_base64_encode(purple_imgstore_get_data(img), purple_imgstore_get_size(img));
+				xmlnode_insert_data(data,base64avatar,-1);
+				g_free(base64avatar);
+				
+				/* publish the avatar itself */
+				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+				
+				/* next step: publish the metadata */
+				publish = xmlnode_new("publish");
+				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);
+				
+				item = xmlnode_new_child(publish, "item");
+				xmlnode_set_attrib(item, "id", hash);
+				
+				metadata = xmlnode_new_child(item, "metadata");
+				xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);
+				
+				info = xmlnode_new_child(metadata, "info");
+				xmlnode_set_attrib(info, "id", hash);
+				xmlnode_set_attrib(info, "type", "image/png");
+				lengthstring = g_strdup_printf("%u", (unsigned)purple_imgstore_get_size(img));
+				xmlnode_set_attrib(info, "bytes", lengthstring);
+				g_free(lengthstring);
+				widthstring = g_strdup_printf("%u", width);
+				xmlnode_set_attrib(info, "width", widthstring);
+				g_free(widthstring);
+				heightstring = g_strdup_printf("%u", height);
+				xmlnode_set_attrib(info, "height", heightstring);
+				g_free(lengthstring);
+				
+				/* publish the metadata */
+				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+				
+				g_free(hash);
+			} else { /* if(img) */
+				/* remove the metadata */
+				xmlnode *metadata, *item;
+				xmlnode *publish = xmlnode_new("publish");
+				xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA);
+				
+				item = xmlnode_new_child(publish, "item");
+				
+				metadata = xmlnode_new_child(item, "metadata");
+				xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA);
+				
+				xmlnode_new_child(metadata, "stop");
+				
+				/* publish the metadata */
+				jabber_pep_publish((JabberStream*)gc->proto_data, publish);
+			}
+		} else {
+			purple_debug(PURPLE_DEBUG_ERROR, "jabber",
+						 "jabber_set_buddy_icon received non-png data");
+		}
+	}
+
+	/* even when the image is not png, we can still publish the vCard, since this
+	   one doesn't require a specific image type */
+
+	/* publish vCard for those poor older clients */
 	jabber_set_info(gc, purple_account_get_user_info(gc->account));
 
-	jabber_presence_send(gc->account, NULL);
+	gpresence = purple_account_get_presence(gc->account);
+	status = purple_presence_get_active_status(gpresence);
+	jabber_presence_send(gc->account, status);
 }
 
 /*
@@ -659,6 +799,130 @@
 				purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os);
 			}
 		}
+#if 0 
+		/* #if 0 this for now; I think this would be far more useful if we limited this to a particular set of features
+ 		 * of particular interest (-vv jumps out as one). As it is now, I don't picture people getting all excited: "Oh sweet crap!
+ 		 * So-and-so supports 'jabber:x:data' AND 'Collaborative Data Objects'!"
+ 		 */
+
+		if(jbr && jbr->caps) {
+			GString *tmp = g_string_new("");
+			GList *iter;
+			for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) {
+				const char *feature = iter->data;
+				
+				if(!strcmp(feature, "jabber:iq:last"))
+					feature = _("Last Activity");
+				else if(!strcmp(feature, "http://jabber.org/protocol/disco#info"))
+					feature = _("Service Discovery Info");
+				else if(!strcmp(feature, "http://jabber.org/protocol/disco#items"))
+					feature = _("Service Discovery Items");
+				else if(!strcmp(feature, "http://jabber.org/protocol/address"))
+					feature = _("Extended Stanza Addressing");
+				else if(!strcmp(feature, "http://jabber.org/protocol/muc"))
+					feature = _("Multi-User Chat");
+				else if(!strcmp(feature, "http://jabber.org/protocol/muc#user"))
+					feature = _("Multi-User Chat Extended Presence Information");
+				else if(!strcmp(feature, "http://jabber.org/protocol/ibb"))
+					feature = _("In-Band Bytestreams");
+				else if(!strcmp(feature, "http://jabber.org/protocol/commands"))
+					feature = _("Ad-Hoc Commands");
+				else if(!strcmp(feature, "http://jabber.org/protocol/pubsub"))
+					feature = _("PubSub Service");
+				else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams"))
+					feature = _("SOCKS5 Bytestreams");
+				else if(!strcmp(feature, "jabber:x:oob"))
+					feature = _("Out of Band Data");
+				else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im"))
+					feature = _("XHTML-IM");
+				else if(!strcmp(feature, "jabber:iq:register"))
+					feature = _("In-Band Registration");
+				else if(!strcmp(feature, "http://jabber.org/protocol/geoloc"))
+					feature = _("User Location");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html"))
+					feature = _("User Avatar");
+				else if(!strcmp(feature, "http://jabber.org/protocol/chatstates"))
+					feature = _("Chat State Notifications");
+				else if(!strcmp(feature, "jabber:iq:version"))
+					feature = _("Software Version");
+				else if(!strcmp(feature, "http://jabber.org/protocol/si"))
+					feature = _("Stream Initiation");
+				else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer"))
+					feature = _("File Transfer");
+				else if(!strcmp(feature, "http://jabber.org/protocol/mood"))
+					feature = _("User Mood");
+				else if(!strcmp(feature, "http://jabber.org/protocol/activity"))
+					feature = _("User Activity");
+				else if(!strcmp(feature, "http://jabber.org/protocol/caps"))
+					feature = _("Entity Capabilities");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html"))
+					feature = _("Encrypted Session Negotiations");
+				else if(!strcmp(feature, "http://jabber.org/protocol/tune"))
+					feature = _("User Tune");
+				else if(!strcmp(feature, "http://jabber.org/protocol/rosterx"))
+					feature = _("Roster Item Exchange");
+				else if(!strcmp(feature, "http://jabber.org/protocol/reach"))
+					feature = _("Reachability Address");
+				else if(!strcmp(feature, "http://jabber.org/protocol/profile"))
+					feature = _("User Profile");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns"))
+					feature = _("Jingle");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns"))
+					feature = _("Jingle Audio");
+				else if(!strcmp(feature, "http://jabber.org/protocol/nick"))
+					feature = _("User Nickname");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp"))
+					feature = _("Jingle ICE UDP");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp"))
+					feature = _("Jingle ICE TCP");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns"))
+					feature = _("Jingle Raw UDP");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns"))
+					feature = _("Jingle Video");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns"))
+					feature = _("Jingle DTMF");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns"))
+					feature = _("Message Receipts");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns"))
+					feature = _("Public Key Publishing");
+				else if(!strcmp(feature, "http://jabber.org/protocol/chatting"))
+					feature = _("User Chatting");
+				else if(!strcmp(feature, "http://jabber.org/protocol/browsing"))
+					feature = _("User Browsing");
+				else if(!strcmp(feature, "http://jabber.org/protocol/gaming"))
+					feature = _("User Gaming");
+				else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
+					feature = _("User Viewing");
+				else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+					feature = _("Ping");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
+					feature = _("Stanza Encryption");
+				else if(!strcmp(feature, "urn:xmpp:time"))
+					feature = _("Entity Time");
+				else if(!strcmp(feature, "urn:xmpp:delay"))
+					feature = _("Delayed Delivery");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns"))
+					feature = _("Collaborative Data Objects");
+				else if(!strcmp(feature, "http://jabber.org/protocol/fileshare"))
+					feature = _("File Repository and Sharing");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns"))
+					feature = _("STUN Service Discovery for Jingle");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns"))
+					feature = _("Simplified Encrypted Session Negotiation");
+				else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns"))
+					feature = _("Hop Check");
+				else if(g_str_has_suffix(feature, "+notify"))
+					feature = NULL;
+				if(feature)
+					g_string_append_printf(tmp, "%s<br/>", feature);
+			}
+
+			if(strlen(tmp->str) > 0)
+				purple_notify_user_info_add_pair(user_info, _("Capabilities"), tmp->str);
+			
+			g_string_free(tmp, TRUE);
+		}
+#endif
 	} else {
 		for(resources = jbi->jb->resources; resources; resources = resources->next) {
 			char *purdy = NULL;
@@ -700,6 +964,125 @@
 					purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os);
 				}
 			}
+#if 0
+			if(jbr && jbr->caps) {
+				GString *tmp = g_string_new("");
+				GList *iter;
+				for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) {
+					const char *feature = iter->data;
+					
+					if(!strcmp(feature, "jabber:iq:last"))
+						feature = _("Last Activity");
+					else if(!strcmp(feature, "http://jabber.org/protocol/disco#info"))
+						feature = _("Service Discovery Info");
+					else if(!strcmp(feature, "http://jabber.org/protocol/disco#items"))
+						feature = _("Service Discovery Items");
+					else if(!strcmp(feature, "http://jabber.org/protocol/address"))
+						feature = _("Extended Stanza Addressing");
+					else if(!strcmp(feature, "http://jabber.org/protocol/muc"))
+						feature = _("Multi-User Chat");
+					else if(!strcmp(feature, "http://jabber.org/protocol/muc#user"))
+						feature = _("Multi-User Chat Extended Presence Information");
+					else if(!strcmp(feature, "http://jabber.org/protocol/ibb"))
+						feature = _("In-Band Bytestreams");
+					else if(!strcmp(feature, "http://jabber.org/protocol/commands"))
+						feature = _("Ad-Hoc Commands");
+					else if(!strcmp(feature, "http://jabber.org/protocol/pubsub"))
+						feature = _("PubSub Service");
+					else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams"))
+						feature = _("SOCKS5 Bytestreams");
+					else if(!strcmp(feature, "jabber:x:oob"))
+						feature = _("Out of Band Data");
+					else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im"))
+						feature = _("XHTML-IM");
+					else if(!strcmp(feature, "jabber:iq:register"))
+						feature = _("In-Band Registration");
+					else if(!strcmp(feature, "http://jabber.org/protocol/geoloc"))
+						feature = _("User Location");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html"))
+						feature = _("User Avatar");
+					else if(!strcmp(feature, "http://jabber.org/protocol/chatstates"))
+						feature = _("Chat State Notifications");
+					else if(!strcmp(feature, "jabber:iq:version"))
+						feature = _("Software Version");
+					else if(!strcmp(feature, "http://jabber.org/protocol/si"))
+						feature = _("Stream Initiation");
+					else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer"))
+						feature = _("File Transfer");
+					else if(!strcmp(feature, "http://jabber.org/protocol/mood"))
+						feature = _("User Mood");
+					else if(!strcmp(feature, "http://jabber.org/protocol/activity"))
+						feature = _("User Activity");
+					else if(!strcmp(feature, "http://jabber.org/protocol/caps"))
+						feature = _("Entity Capabilities");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html"))
+						feature = _("Encrypted Session Negotiations");
+					else if(!strcmp(feature, "http://jabber.org/protocol/tune"))
+						feature = _("User Tune");
+					else if(!strcmp(feature, "http://jabber.org/protocol/rosterx"))
+						feature = _("Roster Item Exchange");
+					else if(!strcmp(feature, "http://jabber.org/protocol/reach"))
+						feature = _("Reachability Address");
+					else if(!strcmp(feature, "http://jabber.org/protocol/profile"))
+						feature = _("User Profile");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns"))
+						feature = _("Jingle");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns"))
+						feature = _("Jingle Audio");
+					else if(!strcmp(feature, "http://jabber.org/protocol/nick"))
+						feature = _("User Nickname");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp"))
+						feature = _("Jingle ICE UDP");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp"))
+						feature = _("Jingle ICE TCP");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns"))
+						feature = _("Jingle Raw UDP");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns"))
+						feature = _("Jingle Video");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns"))
+						feature = _("Jingle DTMF");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns"))
+						feature = _("Message Receipts");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns"))
+						feature = _("Public Key Publishing");
+					else if(!strcmp(feature, "http://jabber.org/protocol/chatting"))
+						feature = _("User Chatting");
+					else if(!strcmp(feature, "http://jabber.org/protocol/browsing"))
+						feature = _("User Browsing");
+					else if(!strcmp(feature, "http://jabber.org/protocol/gaming"))
+						feature = _("User Gaming");
+					else if(!strcmp(feature, "http://jabber.org/protocol/viewing"))
+						feature = _("User Viewing");
+					else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+						feature = _("Ping");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns"))
+						feature = _("Stanza Encryption");
+					else if(!strcmp(feature, "urn:xmpp:time"))
+						feature = _("Entity Time");
+					else if(!strcmp(feature, "urn:xmpp:delay"))
+						feature = _("Delayed Delivery");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns"))
+						feature = _("Collaborative Data Objects");
+					else if(!strcmp(feature, "http://jabber.org/protocol/fileshare"))
+						feature = _("File Repository and Sharing");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns"))
+						feature = _("STUN Service Discovery for Jingle");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns"))
+						feature = _("Simplified Encrypted Session Negotiation");
+					else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns"))
+						feature = _("Hop Check");
+					else if(g_str_has_suffix(feature, "+notify"))
+						feature = NULL;
+					
+					if(feature)
+						g_string_append_printf(tmp, "%s\n", feature);
+				}
+				if(strlen(tmp->str) > 0)
+					purple_notify_user_info_add_pair(user_info, _("Capabilities"), tmp->str);
+				
+				g_string_free(tmp, TRUE);
+			}
+#endif
 		}
 	}
 
@@ -777,6 +1160,17 @@
 	jabber_iq_send(iq);
 }
 
+static void
+jabber_string_escape_and_append(GString *string, const char *name, const char *value, gboolean indent)
+{
+	gchar *escaped;
+
+	escaped = g_markup_escape_text(value, -1);
+	g_string_append_printf(string, "%s<b>%s:</b> %s<br/>",
+			indent ? "&nbsp;&nbsp;" : "", name, escaped);
+	g_free(escaped);
+}
+
 static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 {
 	const char *id, *from;
@@ -821,8 +1215,8 @@
 
 			text = xmlnode_get_data(child);
 			if(text && !strcmp(child->name, "FN")) {
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Full Name"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Full Name"), text, FALSE);
 			} else if(!strcmp(child->name, "N")) {
 				for(child2 = child->child; child2; child2 = child2->next)
 				{
@@ -833,17 +1227,14 @@
 
 					text2 = xmlnode_get_data(child2);
 					if(text2 && !strcmp(child2->name, "FAMILY")) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>",
-								_("Family Name"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Family Name"), text2, FALSE);
 					} else if(text2 && !strcmp(child2->name, "GIVEN")) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>",
-								_("Given Name"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Given Name"), text2, FALSE);
 					} else if(text2 && !strcmp(child2->name, "MIDDLE")) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>",
-								_("Middle Name"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Middle Name"), text2, FALSE);
 					}
 					g_free(text2);
 				}
@@ -852,11 +1243,11 @@
 				if(b) {
 					purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", text);
 				}
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Nickname"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Nickname"), text, FALSE);
 			} else if(text && !strcmp(child->name, "BDAY")) {
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Birthday"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Birthday"), text, FALSE);
 			} else if(!strcmp(child->name, "ADR")) {
 				gboolean address_line_added = FALSE;
 
@@ -881,34 +1272,27 @@
 					}
 
 					if(!strcmp(child2->name, "POBOX")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("P.O. Box"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("P.O. Box"), text2, TRUE);
 					} else if(!strcmp(child2->name, "EXTADR")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Extended Address"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Extended Address"), text2, TRUE);
 					} else if(!strcmp(child2->name, "STREET")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Street Address"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Street Address"), text2, TRUE);
 					} else if(!strcmp(child2->name, "LOCALITY")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Locality"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Locality"), text2, TRUE);
 					} else if(!strcmp(child2->name, "REGION")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Region"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Region"), text2, TRUE);
 					} else if(!strcmp(child2->name, "PCODE")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Postal Code"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Postal Code"), text2, TRUE);
 					} else if(!strcmp(child2->name, "CTRY")
 								|| !strcmp(child2->name, "COUNTRY")) {
-						g_string_append_printf(info_text,
-								"&nbsp;<b>%s:</b> %s<br/>",
-								_("Country"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Country"), text2, TRUE);
 					}
 					g_free(text2);
 				}
@@ -918,34 +1302,38 @@
 					/* show what kind of number it is */
 					number = xmlnode_get_data(child2);
 					if(number) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>", _("Telephone"), number);
+						jabber_string_escape_and_append(info_text,
+								_("Telephone"), number, FALSE);
 						g_free(number);
 					}
 				} else if((number = xmlnode_get_data(child))) {
 					/* lots of clients (including purple) do this, but it's
 					 * out of spec */
-					g_string_append_printf(info_text,
-							"<b>%s:</b> %s<br/>", _("Telephone"), number);
+					jabber_string_escape_and_append(info_text,
+							_("Telephone"), number, FALSE);
 					g_free(number);
 				}
 			} else if(!strcmp(child->name, "EMAIL")) {
-				char *userid;
+				char *userid, *escaped;
 				if((child2 = xmlnode_get_child(child, "USERID"))) {
 					/* show what kind of email it is */
 					userid = xmlnode_get_data(child2);
 					if(userid) {
+						escaped = g_markup_escape_text(userid, -1);
 						g_string_append_printf(info_text,
-								"<b>%s:</b> <a href='mailto:%s'>%s</a><br/>",
-								_("E-Mail"), userid, userid);
+								"<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>",
+								_("E-Mail"), escaped, escaped);
+						g_free(escaped);
 						g_free(userid);
 					}
 				} else if((userid = xmlnode_get_data(child))) {
 					/* lots of clients (including purple) do this, but it's
 					 * out of spec */
-						g_string_append_printf(info_text,
-								"<b>%s:</b> <a href='mailto:%s'>%s</a><br/>",
-								_("E-Mail"), userid, userid);
+					escaped = g_markup_escape_text(userid, -1);
+					g_string_append_printf(info_text,
+							"<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>",
+							_("E-Mail"), escaped, escaped);
+					g_free(escaped);
 					g_free(userid);
 				}
 			} else if(!strcmp(child->name, "ORG")) {
@@ -958,25 +1346,23 @@
 
 					text2 = xmlnode_get_data(child2);
 					if(text2 && !strcmp(child2->name, "ORGNAME")) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>",
-								_("Organization Name"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Organization Name"), text2, FALSE);
 					} else if(text2 && !strcmp(child2->name, "ORGUNIT")) {
-						g_string_append_printf(info_text,
-								"<b>%s:</b> %s<br/>",
-								_("Organization Unit"), text2);
+						jabber_string_escape_and_append(info_text,
+								_("Organization Unit"), text2, FALSE);
 					}
 					g_free(text2);
 				}
 			} else if(text && !strcmp(child->name, "TITLE")) {
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Title"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Title"), text, FALSE);
 			} else if(text && !strcmp(child->name, "ROLE")) {
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Role"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Role"), text, FALSE);
 			} else if(text && !strcmp(child->name, "DESC")) {
-				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-						_("Description"), text);
+				jabber_string_escape_and_append(info_text,
+						_("Description"), text, FALSE);
 			} else if(!strcmp(child->name, "PHOTO") ||
 					!strcmp(child->name, "LOGO")) {
 				char *bintext = NULL;
@@ -1023,6 +1409,109 @@
 	jabber_buddy_info_show_if_ready(jbi);
 }
 
+typedef struct _JabberBuddyAvatarUpdateURLInfo {
+	JabberStream *js;
+	char *from;
+	char *id;
+} JabberBuddyAvatarUpdateURLInfo;
+
+static void do_buddy_avatar_update_fromurl(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message) {
+	JabberBuddyAvatarUpdateURLInfo *info = user_data;
+	if(!url_text) {
+		purple_debug(PURPLE_DEBUG_ERROR, "jabber",
+					 "do_buddy_avatar_update_fromurl got error \"%s\"", error_message);
+		return;
+	}
+	
+	purple_buddy_icons_set_for_user(purple_connection_get_account(info->js->gc), info->from, (void*)url_text, len, info->id);
+	g_free(info->from);
+	g_free(info->id);
+	g_free(info);
+}
+
+static void do_buddy_avatar_update_data(JabberStream *js, const char *from, xmlnode *items) {
+	xmlnode *item, *data;
+	const char *checksum;
+	char *b64data;
+	void *img;
+	size_t size;
+	if(!items)
+		return;
+	
+	item = xmlnode_get_child(items, "item");
+	if(!item)
+		return;
+	
+	data = xmlnode_get_child_with_namespace(item,"data",AVATARNAMESPACEDATA);
+	if(!data)
+		return;
+	
+	checksum = xmlnode_get_attrib(item,"id");
+	if(!checksum)
+		return;
+	
+	b64data = xmlnode_get_data(data);
+	if(!b64data)
+		return;
+	
+	img = purple_base64_decode(b64data, &size);
+	if(!img)
+		return;
+	
+	purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum);
+}
+
+void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) {
+	PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from);
+	const char *checksum;
+	xmlnode *item, *metadata;
+	if(!buddy)
+		return;
+	
+	checksum = purple_buddy_icons_get_checksum_for_user(buddy);
+	item = xmlnode_get_child(items,"item");
+	metadata = xmlnode_get_child_with_namespace(item, "metadata", AVATARNAMESPACEMETA);
+	if(!metadata)
+		return;
+	/* check if we have received a stop */
+	if(xmlnode_get_child(metadata, "stop")) {
+		purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL);
+	} else {
+		xmlnode *info, *goodinfo = NULL;
+		
+		/* iterate over all info nodes to get one we can use */
+		for(info = metadata->child; info; info = info->next) {
+			if(info->type == XMLNODE_TYPE_TAG && !strcmp(info->name,"info")) {
+				const char *type = xmlnode_get_attrib(info,"type");
+				const char *id = xmlnode_get_attrib(info,"id");
+				
+				if(checksum && id && !strcmp(id, checksum)) {
+					/* we already have that avatar, so we don't have to do anything */
+					goodinfo = NULL;
+					break;
+				}
+				/* We'll only pick the png one for now. It's a very nice image format anyways. */
+				if(type && id && !goodinfo && !strcmp(type, "image/png"))
+					goodinfo = info;
+			}
+		}
+		if(goodinfo) {
+			const char *url = xmlnode_get_attrib(goodinfo,"url");
+			const char *id = xmlnode_get_attrib(goodinfo,"id");
+			
+			/* the avatar might either be stored in a pep node, or on a HTTP/HTTPS URL */
+			if(!url)
+				jabber_pep_request_item(js, from, AVATARNAMESPACEDATA, id, do_buddy_avatar_update_data);
+			else {
+				JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1);
+				info->js = js;
+				info->from = g_strdup(from);
+				info->id = g_strdup(id);
+				purple_util_fetch_url(url, TRUE, NULL, TRUE, do_buddy_avatar_update_fromurl, info);
+			}
+		}
+	}
+}
 
 static void jabber_buddy_info_resource_free(gpointer data)
 {
@@ -1295,7 +1784,7 @@
 	status    = purple_presence_get_active_status(gpresence);
 
 	purple_status_to_jabber(status, &state, &msg, &priority);
-	presence = jabber_presence_create(state, msg, priority);
+	presence = jabber_presence_create_js(js, state, msg, priority);
 
 	g_free(msg);
 
@@ -1389,12 +1878,54 @@
 	jabber_presence_subscription_set(js, buddy->name, "unsubscribe");
 }
 
+static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) {
+	if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+		/* simply create a directed presence of the current status */
+		PurpleBuddy *buddy = (PurpleBuddy *) node;
+		PurpleConnection *gc = purple_account_get_connection(buddy->account);
+		JabberStream *js = gc->proto_data;
+		PurpleAccount *account = purple_connection_get_account(gc);
+		PurplePresence *gpresence = purple_account_get_presence(account);
+		PurpleStatus *status = purple_presence_get_active_status(gpresence);
+		xmlnode *presence;
+		JabberBuddyState state;
+		char *msg;
+		int priority;
+		
+		purple_status_to_jabber(status, &state, &msg, &priority);
+		presence = jabber_presence_create_js(js, state, msg, priority);
+		
+		g_free(msg);
+		
+		xmlnode_set_attrib(presence, "to", buddy->name);
+		
+		jabber_send(js, presence);
+		xmlnode_free(presence);
+	}
+}
+
+static void jabber_buddy_logout(PurpleBlistNode *node, gpointer data) {
+	if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
+		/* simply create a directed unavailable presence */
+		PurpleBuddy *buddy = (PurpleBuddy *) node;
+		JabberStream *js = purple_account_get_connection(buddy->account)->proto_data;
+		xmlnode *presence;
+		
+		presence = jabber_presence_create_js(js, JABBER_BUDDY_STATE_UNAVAILABLE, NULL, 0);
+		
+		xmlnode_set_attrib(presence, "to", buddy->name);
+		
+		jabber_send(js, presence);
+		xmlnode_free(presence);
+	}
+}
 
 static GList *jabber_buddy_menu(PurpleBuddy *buddy)
 {
 	PurpleConnection *gc = purple_account_get_connection(buddy->account);
 	JabberStream *js = gc->proto_data;
 	JabberBuddy *jb = jabber_buddy_find(js, buddy->name, TRUE);
+	GList *jbrs;
 
 	GList *m = NULL;
 	PurpleMenuAction *act;
@@ -1439,6 +1970,38 @@
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 	}
+	
+	/*
+	 * This if-condition implements parts of XEP-0100: Gateway Interaction
+	 *
+	 * According to stpeter, there is no way to know if a jid on the roster is a gateway without sending a disco#info.
+	 * However, since the gateway might appear offline to us, we cannot get that information. Therefore, I just assume
+	 * that gateways on the roster can be identified by having no '@' in their jid. This is a faily safe assumption, since
+	 * people don't tend to have a server or other service there.
+	 */
+	if (g_utf8_strchr(buddy->name, -1, '@') == NULL) {
+		act = purple_menu_action_new(_("Log In"),
+									 PURPLE_CALLBACK(jabber_buddy_login),
+									 NULL, NULL);
+		m = g_list_append(m, act);
+		act = purple_menu_action_new(_("Log Out"),
+									 PURPLE_CALLBACK(jabber_buddy_logout),
+									 NULL, NULL);
+		m = g_list_append(m, act);
+	}
+	
+	/* add all ad hoc commands to the action menu */
+	for(jbrs = jb->resources; jbrs; jbrs = g_list_next(jbrs)) {
+		JabberBuddyResource *jbr = jbrs->data;
+		GList *commands;
+		if (!jbr->commands)
+			continue;
+		for(commands = jbr->commands; commands; commands = g_list_next(commands)) {
+			JabberAdHocCommands *cmd = commands->data;
+			act = purple_menu_action_new(cmd->name, PURPLE_CALLBACK(jabber_adhoc_execute_action), cmd, NULL);
+			m = g_list_append(m, act);
+		}
+	}
 
 	return m;
 }
@@ -1584,36 +2147,58 @@
 	results = purple_notify_searchresults_new();
 	if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) {
 		xmlnode *reported;
+		GSList *column_vars = NULL;
+
 		purple_debug_info("jabber", "new-skool\n");
+
 		if((reported = xmlnode_get_child(x, "reported"))) {
 			xmlnode *field = xmlnode_get_child(reported, "field");
 			while(field) {
-				/* XXX keep track of this order, use it below */
 				const char *var = xmlnode_get_attrib(field, "var");
 				const char *label = xmlnode_get_attrib(field, "label");
 				if(var) {
 					column = purple_notify_searchresults_column_new(label ? label : var);
 					purple_notify_searchresults_column_add(results, column);
+					column_vars = g_slist_append(column_vars, (char *)var);
 				}
 				field = xmlnode_get_next_twin(field);
 			}
 		}
+
 		item = xmlnode_get_child(x, "item");
 		while(item) {
 			GList *row = NULL;
-			field = xmlnode_get_child(item, "field");
-			while(field) {
-				xmlnode *valuenode = xmlnode_get_child(field, "value");
-				if(valuenode) {
-					char *value = xmlnode_get_data(valuenode);
-					row = g_list_append(row, value);
+			GSList *l;
+			xmlnode *valuenode;
+			const char *var;
+
+			for (l = column_vars; l != NULL; l = l->next) {
+				/*
+				 * Build a row containing the strings that correspond
+				 * to each column of the search results.
+				 */
+				for (field = xmlnode_get_child(item, "field");
+						field != NULL;
+						field = xmlnode_get_next_twin(field))
+				{
+					if ((var = xmlnode_get_attrib(field, "var")) &&
+							!strcmp(var, l->data) &&
+							(valuenode = xmlnode_get_child(field, "value")))
+					{
+						char *value = xmlnode_get_data(valuenode);
+						row = g_list_append(row, value);
+						break;
+					}
 				}
-				field = xmlnode_get_next_twin(field);
+				if (field == NULL)
+					/* No data for this column */
+					row = g_list_append(row, NULL);
 			}
 			purple_notify_searchresults_row_add(results, row);
-
 			item = xmlnode_get_next_twin(item);
 		}
+
+		g_slist_free(column_vars);
 	} else {
 		/* old skool */
 		purple_debug_info("jabber", "old-skool\n");
@@ -1728,10 +2313,10 @@
  * in purple-i18n@lists.sourceforge.net (March 2006)
  */
 static const char * jabber_user_dir_comments [] = {
-       /* current comment from Jabber User Directory users.jabber.org */
-       N_("Find a contact by entering the search criteria in the given fields. "
-          "Note: Each field supports wild card searches (%)"),
-       NULL
+	/* current comment from Jabber User Directory users.jabber.org */
+	N_("Find a contact by entering the search criteria in the given fields. "
+	   "Note: Each field supports wild card searches (%)"),
+	NULL
 };
 #endif
 
@@ -1824,14 +2409,14 @@
 				_("Search for XMPP users"), instructions, fields,
 				_("Search"), G_CALLBACK(user_search_cb),
 				_("Cancel"), G_CALLBACK(user_search_cancel_cb),
-				NULL, NULL, NULL,
+				purple_connection_get_account(js->gc), NULL, NULL,
 				usi);
 
 		g_free(instructions);
 	}
 }
 
-static void jabber_user_search_ok(JabberStream *js, const char *directory)
+void jabber_user_search(JabberStream *js, const char *directory)
 {
 	JabberIq *iq;
 
@@ -1858,7 +2443,7 @@
 			_("Select a user directory to search"),
 			js->user_directories ? js->user_directories->data : NULL,
 			FALSE, FALSE, NULL,
-			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search_ok),
+			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
 			js);
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/buddy.h pidgin-2.2.0/libpurple/protocols/jabber/buddy.h
--- pidgin-2.1.1/libpurple/protocols/jabber/buddy.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/buddy.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,13 +17,11 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_BUDDY_H_
 #define _PURPLE_JABBER_BUDDY_H_
 
-#include "jabber.h"
-
 typedef enum {
 	JABBER_BUDDY_STATE_UNKNOWN = -2,
 	JABBER_BUDDY_STATE_ERROR = -1,
@@ -35,6 +33,12 @@
 	JABBER_BUDDY_STATE_DND
 } JabberBuddyState;
 
+#include "jabber.h"
+#include "caps.h"
+
+#define AVATARNAMESPACEDATA "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
+#define AVATARNAMESPACEMETA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
+
 typedef struct _JabberBuddy {
 	GList *resources;
 	char *error_msg;
@@ -53,6 +57,12 @@
 	} subscription;
 } JabberBuddy;
 
+typedef struct _JabberAdHocCommands {
+	char *jid;
+	char *node;
+	char *name;
+} JabberAdHocCommands;
+
 typedef struct _JabberBuddyResource {
 	JabberBuddy *jb;
 	char *name;
@@ -71,6 +81,8 @@
 		char *name;
 		char *os;
 	} client;
+	JabberCapsClientInfo *caps;
+	GList *commands;
 } JabberBuddyResource;
 
 void jabber_buddy_free(JabberBuddy *jb);
@@ -92,6 +104,7 @@
 void jabber_set_info(PurpleConnection *gc, const char *info);
 void jabber_setup_set_info(PurplePluginAction *action);
 void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img);
+void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items);
 
 const char *jabber_buddy_state_get_name(JabberBuddyState state);
 const char *jabber_buddy_state_get_status_id(JabberBuddyState state);
@@ -99,6 +112,7 @@
 JabberBuddyState jabber_buddy_status_id_get_state(const char *id);
 JabberBuddyState jabber_buddy_show_get_state(const char *id);
 
+void jabber_user_search(JabberStream *js, const char *directory);
 void jabber_user_search_begin(PurplePluginAction *);
 
 void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js);
Only in pidgin-2.2.0/libpurple/protocols/jabber: caps.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: caps.h
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/chat.c pidgin-2.2.0/libpurple/protocols/jabber/chat.c
--- pidgin-2.1.1/libpurple/protocols/jabber/chat.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/chat.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -261,7 +261,7 @@
 
 	purple_status_to_jabber(status, &state, &msg, &priority);
 
-	presence = jabber_presence_create(state, msg, priority);
+	presence = jabber_presence_create_js(js, state, msg, priority);
 	full_jid = g_strdup_printf("%s/%s", room_jid, handle);
 	xmlnode_set_attrib(presence, "to", full_jid);
 	g_free(full_jid);
@@ -634,7 +634,7 @@
 
 	purple_status_to_jabber(status, &state, &msg, &priority);
 
-	presence = jabber_presence_create(state, msg, priority);
+	presence = jabber_presence_create_js(chat->js, state, msg, priority);
 	full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, nick);
 	xmlnode_set_attrib(presence, "to", full_jid);
 	g_free(full_jid);
@@ -833,12 +833,18 @@
 
 gboolean jabber_chat_ban_user(JabberChat *chat, const char *who, const char *why)
 {
-	JabberIq *iq;
-	JabberChatMember *jcm = g_hash_table_lookup(chat->members, who);
+	JabberChatMember *jcm;
+	const char *jid;
 	char *to;
+	JabberIq *iq;
 	xmlnode *query, *item, *reason;
 
-	if(!jcm || !jcm->jid)
+	jcm = g_hash_table_lookup(chat->members, who);
+	if (jcm && jcm->jid)
+		jid = jcm->jid;
+	else if (g_utf8_strchr(who, -1, '@') != NULL)
+		jid = who;
+	else
 		return FALSE;
 
 	iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET,
@@ -850,7 +856,7 @@
 
 	query = xmlnode_get_child(iq->node, "query");
 	item = xmlnode_new_child(query, "item");
-	xmlnode_set_attrib(item, "jid", jcm->jid);
+	xmlnode_set_attrib(item, "jid", jid);
 	xmlnode_set_attrib(item, "affiliation", "outcast");
 	if(why) {
 		reason = xmlnode_new_child(item, "reason");
@@ -864,14 +870,18 @@
 
 gboolean jabber_chat_affiliate_user(JabberChat *chat, const char *who, const char *affiliation)
 {
+	JabberChatMember *jcm;
+	const char *jid;
 	char *to;
 	JabberIq *iq;
 	xmlnode *query, *item;
-	JabberChatMember *jcm;
 
 	jcm = g_hash_table_lookup(chat->members, who);
-
-	if (!jcm || !jcm->jid)
+	if (jcm && jcm->jid)
+		jid = jcm->jid;
+	else if (g_utf8_strchr(who, -1, '@') != NULL)
+		jid = who;
+	else
 		return FALSE;
 
 	iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET,
@@ -883,7 +893,7 @@
 
 	query = xmlnode_get_child(iq->node, "query");
 	item = xmlnode_new_child(query, "item");
-	xmlnode_set_attrib(item, "jid", jcm->jid);
+	xmlnode_set_attrib(item, "jid", jid);
 	xmlnode_set_attrib(item, "affiliation", affiliation);
 
 	jabber_iq_send(iq);
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/chat.h pidgin-2.2.0/libpurple/protocols/jabber/chat.h
--- pidgin-2.1.1/libpurple/protocols/jabber/chat.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/chat.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_CHAT_H_
 #define _PURPLE_JABBER_CHAT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/disco.c pidgin-2.2.0/libpurple/protocols/jabber/disco.c
--- pidgin-2.1.1/libpurple/protocols/jabber/disco.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/disco.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -30,15 +30,19 @@
 #include "jabber.h"
 #include "presence.h"
 #include "roster.h"
+#include "pep.h"
+#include "adhoccommands.h"
+
 
 struct _jabber_disco_info_cb_data {
 	gpointer data;
 	JabberDiscoInfoCallback *callback;
 };
 
-#define SUPPORT_FEATURE(x) \
+#define SUPPORT_FEATURE(x) { \
 	feature = xmlnode_new_child(query, "feature"); \
-	xmlnode_set_attrib(feature, "var", x);
+	xmlnode_set_attrib(feature, "var", x); \
+}
 
 
 void jabber_disco_info_parse(JabberStream *js, xmlnode *packet) {
@@ -72,7 +76,6 @@
 			xmlnode_set_attrib(query, "node", node);
 
 		if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) {
-
 			identity = xmlnode_new_child(query, "identity");
 			xmlnode_set_attrib(identity, "category", "client");
 			xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console,
@@ -98,18 +101,62 @@
 			SUPPORT_FEATURE("http://jabber.org/protocol/si/profile/file-transfer")
 			SUPPORT_FEATURE("http://jabber.org/protocol/xhtml-im")
 			SUPPORT_FEATURE("urn:xmpp:ping")
+			SUPPORT_FEATURE("http://www.xmpp.org/extensions/xep-0199.html#ns")
+			
+			if(!node) { /* non-caps disco#info, add all enabled extensions */
+				GList *features;
+				for(features = jabber_features; features; features = features->next) {
+					JabberFeature *feat = (JabberFeature*)features->data;
+					if(feat->is_enabled == NULL || feat->is_enabled(js, feat->shortname, feat->namespace) == TRUE)
+						SUPPORT_FEATURE(feat->namespace);
+				}
+			}
 		} else {
-			xmlnode *error, *inf;
-
-			/* XXX: gross hack, implement jabber_iq_set_type or something */
-			xmlnode_set_attrib(iq->node, "type", "error");
-			iq->type = JABBER_IQ_ERROR;
-
-			error = xmlnode_new_child(query, "error");
-			xmlnode_set_attrib(error, "code", "404");
-			xmlnode_set_attrib(error, "type", "cancel");
-			inf = xmlnode_new_child(error, "item-not-found");
-			xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
+			const char *ext = NULL;
+			unsigned pos;
+			unsigned nodelen = strlen(node);
+			unsigned capslen = strlen(CAPS0115_NODE);
+			/* do a basic plausability check */
+			if(nodelen > capslen+1) {
+				/* verify that the string is CAPS0115#<ext> and get the pointer to the ext part */
+				for(pos = 0; pos < capslen+1; ++pos) {
+					if(pos == capslen) {
+						if(node[pos] == '#')
+							ext = &node[pos+1];
+						else
+							break;
+					} else if(node[pos] != CAPS0115_NODE[pos])
+					break;
+				}
+				
+				if(ext != NULL) {
+					/* look for that ext */
+					GList *features;
+					for(features = jabber_features; features; features = features->next) {
+						JabberFeature *feat = (JabberFeature*)features->data;
+						if(!strcmp(feat->shortname, ext)) {
+							SUPPORT_FEATURE(feat->namespace);
+							break;
+						}
+					}
+					if(features == NULL)
+						ext = NULL;
+				}
+			}
+			
+			if(ext == NULL) {
+				xmlnode *error, *inf;
+				
+				/* XXX: gross hack, implement jabber_iq_set_type or something */
+				xmlnode_set_attrib(iq->node, "type", "error");
+				iq->type = JABBER_IQ_ERROR;
+				
+				error = xmlnode_new_child(query, "error");
+				xmlnode_set_attrib(error, "code", "404");
+				xmlnode_set_attrib(error, "type", "cancel");
+				inf = xmlnode_new_child(error, "item-not-found");
+				xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
+			}
 		}
 
 		jabber_iq_send(iq);
@@ -165,6 +212,11 @@
 					capabilities |= JABBER_CAP_IQ_SEARCH;
 				else if(!strcmp(var, "jabber:iq:register"))
 					capabilities |= JABBER_CAP_IQ_REGISTER;
+				else if(!strcmp(var, "http://www.xmpp.org/extensions/xep-0199.html#ns"))
+					capabilities |= JABBER_CAP_PING;
+				else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
+					capabilities |= JABBER_CAP_ADHOC;
+				}
 			}
 		}
 
@@ -208,6 +260,17 @@
 	if(type && !strcmp(type, "get")) {
 		JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
 				"http://jabber.org/protocol/disco#items");
+		
+		/* preserve node */
+		xmlnode *iq_query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#items");
+		if(iq_query) {
+			xmlnode *query = xmlnode_get_child_with_namespace(packet,"query","http://jabber.org/protocol/disco#items");
+			if(query) {
+				const char *node = xmlnode_get_attrib(query,"node");
+				if(node)
+					xmlnode_set_attrib(iq_query,"node",node);
+			}
+		}
 
 		jabber_iq_set_id(iq, xmlnode_get_attrib(packet, "id"));
 
@@ -227,7 +290,13 @@
 		jabber_roster_request(js);
 	}
 
-	/* when we get the roster back, we'll send our initial presence */
+	/* Send initial presence; this will trigger receipt of presence for contacts on the roster */
+	jabber_presence_send(js->gc->account, NULL);
+	
+	if (js->server_caps & JABBER_CAP_ADHOC) {
+		/* The server supports ad-hoc commands, so let's request the list */
+		jabber_adhoc_server_get_list(js);
+	}
 }
 
 static void
@@ -260,9 +329,11 @@
 	     child = xmlnode_get_next_twin(child)) {
 		const char *category, *type, *name;
 		category = xmlnode_get_attrib(child, "category");
+		type = xmlnode_get_attrib(child, "type");
+		if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep"))
+			js->pep = TRUE;
 		if (!category || strcmp(category, "server"))
 			continue;
-		type = xmlnode_get_attrib(child, "type");
 		if (!type || strcmp(type, "im"))
 			continue;
 
@@ -273,7 +344,7 @@
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
 		if (!strcmp(name, "Google Talk")) {
-		  purple_debug_info("jabber", "Google Talk!");
+		  purple_debug_info("jabber", "Google Talk!\n");
 		  js->googletalk = TRUE;
 		}
 	}
@@ -291,6 +362,8 @@
 		} else if (!strcmp("google:roster", var)) {
 			js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
 			jabber_google_roster_init(js);
+		} else if (!strcmp("http://jabber.org/protocol/commands", var)) {
+			js->server_caps |= JABBER_CAP_ADHOC;
 		}
 	}
 
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/disco.h pidgin-2.2.0/libpurple/protocols/jabber/disco.h
--- pidgin-2.1.1/libpurple/protocols/jabber/disco.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/disco.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_DISCO_H_
 #define _PURPLE_JABBER_DISCO_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/google.c pidgin-2.2.0/libpurple/protocols/jabber/google.c
--- pidgin-2.1.1/libpurple/protocols/jabber/google.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/google.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/google.h pidgin-2.2.0/libpurple/protocols/jabber/google.h
--- pidgin-2.1.1/libpurple/protocols/jabber/google.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/google.h	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_GOOGLE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/iq.c pidgin-2.2.0/libpurple/protocols/jabber/iq.c
--- pidgin-2.1.1/libpurple/protocols/jabber/iq.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/iq.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -31,6 +31,8 @@
 #include "oob.h"
 #include "roster.h"
 #include "si.h"
+#include "ping.h"
+#include "adhoccommands.h"
 
 #ifdef _WIN32
 #include "utsname.h"
@@ -343,6 +345,13 @@
 		jabber_gmail_poke(js, packet);
 		return;
 	}
+	
+	purple_debug_info("jabber", "jabber_iq_parse\n");
+
+	if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) {
+		jabber_ping_parse(js, packet);
+		return;
+	}
 
 	/* If we get here, send the default error reply mandated by XMPP-CORE */
 	if(type && (!strcmp(type, "set") || !strcmp(type, "get"))) {
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/iq.h pidgin-2.2.0/libpurple/protocols/jabber/iq.h
--- pidgin-2.1.1/libpurple/protocols/jabber/iq.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/iq.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_IQ_H_
 #define _PURPLE_JABBER_IQ_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/jabber.c pidgin-2.2.0/libpurple/protocols/jabber/jabber.c
--- pidgin-2.1.1/libpurple/protocols/jabber/jabber.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/jabber.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -51,12 +51,18 @@
 #include "presence.h"
 #include "jabber.h"
 #include "roster.h"
+#include "ping.h"
 #include "si.h"
 #include "xdata.h"
+#include "pep.h"
+#include "adhoccommands.h"
 
-#define JABBER_CONNECT_STEPS (js->gsc ? 8 : 5)
+#define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
 static PurplePlugin *my_protocol = NULL;
+GList *jabber_features;
+
+static void jabber_unregister_account_cb(JabberStream *js);
 
 static void jabber_stream_init(JabberStream *js)
 {
@@ -80,6 +86,8 @@
 	const char *type = xmlnode_get_attrib(packet, "type");
 	if(type && !strcmp(type, "result")) {
 		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+		if(js->unregistration)
+			jabber_unregister_account_cb(js);
 	} else {
 		purple_connection_error(js->gc, _("Error initializing session"));
 	}
@@ -132,6 +140,9 @@
 	if(xmlnode_get_child(packet, "starttls")) {
 		if(jabber_process_starttls(js, packet))
 			return;
+	} else if(purple_account_get_bool(js->gc->account, "require_tls", FALSE) && !js->gsc) {
+		purple_connection_error(js->gc, _("You require encryption, but it is not available on this server."));
+		return;
 	}
 
 	if(js->registration) {
@@ -169,49 +180,49 @@
 
 static void tls_init(JabberStream *js);
 
-void jabber_process_packet(JabberStream *js, xmlnode *packet)
+void jabber_process_packet(JabberStream *js, xmlnode **packet)
 {
 	const char *xmlns;
 
-	purple_signal_emit(my_protocol, "jabber-receiving-xmlnode", js->gc, &packet);
+	purple_signal_emit(my_protocol, "jabber-receiving-xmlnode", js->gc, packet);
 
 	/* if the signal leaves us with a null packet, we're done */
-	if(NULL == packet)
+	if(NULL == *packet)
 		return;
 
-	xmlns = xmlnode_get_namespace(packet);
+	xmlns = xmlnode_get_namespace(*packet);
 
-	if(!strcmp(packet->name, "iq")) {
-		jabber_iq_parse(js, packet);
-	} else if(!strcmp(packet->name, "presence")) {
-		jabber_presence_parse(js, packet);
-	} else if(!strcmp(packet->name, "message")) {
-		jabber_message_parse(js, packet);
-	} else if(!strcmp(packet->name, "stream:features")) {
-		jabber_stream_features_parse(js, packet);
-	} else if (!strcmp(packet->name, "features") &&
+	if(!strcmp((*packet)->name, "iq")) {
+		jabber_iq_parse(js, *packet);
+	} else if(!strcmp((*packet)->name, "presence")) {
+		jabber_presence_parse(js, *packet);
+	} else if(!strcmp((*packet)->name, "message")) {
+		jabber_message_parse(js, *packet);
+	} else if(!strcmp((*packet)->name, "stream:features")) {
+		jabber_stream_features_parse(js, *packet);
+	} else if (!strcmp((*packet)->name, "features") &&
 		   !strcmp(xmlns, "http://etherx.jabber.org/streams")) {
-		jabber_stream_features_parse(js, packet);
-	} else if(!strcmp(packet->name, "stream:error") ||
-			 (!strcmp(packet->name, "error") &&
+		jabber_stream_features_parse(js, *packet);
+	} else if(!strcmp((*packet)->name, "stream:error") ||
+			 (!strcmp((*packet)->name, "error") &&
 				!strcmp(xmlns, "http://etherx.jabber.org/streams")))
 	{
-		jabber_stream_handle_error(js, packet);
-	} else if(!strcmp(packet->name, "challenge")) {
+		jabber_stream_handle_error(js, *packet);
+	} else if(!strcmp((*packet)->name, "challenge")) {
 		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_challenge(js, packet);
-	} else if(!strcmp(packet->name, "success")) {
+			jabber_auth_handle_challenge(js, *packet);
+	} else if(!strcmp((*packet)->name, "success")) {
 		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_success(js, packet);
-	} else if(!strcmp(packet->name, "failure")) {
+			jabber_auth_handle_success(js, *packet);
+	} else if(!strcmp((*packet)->name, "failure")) {
 		if(js->state == JABBER_STREAM_AUTHENTICATING)
-			jabber_auth_handle_failure(js, packet);
-	} else if(!strcmp(packet->name, "proceed")) {
+			jabber_auth_handle_failure(js, *packet);
+	} else if(!strcmp((*packet)->name, "proceed")) {
 		if(js->state == JABBER_STREAM_AUTHENTICATING && !js->gsc)
 			tls_init(js);
 	} else {
 		purple_debug(PURPLE_DEBUG_WARNING, "jabber", "Unknown packet: %s\n",
-				packet->name);
+				(*packet)->name);
 	}
 }
 
@@ -445,7 +456,7 @@
 	if(!PURPLE_CONNECTION_IS_VALID(gc)) {
 		purple_ssl_close(gsc);
 		return;
-	}	
+	}
 
 	js = gc->proto_data;
 
@@ -453,6 +464,9 @@
 		jabber_send_raw(js, "<?xml version='1.0' ?>", -1);
 	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING);
 	purple_ssl_input_add(gsc, jabber_recv_cb_ssl, gc);
+	
+	/* Tell the app that we're doing encryption */
+	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION);
 }
 
 
@@ -494,29 +508,20 @@
 	js = gc->proto_data;
 	js->gsc = NULL;
 
-	switch(error) {
-		case PURPLE_SSL_CONNECT_FAILED:
-			purple_connection_error(gc, _("Connection Failed"));
-			break;
-		case PURPLE_SSL_HANDSHAKE_FAILED:
-			purple_connection_error(gc, _("SSL Handshake Failed"));
-			break;
-	}
+	purple_connection_error(gc, purple_ssl_strerror(error));
 }
 
 static void tls_init(JabberStream *js)
 {
 	purple_input_remove(js->gc->inpa);
 	js->gc->inpa = 0;
-	js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd,
-			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc);
+	js->gsc = purple_ssl_connect_with_host_fd(js->gc->account, js->fd,
+			jabber_login_callback_ssl, jabber_ssl_connect_failure, js->serverFQDN, js->gc);
 }
 
 static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port)
 {
-#ifdef HAVE_CYRUS_SASL
 	js->serverFQDN = g_strdup(fqdn);
-#endif
 
 	if (purple_proxy_connect(js->gc, js->gc->account, host,
 			port, jabber_login_callback, js->gc) == NULL)
@@ -563,6 +568,7 @@
 	js->user = jabber_id_new(purple_account_get_username(account));
 	js->next_id = g_random_int();
 	js->write_buffer = purple_circ_buffer_new(512);
+	js->old_length = -1;
 
 	if(!js->user) {
 		purple_connection_error(gc, _("Invalid XMPP ID"));
@@ -623,6 +629,8 @@
 	JabberStream *js = data;
 	PurpleAccount *account = purple_connection_get_account(js->gc);
 
+	jabber_parser_free(js);
+
 	purple_account_disconnect(account);
 
 	return FALSE;
@@ -637,12 +645,21 @@
 static void
 jabber_registration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
 {
+	PurpleAccount *account = purple_connection_get_account(js->gc);
 	const char *type = xmlnode_get_attrib(packet, "type");
 	char *buf;
+	char *to = data;
 
 	if(!strcmp(type, "result")) {
+		if(js->registration) {
 		buf = g_strdup_printf(_("Registration of %s@%s successful"),
 				js->user->node, js->user->domain);
+			if(account->registration_cb)
+				(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
+		}
+		else
+			buf = g_strdup_printf(_("Registration to %s successful"),
+				to);
 		purple_notify_info(NULL, _("Registration Successful"),
 				_("Registration Successful"), buf);
 		g_free(buf);
@@ -655,20 +672,56 @@
 		purple_notify_error(NULL, _("Registration Failed"),
 				_("Registration Failed"), msg);
 		g_free(msg);
+		if(account->registration_cb)
+			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 	}
+	g_free(to);
+	if(js->registration)
 	jabber_connection_schedule_close(js);
 }
 
 static void
-jabber_register_cb(JabberStream *js, PurpleRequestFields *fields)
+jabber_unregistration_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+{
+	const char *type = xmlnode_get_attrib(packet, "type");
+	char *buf;
+	char *to = data;
+	
+	if(!strcmp(type, "result")) {
+		buf = g_strdup_printf(_("Registration from %s successfully removed"),
+							  to);
+		purple_notify_info(NULL, _("Unregistration Successful"),
+						   _("Unregistration Successful"), buf);
+		g_free(buf);
+	} else {
+		char *msg = jabber_parse_error(js, packet);
+		
+		if(!msg)
+			msg = g_strdup(_("Unknown Error"));
+		
+		purple_notify_error(NULL, _("Unregistration Failed"),
+							_("Unregistration Failed"), msg);
+		g_free(msg);
+	}
+	g_free(to);
+}
+
+typedef struct _JabberRegisterCBData {
+	JabberStream *js;
+	char *who;
+} JabberRegisterCBData;
+
+static void
+jabber_register_cb(JabberRegisterCBData *cbdata, PurpleRequestFields *fields)
 {
 	GList *groups, *flds;
 	xmlnode *query, *y;
 	JabberIq *iq;
 	char *username;
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register");
+	iq = jabber_iq_new_query(cbdata->js, JABBER_IQ_SET, "jabber:iq:register");
 	query = xmlnode_get_child(iq->node, "query");
+	xmlnode_set_attrib(iq->node,"to",cbdata->who);
 
 	for(groups = purple_request_fields_get_groups(fields); groups;
 			groups = groups->next) {
@@ -676,6 +729,24 @@
 				flds; flds = flds->next) {
 			PurpleRequestField *field = flds->data;
 			const char *id = purple_request_field_get_id(field);
+			if(!strcmp(id,"unregister")) {
+				gboolean value = purple_request_field_bool_get_value(field);
+				if(value) {
+					/* unregister from service. this doesn't include any of the fields, so remove them from the stanza by recreating it
+					   (there's no "remove child" function for xmlnode) */
+					jabber_iq_free(iq);
+					iq = jabber_iq_new_query(cbdata->js, JABBER_IQ_SET, "jabber:iq:register");
+					query = xmlnode_get_child(iq->node, "query");
+					xmlnode_set_attrib(iq->node,"to",cbdata->who);
+					xmlnode_new_child(query, "remove");
+					
+					jabber_iq_set_callback(iq, jabber_unregistration_result_cb, cbdata->who);
+					
+					jabber_iq_send(iq);
+					g_free(cbdata);
+					return;
+				}
+			} else {
 			const char *value = purple_request_field_string_get_value(field);
 
 			if(!strcmp(id, "username")) {
@@ -710,73 +781,97 @@
 				continue;
 			}
 			xmlnode_insert_data(y, value, -1);
-			if(!strcmp(id, "username")) {
-				if(js->user->node)
-					g_free(js->user->node);
-				js->user->node = g_strdup(value);
+				if(cbdata->js->registration && !strcmp(id, "username")) {
+					if(cbdata->js->user->node)
+						g_free(cbdata->js->user->node);
+					cbdata->js->user->node = g_strdup(value);
 			}
+				if(cbdata->js->registration && !strcmp(id, "password"))
+					purple_account_set_password(cbdata->js->gc->account, value);
 		}
 	}
+	}
 
-	username = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain,
-			js->user->resource);
-	purple_account_set_username(js->gc->account, username);
+	if(cbdata->js->registration) {
+		username = g_strdup_printf("%s@%s/%s", cbdata->js->user->node, cbdata->js->user->domain,
+				cbdata->js->user->resource);
+		purple_account_set_username(cbdata->js->gc->account, username);
 	g_free(username);
+	}
 
-	jabber_iq_set_callback(iq, jabber_registration_result_cb, NULL);
+	jabber_iq_set_callback(iq, jabber_registration_result_cb, cbdata->who);
 
 	jabber_iq_send(iq);
-
+	g_free(cbdata);
 }
 
 static void
-jabber_register_cancel_cb(JabberStream *js, PurpleRequestFields *fields)
+jabber_register_cancel_cb(JabberRegisterCBData *cbdata, PurpleRequestFields *fields)
 {
-	jabber_connection_schedule_close(js);
+	PurpleAccount *account = purple_connection_get_account(cbdata->js->gc);
+	if(account && cbdata->js->registration) {
+		if(account->registration_cb)
+			(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
+		jabber_connection_schedule_close(cbdata->js);
+}
+	g_free(cbdata->who);
+	g_free(cbdata);
 }
 
 static void jabber_register_x_data_cb(JabberStream *js, xmlnode *result, gpointer data)
 {
 	xmlnode *query;
 	JabberIq *iq;
+	char *to = data;
 
 	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register");
 	query = xmlnode_get_child(iq->node, "query");
+	xmlnode_set_attrib(iq->node,"to",to);
 
 	xmlnode_insert_child(query, result);
 
-	jabber_iq_set_callback(iq, jabber_registration_result_cb, NULL);
+	jabber_iq_set_callback(iq, jabber_registration_result_cb, to);
 	jabber_iq_send(iq);
 }
 
 void jabber_register_parse(JabberStream *js, xmlnode *packet)
 {
+	PurpleAccount *account = purple_connection_get_account(js->gc);
 	const char *type;
-	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result"))
-		return;
-
-	if(js->registration) {
+	const char *from = xmlnode_get_attrib(packet, "from");
 		PurpleRequestFields *fields;
 		PurpleRequestFieldGroup *group;
 		PurpleRequestField *field;
 		xmlnode *query, *x, *y;
 		char *instructions;
+	JabberRegisterCBData *cbdata;
+	gboolean registered = FALSE;
 
+	if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result"))
+		return;
+
+	if(js->registration)
 		/* get rid of the login thingy */
 		purple_connection_set_state(js->gc, PURPLE_CONNECTED);
 
 		query = xmlnode_get_child(packet, "query");
 
 		if(xmlnode_get_child(query, "registered")) {
+		registered = TRUE;
+		
+		if(js->registration) {
 			purple_notify_error(NULL, _("Already Registered"),
 					_("Already Registered"), NULL);
+			if(account->registration_cb)
+				(account->registration_cb)(account, FALSE, account->registration_cb_user_data);
 			jabber_connection_schedule_close(js);
 			return;
 		}
+	}
 
 		if((x = xmlnode_get_child_with_namespace(packet, "x",
 						"jabber:x:data"))) {
-			jabber_x_data_request(js, x, jabber_register_x_data_cb, NULL);
+		jabber_x_data_request(js, x, jabber_register_x_data_cb, g_strdup(from));
 			return;
 		} else if((x = xmlnode_get_child_with_namespace(packet, "x",
 						"jabber:x:oob"))) {
@@ -787,8 +882,12 @@
 				if((href = xmlnode_get_data(url))) {
 					purple_notify_uri(NULL, href);
 					g_free(href);
+				if(js->registration) {
 					js->gc->wants_to_die = TRUE;
+					if(account->registration_cb) /* succeeded, but we have no login info */
+						(account->registration_cb)(account, TRUE, account->registration_cb_user_data);
 					jabber_connection_schedule_close(js);
+				}
 					return;
 				}
 			}
@@ -800,18 +899,32 @@
 		group = purple_request_field_group_new(NULL);
 		purple_request_fields_add_group(fields, group);
 
+	if(js->registration)
 		field = purple_request_field_string_new("username", _("Username"),
 				js->user->node, FALSE);
+	else
+		field = purple_request_field_string_new("username", _("Username"),
+				NULL, FALSE);
+
 		purple_request_field_group_add_field(group, field);
 
+	if(js->registration)
 		field = purple_request_field_string_new("password", _("Password"),
 				purple_connection_get_password(js->gc), FALSE);
+	else
+		field = purple_request_field_string_new("password", _("Password"),
+				NULL, FALSE);
+
 		purple_request_field_string_set_masked(field, TRUE);
 		purple_request_field_group_add_field(group, field);
 
 		if(xmlnode_get_child(query, "name")) {
+		if(js->registration)
 			field = purple_request_field_string_new("name", _("Name"),
 					purple_account_get_alias(js->gc->account), FALSE);
+		else
+			field = purple_request_field_string_new("name", _("Name"),
+					NULL, FALSE);
 			purple_request_field_group_add_field(group, field);
 		}
 		if(xmlnode_get_child(query, "email")) {
@@ -869,23 +982,45 @@
 					NULL, FALSE);
 			purple_request_field_group_add_field(group, field);
 		}
+	if(registered) {
+		field = purple_request_field_bool_new("unregister", _("Unregister"), FALSE);
+		purple_request_field_group_add_field(group, field);
+	}
 
 		if((y = xmlnode_get_child(query, "instructions")))
 			instructions = xmlnode_get_data(y);
+	else if(registered)
+		instructions = g_strdup(_("Please fill out the information below "
+					"to change your account registration."));
 		else
 			instructions = g_strdup(_("Please fill out the information below "
 						"to register your new account."));
 
+	cbdata = g_new0(JabberRegisterCBData, 1);
+	cbdata->js = js;
+	cbdata->who = g_strdup(from);
+
+	if(js->registration)
 		purple_request_fields(js->gc, _("Register New XMPP Account"),
 				_("Register New XMPP Account"), instructions, fields,
 				_("Register"), G_CALLBACK(jabber_register_cb),
 				_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
-				js);
+				cbdata);
+	else {
+		char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
+								:g_strdup_printf(_("Register New Account at %s"), from);
+		purple_request_fields(js->gc, title,
+			  title, instructions, fields,
+			  registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
+			  _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
+			  purple_connection_get_account(js->gc), NULL, NULL,
+			  cbdata);
+		g_free(title);
+	}
 
 		g_free(instructions);
 	}
-}
 
 void jabber_register_start(JabberStream *js)
 {
@@ -895,6 +1030,14 @@
 	jabber_iq_send(iq);
 }
 
+void jabber_register_gateway(JabberStream *js, const char *gateway) {
+	JabberIq *iq;
+	
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:register");
+	xmlnode_set_attrib(iq->node, "to", gateway);
+	jabber_iq_send(iq);
+}
+
 void jabber_register_account(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
@@ -913,6 +1056,7 @@
 			g_free, g_free);
 	js->user = jabber_id_new(purple_account_get_username(account));
 	js->next_id = g_random_int();
+	js->old_length = -1;
 
 	if(!js->user) {
 		purple_connection_error(gc, _("Invalid XMPP ID"));
@@ -966,6 +1110,70 @@
 	}
 }
 
+static void jabber_unregister_account_iq_cb(JabberStream *js, xmlnode *packet, gpointer data) {
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	const char *type = xmlnode_get_attrib(packet,"type");
+	if(!strcmp(type,"error")) {
+		char *msg = jabber_parse_error(js, packet);
+		
+		purple_notify_error(js->gc, _("Error unregistering account"),
+							_("Error unregistering account"), msg);
+		g_free(msg);
+		if(js->unregistration_cb)
+			js->unregistration_cb(account, FALSE, js->unregistration_user_data);
+	} else if(!strcmp(type,"result")) {
+		purple_notify_info(js->gc, _("Account successfully unregistered"),
+						   _("Account successfully unregistered"), NULL);
+		if(js->unregistration_cb)
+			js->unregistration_cb(account, TRUE, js->unregistration_user_data);
+	}
+}
+
+static void jabber_unregister_account_cb(JabberStream *js) {
+	JabberIq *iq;
+	xmlnode *query;
+
+	g_return_if_fail(js->unregistration);
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register");
+
+	query = xmlnode_get_child_with_namespace(iq->node, "query", "jabber:iq:register");
+
+	xmlnode_new_child(query, "remove");
+	xmlnode_set_attrib(iq->node, "to", js->user->domain);
+
+	jabber_iq_set_callback(iq, jabber_unregister_account_iq_cb, NULL);
+	jabber_iq_send(iq);
+}
+
+void jabber_unregister_account(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data) {
+	PurpleConnection *gc = purple_account_get_connection(account);
+	JabberStream *js;
+	
+	if(gc->state != PURPLE_CONNECTED) {
+		if(gc->state != PURPLE_CONNECTING)
+			jabber_login(account);
+		js = gc->proto_data;
+		js->unregistration = TRUE;
+		js->unregistration_cb = cb;
+		js->unregistration_user_data = user_data;
+		return;
+	}
+	
+	js = gc->proto_data;
+
+	if (js->unregistration) {
+		purple_debug_error("jabber", "Unregistration in process; ignoring duplicate request.\n");
+		return;
+	}
+
+	js->unregistration = TRUE;
+	js->unregistration_cb = cb;
+	js->unregistration_user_data = user_data;
+
+	jabber_unregister_account_cb(js);
+}
+
 void jabber_close(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
@@ -993,6 +1201,8 @@
 
 	jabber_buddy_remove_all_pending_buddy_info_requests(js);
 
+	jabber_parser_free(js);
+
 	if(js->iq_callbacks)
 		g_hash_table_destroy(js->iq_callbacks);
 	if(js->disco_callbacks)
@@ -1025,12 +1235,35 @@
 		g_string_free(js->sasl_mechs, TRUE);
 	if(js->sasl_cb)
 		g_free(js->sasl_cb);
+#endif
 	if(js->serverFQDN)
 		g_free(js->serverFQDN);
-#endif
+	while(js->commands) {
+		JabberAdHocCommands *cmd = js->commands->data;
+		g_free(cmd->jid);
+		g_free(cmd->node);
+		g_free(cmd->name);
+		g_free(cmd);
+		js->commands = g_list_delete_link(js->commands, js->commands);
+	}
 	g_free(js->server_name);
 	g_free(js->gmail_last_time);
 	g_free(js->gmail_last_tid);
+	if(js->old_msg)
+		g_free(js->old_msg);
+	if(js->old_avatarhash)
+		g_free(js->old_avatarhash);
+	if(js->old_artist)
+		g_free(js->old_artist);
+	if(js->old_title)
+		g_free(js->old_title);
+	if(js->old_source)
+		g_free(js->old_source);
+	if(js->old_uri)
+		g_free(js->old_uri);
+	if(js->old_track)
+		g_free(js->old_track);
+	
 	g_free(js);
 
 	gc->proto_data = NULL;
@@ -1051,9 +1284,13 @@
 					js->gsc ? 5 : 2, JABBER_CONNECT_STEPS);
 			jabber_stream_init(js);
 			break;
+		case JABBER_STREAM_INITIALIZING_ENCRYPTION:
+			purple_connection_update_progress(js->gc, _("Initializing SSL/TLS"),
+											  6, JABBER_CONNECT_STEPS);
+			break;
 		case JABBER_STREAM_AUTHENTICATING:
 			purple_connection_update_progress(js->gc, _("Authenticating"),
-					js->gsc ? 6 : 3, JABBER_CONNECT_STEPS);
+					js->gsc ? 7 : 3, JABBER_CONNECT_STEPS);
 			if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) {
 				jabber_register_start(js);
 			} else if(js->auth_type == JABBER_AUTH_IQ_AUTH) {
@@ -1062,7 +1299,7 @@
 			break;
 		case JABBER_STREAM_REINITIALIZING:
 			purple_connection_update_progress(js->gc, _("Re-initializing Stream"),
-					(js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
+					(js->gsc ? 8 : 4), JABBER_CONNECT_STEPS);
 
 			/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
 			js->reinit = TRUE;
@@ -1089,6 +1326,38 @@
 	js->idle = idle ? time(NULL) - idle : idle;
 }
 
+void jabber_add_feature(const char *shortname, const char *namespace, JabberFeatureEnabled cb) {
+	JabberFeature *feat;
+
+	g_return_if_fail(shortname != NULL);
+	g_return_if_fail(namespace != NULL);
+
+	feat = g_new0(JabberFeature,1);
+	feat->shortname = g_strdup(shortname);
+	feat->namespace = g_strdup(namespace);
+	feat->is_enabled = cb;
+	
+	/* try to remove just in case it already exists in the list */
+	jabber_remove_feature(shortname);
+	
+	jabber_features = g_list_append(jabber_features, feat);
+}
+
+void jabber_remove_feature(const char *shortname) {
+	GList *feature;
+	for(feature = jabber_features; feature; feature = feature->next) {
+		JabberFeature *feat = (JabberFeature*)feature->data;
+		if(!strcmp(feat->shortname, shortname)) {
+			g_free(feat->shortname);
+			g_free(feat->namespace);
+			
+			g_free(feature->data);
+			feature = g_list_delete_link(feature, feature);
+			break;
+		}
+	}
+}
+
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b)
 {
 	return "jabber";
@@ -1161,8 +1430,12 @@
 		JabberBuddyResource *jbr = NULL;
 		const char *sub;
 		GList *l;
+		const char *mood;
 
 		if (full) {
+			PurpleStatus *status;
+			PurpleValue *value;
+			
 			if(jb->subscription & JABBER_SUB_FROM) {
 				if(jb->subscription & JABBER_SUB_TO)
 					sub = _("Both");
@@ -1180,6 +1453,20 @@
 			}
 			
 			purple_notify_user_info_add_pair(user_info, _("Subscription"), sub);
+			
+			status = purple_presence_get_active_status(purple_buddy_get_presence(b));
+			value = purple_status_get_attr_value(status, "mood");
+			if (value && purple_value_get_type(value) == PURPLE_TYPE_STRING && (mood = purple_value_get_string(value))) {
+				
+				value = purple_status_get_attr_value(status, "moodtext");
+				if(value && purple_value_get_type(value) == PURPLE_TYPE_STRING) {
+					char *moodplustext = g_strdup_printf("%s (%s)",mood,purple_value_get_string(value));
+					
+					purple_notify_user_info_add_pair(user_info, _("Mood"), moodplustext);
+					g_free(moodplustext);
+				} else
+					purple_notify_user_info_add_pair(user_info, _("Mood"), mood);
+		}
 		}
 
 		for(l=jb->resources; l; l = l->next) {
@@ -1242,6 +1529,19 @@
 			NULL, TRUE, TRUE, FALSE,
 			"priority", _("Priority"), priority_value,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
+			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
+			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
 	types = g_list_append(types, type);
 
@@ -1252,6 +1552,19 @@
 			_("Chatty"), TRUE, TRUE, FALSE,
 			"priority", _("Priority"), priority_value,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
+			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
+			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
 	types = g_list_append(types, type);
 
@@ -1262,6 +1575,19 @@
 			NULL, TRUE, TRUE, FALSE,
 			"priority", _("Priority"), priority_value,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
+			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
+			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
 	types = g_list_append(types, type);
 
@@ -1272,6 +1598,19 @@
 			NULL, TRUE, TRUE, FALSE,
 			"priority", _("Priority"), priority_value,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
+			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
+			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
 	types = g_list_append(types, type);
 
@@ -1282,6 +1621,19 @@
 			_("Do Not Disturb"), TRUE, TRUE, FALSE,
 			"priority", _("Priority"), priority_value,
 			"message", _("Message"), purple_value_new(PURPLE_TYPE_STRING),
+			"mood", _("Mood"), purple_value_new(PURPLE_TYPE_STRING),
+			"moodtext", _("Mood Text"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_artist", _("Tune Artist"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_title", _("Tune Title"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_album", _("Tune Album"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_genre", _("Tune Genre"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_comment", _("Tune Comment"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_track", _("Tune Track"), purple_value_new(PURPLE_TYPE_STRING),
+			"tune_time", _("Tune Time"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_year", _("Tune Year"), purple_value_new(PURPLE_TYPE_INT),
+			"tune_url", _("Tune URL"), purple_value_new(PURPLE_TYPE_STRING),
+			"nick", _("Nickname"), purple_value_new(PURPLE_TYPE_STRING),
+			"buzz", _("Allow Buzz"), purple_value_new(PURPLE_TYPE_BOOLEAN),
 			NULL);
 	types = g_list_append(types, type);
 
@@ -1382,12 +1734,14 @@
 			_("Change XMPP Password"), _("Please enter your new password"),
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
-			purple_connection_get_account(gc), NULL, NULL,			  
+			purple_connection_get_account(gc), NULL, NULL,
 			js);
 }
 
 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
 {
+	PurpleConnection *gc = (PurpleConnection *) context;
+	JabberStream *js = gc->proto_data;
 	GList *m = NULL;
 	PurplePluginAction *act;
 
@@ -1405,6 +1759,14 @@
 	                             jabber_user_search_begin);
 	m = g_list_append(m, act);
 
+	purple_debug_info("jabber", "jabber_actions: have pep: %s\n", js->pep?"YES":"NO");
+
+	if(js->pep)
+		jabber_pep_init_actions(&m);
+	
+	if(js->commands)
+		jabber_adhoc_init_server_commands(js, &m);
+
 	return m;
 }
 
@@ -1540,6 +1902,9 @@
 			text = _("Authorization mechanism too weak");
 		} else if(xmlnode_get_child(packet, "not-authorized")) {
 			js->gc->wants_to_die = TRUE;
+			/* Clear the pasword if it isn't being saved */
+			if (!purple_account_get_remember_password(js->gc->account))
+				purple_account_set_password(js->gc->account, NULL);
 			text = _("Not Authorized");
 		} else if(xmlnode_get_child(packet, "temporary-auth-failure")) {
 			text = _("Temporary Authentication Failure");
@@ -1809,6 +2174,71 @@
 	return PURPLE_CMD_RET_OK;
 }
 
+static PurpleCmdRet jabber_cmd_ping(PurpleConversation *conv,
+		const char *cmd, char **args, char **error, void *data)
+{
+	if(!args || !args[0])
+		return PURPLE_CMD_RET_FAILED;
+
+	if(!jabber_ping_jid(conv, args[0])) {
+		*error = g_strdup_printf(_("Unable to ping user %s"), args[0]);
+		return PURPLE_CMD_RET_FAILED;
+	}
+
+	return PURPLE_CMD_RET_OK;
+}
+
+static PurpleCmdRet jabber_cmd_buzz(PurpleConversation *conv,
+		const char *cmd, char **args, char **error, void *data)
+{
+	JabberStream *js = conv->account->gc->proto_data;
+	xmlnode *msg, *buzz;
+	JabberBuddy *jb;
+	JabberBuddyResource *jbr;
+	char *to;
+	GList *iter;
+
+	if(!args || !args[0])
+		return PURPLE_CMD_RET_FAILED;
+	
+	jb = jabber_buddy_find(js, args[0], FALSE);
+	if(!jb) {
+		*error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), args[0]);
+		return PURPLE_CMD_RET_FAILED;
+	}
+	
+	jbr = jabber_buddy_find_resource(jb, NULL);
+	if(!jbr) {
+		*error = g_strdup_printf(_("Unable to buzz, because user %s might be offline."), args[0]);
+		return PURPLE_CMD_RET_FAILED;
+	}
+	if(!jbr->caps) {
+		*error = g_strdup_printf(_("Unable to buzz, because there is nothing known about user %s."), args[0]);
+		return PURPLE_CMD_RET_FAILED;
+	}
+	for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) {
+		if(!strcmp(iter->data, "http://www.xmpp.org/extensions/xep-0224.html#ns")) {
+			msg = xmlnode_new("message");
+			to = g_strdup_printf("%s/%s", args[0], jbr->name);
+			xmlnode_set_attrib(msg,"to",to);
+			g_free(to);
+			
+			/* avoid offline storage */
+			xmlnode_set_attrib(msg,"type","headline");
+			
+			buzz = xmlnode_new_child(msg,"attention");
+			xmlnode_set_namespace(buzz,"http://www.xmpp.org/extensions/xep-0224.html#ns");
+			
+			jabber_send(js,msg);
+			xmlnode_free(msg);
+			
+			return PURPLE_CMD_RET_OK;
+		}
+	}
+	*error = g_strdup_printf(_("Unable to buzz, because the user %s does not support it."), args[0]);
+	return PURPLE_CMD_RET_FAILED;
+}
+
 gboolean jabber_offline_message(const PurpleBuddy *buddy)
 {
 	return TRUE;
@@ -1886,6 +2316,16 @@
 	                  "prpl-jabber", jabber_cmd_chat_msg,
 	                  _("msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."),
 	                  NULL);
+	purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL,
+					  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM |
+					  PURPLE_CMD_FLAG_PRPL_ONLY,
+					  "prpl-jabber", jabber_cmd_ping,
+					  _("ping &lt;jid&gt;:	Ping a user/component/server."),
+					  NULL);
+	purple_cmd_register("buzz", "s", PURPLE_CMD_P_PRPL,
+					  PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY,
+					  "prpl-jabber", jabber_cmd_buzz,
+					  _("buzz: Buzz a user to get their attention"), NULL);
 }
 
 void
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/jabber.h pidgin-2.2.0/libpurple/protocols/jabber/jabber.h
--- pidgin-2.1.1/libpurple/protocols/jabber/jabber.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/jabber.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,28 +17,11 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_H_
 #define _PURPLE_JABBER_H_
 
-#include <libxml/parser.h>
-#include <glib.h>
-#include "circbuffer.h"
-#include "connection.h"
-#include "dnssrv.h"
-#include "roomlist.h"
-#include "sslconn.h"
-
-#include "jutil.h"
-#include "xmlnode.h"
-
-#ifdef HAVE_CYRUS_SASL
-#include <sasl/sasl.h>
-#endif
-
-#define CAPS0115_NODE "http://pidgin.im/caps"
-
 typedef enum {
 	JABBER_CAP_NONE           = 0,
 	JABBER_CAP_XHTML          = 1 << 0,
@@ -51,25 +34,49 @@
 	JABBER_CAP_IQ_SEARCH      = 1 << 7,
 	JABBER_CAP_IQ_REGISTER    = 1 << 8,
 
-	/* Google Talk extensions: 
+	/* Google Talk extensions:
 	 * http://code.google.com/apis/talk/jep_extensions/extensions.html
 	 */
 	JABBER_CAP_GMAIL_NOTIFY   = 1 << 9,
 	JABBER_CAP_GOOGLE_ROSTER  = 1 << 10,
 
+	JABBER_CAP_PING			  = 1 << 11,
+	JABBER_CAP_ADHOC		  = 1 << 12,
+	
 	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
 
+typedef struct _JabberStream JabberStream;
+
+#include <libxml/parser.h>
+#include <glib.h>
+#include "circbuffer.h"
+#include "connection.h"
+#include "dnssrv.h"
+#include "roomlist.h"
+#include "sslconn.h"
+
+#include "jutil.h"
+#include "xmlnode.h"
+#include "buddy.h"
+
+#ifdef HAVE_CYRUS_SASL
+#include <sasl/sasl.h>
+#endif
+
+#define CAPS0115_NODE "http://pidgin.im/caps"
+
 typedef enum {
 	JABBER_STREAM_OFFLINE,
 	JABBER_STREAM_CONNECTING,
 	JABBER_STREAM_INITIALIZING,
+	JABBER_STREAM_INITIALIZING_ENCRYPTION,
 	JABBER_STREAM_AUTHENTICATING,
 	JABBER_STREAM_REINITIALIZING,
 	JABBER_STREAM_CONNECTED
 } JabberStreamState;
 
-typedef struct _JabberStream
+struct _JabberStream
 {
 	int fd;
 
@@ -136,6 +143,8 @@
 	char *gmail_last_time;
 	char *gmail_last_tid;
 
+    char *serverFQDN;
+
 	/* OK, this stays at the end of the struct, so plugins can depend
 	 * on the rest of the stuff being in the right place
 	 */
@@ -150,13 +159,50 @@
 	int sasl_state;
 	int sasl_maxbuf;
 	GString *sasl_mechs;
-	char *serverFQDN;
 
+	gboolean unregistration;
+	PurpleAccountUnregistrationCb unregistration_cb;
+	void *unregistration_user_data;
+	
 	gboolean vcard_fetched;
 
-} JabberStream;
+	/* does the local server support PEP? */
+	gboolean pep;
+
+	/* Is Buzz enabled? */
+	gboolean allowBuzz;
+	
+	/* A list of JabberAdHocCommands supported by the server */
+	GList *commands;
+	
+	/* last presence update to check for differences */
+	JabberBuddyState old_state;
+	char *old_msg;
+	int old_priority;
+	char *old_avatarhash;
+	
+	/* same for user tune */
+	char *old_artist;
+	char *old_title;
+	char *old_source;
+	char *old_uri;
+	int old_length;
+	char *old_track;
+};
 
-void jabber_process_packet(JabberStream *js, xmlnode *packet);
+typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *shortname, const gchar *namespace);
+
+typedef struct _JabberFeature
+{
+	gchar *shortname;
+	gchar *namespace;
+	JabberFeatureEnabled *is_enabled;
+} JabberFeature;
+
+/* what kind of additional features as returned from disco#info are supported? */
+extern GList *jabber_features;
+
+void jabber_process_packet(JabberStream *js, xmlnode **packet);
 void jabber_send(JabberStream *js, xmlnode *data);
 void jabber_send_raw(JabberStream *js, const char *data, int len);
 
@@ -169,6 +215,9 @@
 
 char *jabber_parse_error(JabberStream *js, xmlnode *packet);
 
+void jabber_add_feature(const gchar *shortname, const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
+void jabber_remove_feature(const gchar *shortname);
+
 /** PRPL functions */
 const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b);
 const char* jabber_list_emblem(PurpleBuddy *b);
@@ -179,7 +228,9 @@
 void jabber_close(PurpleConnection *gc);
 void jabber_idle_set(PurpleConnection *gc, int idle);
 void jabber_keepalive(PurpleConnection *gc);
+void jabber_register_gateway(JabberStream *js, const char *gateway);
 void jabber_register_account(PurpleAccount *account);
+void jabber_unregister_account(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data);
 void jabber_convo_closed(PurpleConnection *gc, const char *who);
 PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name);
 gboolean jabber_offline_message(const PurpleBuddy *buddy);
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/jutil.c pidgin-2.2.0/libpurple/protocols/jabber/jutil.c
--- pidgin-2.1.1/libpurple/protocols/jabber/jutil.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/jutil.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/jutil.h pidgin-2.2.0/libpurple/protocols/jabber/jutil.h
--- pidgin-2.1.1/libpurple/protocols/jabber/jutil.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/jutil.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,11 +17,13 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_JUTIL_H_
 #define _PURPLE_JABBER_JUTIL_H_
 
+#include "account.h"
+
 typedef struct _JabberID {
 	char *node;
 	char *domain;
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/libxmpp.c pidgin-2.2.0/libpurple/protocols/jabber/libxmpp.c
--- pidgin-2.1.1/libpurple/protocols/jabber/libxmpp.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/libxmpp.c	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -28,6 +28,7 @@
 #include "internal.h"
 
 #include "accountopt.h"
+#include "debug.h"
 #include "version.h"
 
 #include "iq.h"
@@ -39,20 +40,20 @@
 #include "message.h"
 #include "presence.h"
 #include "google.h"
+#include "pep.h"
+#include "usertune.h"
+#include "caps.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {
-#ifdef HAVE_CYRUS_SASL
-	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
-	OPT_PROTO_MAIL_CHECK | OPT_PROTO_PASSWORD_OPTIONAL |
-	OPT_PROTO_SLASH_COMMANDS_NATIVE,
-#else
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
-	OPT_PROTO_SLASH_COMMANDS_NATIVE,
+#ifdef HAVE_CYRUS_SASL
+	OPT_PROTO_PASSWORD_OPTIONAL |
 #endif
+	OPT_PROTO_SLASH_COMMANDS_NATIVE,
 	NULL,							/* user_splits */
 	NULL,							/* protocol_options */
-	{"png,gif,jpeg", 32, 32, 96, 96, 8191, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
+	{"png", 32, 32, 96, 96, 8191, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */
 	jabber_list_icon,				/* list_icon */
 	jabber_list_emblem,			/* list_emblems */
 	jabber_status_text,				/* status_text */
@@ -111,11 +112,11 @@
 	NULL,							/* whiteboard_prpl_ops */
 	jabber_prpl_send_raw,			/* send_raw */
 	jabber_roomlist_room_serialize, /* roomlist_room_serialize */
+	jabber_unregister_account,		/* unregister_user */
 
 	/* padding */
 	NULL,
 	NULL,
-	NULL,
 	NULL
 };
 
@@ -191,49 +192,68 @@
 static void
 init_plugin(PurplePlugin *plugin)
 {
-        PurpleAccountUserSplit *split;
-        PurpleAccountOption *option;
-
+#ifdef HAVE_CYRUS_SASL
+	int ret;
+#endif
+	PurpleAccountUserSplit *split;
+	PurpleAccountOption *option;
+	
 	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
-        split = purple_account_user_split_new(_("Domain"), NULL, '@');
-		purple_account_user_split_set_reverse(split, FALSE);
-        prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
-
-        split = purple_account_user_split_new(_("Resource"), "Home", '/');
-		purple_account_user_split_set_reverse(split, FALSE);
-        prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
-
-        option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
-        prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-                        option);
-
-        option = purple_account_option_bool_new(
-                        _("Allow plaintext auth over unencrypted streams"),
-                        "auth_plain_in_clear", FALSE);
-        prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-                        option);
-
-        option = purple_account_option_int_new(_("Connect port"), "port", 5222);
-        prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-                        option);
-
-        option = purple_account_option_string_new(_("Connect server"),
-                        "connect_server", NULL);
-        prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-                        option);
-
-
-        jabber_init_plugin(plugin);
-
-        purple_prefs_remove("/plugins/prpl/jabber");
-
-        /* XXX - If any other plugin wants SASL this won't be good ... */
+	split = purple_account_user_split_new(_("Domain"), NULL, '@');
+	purple_account_user_split_set_reverse(split, FALSE);
+	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
+	
+	split = purple_account_user_split_new(_("Resource"), "Home", '/');
+	purple_account_user_split_set_reverse(split, FALSE);
+	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
+	
+	option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+	
+	option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+	
+	option = purple_account_option_bool_new(
+											_("Allow plaintext auth over unencrypted streams"),
+											"auth_plain_in_clear", FALSE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+	
+	option = purple_account_option_int_new(_("Connect port"), "port", 5222);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+	
+	option = purple_account_option_string_new(_("Connect server"),
+											  "connect_server", NULL);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+	
+	
+	jabber_init_plugin(plugin);
+	
+	purple_prefs_remove("/plugins/prpl/jabber");
+	
+	/* XXX - If any other plugin wants SASL this won't be good ... */
 #ifdef HAVE_CYRUS_SASL
-        sasl_client_init(NULL);
+	if ((ret = sasl_client_init(NULL)) != SASL_OK) {
+		purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret);
+	}
 #endif
-        jabber_register_commands();
+	jabber_register_commands();
+	
+	jabber_iq_init();
+	jabber_pep_init();
+	
+	jabber_tune_init();
+	jabber_caps_init();
 
-        jabber_iq_init();
+	jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
+	jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled);
+	
+	jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
 }
 
 
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/Makefile.am pidgin-2.2.0/libpurple/protocols/jabber/Makefile.am
--- pidgin-2.1.1/libpurple/protocols/jabber/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/Makefile.am	2007-09-06 00:09:40.000000000 -0400
@@ -27,6 +27,8 @@
 			  oob.h \
 			  parser.c \
 			  parser.h \
+			  ping.c \
+			  ping.h \
 			  presence.c \
 			  presence.h \
 			  roster.c \
@@ -34,7 +36,19 @@
 			  si.c \
 			  si.h \
 			  xdata.c \
-			  xdata.h
+			  xdata.h \
+			  caps.c \
+			  caps.h \
+			  adhoccommands.c \
+			  adhoccommands.h \
+			  pep.c \
+			  pep.h \
+			  usermood.c \
+			  usermood.h \
+			  usernick.c \
+			  usernick.h \
+			  usertune.c \
+			  usertune.h
 
 AM_CFLAGS = $(st)
 
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/Makefile.in pidgin-2.2.0/libpurple/protocols/jabber/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/jabber/Makefile.in	2007-08-20 14:13:56.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/Makefile.in	2007-09-14 03:31:23.000000000 -0400
@@ -55,16 +55,22 @@
 am__libjabber_a_SOURCES_DIST = auth.c auth.h buddy.c buddy.h chat.c \
 	chat.h disco.c disco.h google.c google.h iq.c iq.h jabber.c \
 	jabber.h jutil.c jutil.h message.c message.h oob.c oob.h \
-	parser.c parser.h presence.c presence.h roster.c roster.h si.c \
-	si.h xdata.c xdata.h libxmpp.c
+	parser.c parser.h ping.c ping.h presence.c presence.h roster.c \
+	roster.h si.c si.h xdata.c xdata.h caps.c caps.h \
+	adhoccommands.c adhoccommands.h pep.c pep.h usermood.c \
+	usermood.h usernick.c usernick.h usertune.c usertune.h \
+	libxmpp.c
 am__objects_1 = libjabber_a-auth.$(OBJEXT) libjabber_a-buddy.$(OBJEXT) \
 	libjabber_a-chat.$(OBJEXT) libjabber_a-disco.$(OBJEXT) \
 	libjabber_a-google.$(OBJEXT) libjabber_a-iq.$(OBJEXT) \
 	libjabber_a-jabber.$(OBJEXT) libjabber_a-jutil.$(OBJEXT) \
 	libjabber_a-message.$(OBJEXT) libjabber_a-oob.$(OBJEXT) \
-	libjabber_a-parser.$(OBJEXT) libjabber_a-presence.$(OBJEXT) \
-	libjabber_a-roster.$(OBJEXT) libjabber_a-si.$(OBJEXT) \
-	libjabber_a-xdata.$(OBJEXT)
+	libjabber_a-parser.$(OBJEXT) libjabber_a-ping.$(OBJEXT) \
+	libjabber_a-presence.$(OBJEXT) libjabber_a-roster.$(OBJEXT) \
+	libjabber_a-si.$(OBJEXT) libjabber_a-xdata.$(OBJEXT) \
+	libjabber_a-caps.$(OBJEXT) libjabber_a-adhoccommands.$(OBJEXT) \
+	libjabber_a-pep.$(OBJEXT) libjabber_a-usermood.$(OBJEXT) \
+	libjabber_a-usernick.$(OBJEXT) libjabber_a-usertune.$(OBJEXT)
 @STATIC_JABBER_TRUE@am_libjabber_a_OBJECTS = $(am__objects_1) \
 @STATIC_JABBER_TRUE@	libjabber_a-libxmpp.$(OBJEXT)
 libjabber_a_OBJECTS = $(am_libjabber_a_OBJECTS)
@@ -85,11 +91,14 @@
 am__libjabber_la_SOURCES_DIST = auth.c auth.h buddy.c buddy.h chat.c \
 	chat.h disco.c disco.h google.c google.h iq.c iq.h jabber.c \
 	jabber.h jutil.c jutil.h message.c message.h oob.c oob.h \
-	parser.c parser.h presence.c presence.h roster.c roster.h si.c \
-	si.h xdata.c xdata.h
+	parser.c parser.h ping.c ping.h presence.c presence.h roster.c \
+	roster.h si.c si.h xdata.c xdata.h caps.c caps.h \
+	adhoccommands.c adhoccommands.h pep.c pep.h usermood.c \
+	usermood.h usernick.c usernick.h usertune.c usertune.h
 am__objects_2 = auth.lo buddy.lo chat.lo disco.lo google.lo iq.lo \
-	jabber.lo jutil.lo message.lo oob.lo parser.lo presence.lo \
-	roster.lo si.lo xdata.lo
+	jabber.lo jutil.lo message.lo oob.lo parser.lo ping.lo \
+	presence.lo roster.lo si.lo xdata.lo caps.lo adhoccommands.lo \
+	pep.lo usermood.lo usernick.lo usertune.lo
 @STATIC_JABBER_FALSE@am_libjabber_la_OBJECTS = $(am__objects_2)
 libjabber_la_OBJECTS = $(am_libjabber_la_OBJECTS)
 @STATIC_JABBER_FALSE@am_libjabber_la_rpath = -rpath $(pkgdir)
@@ -167,6 +176,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -195,6 +206,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -250,14 +263,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -269,7 +280,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -330,6 +340,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -350,6 +361,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -490,6 +503,8 @@
 			  oob.h \
 			  parser.c \
 			  parser.h \
+			  ping.c \
+			  ping.h \
 			  presence.c \
 			  presence.h \
 			  roster.c \
@@ -497,7 +512,19 @@
 			  si.c \
 			  si.h \
 			  xdata.c \
-			  xdata.h
+			  xdata.h \
+			  caps.c \
+			  caps.h \
+			  adhoccommands.c \
+			  adhoccommands.h \
+			  pep.c \
+			  pep.h \
+			  usermood.c \
+			  usermood.h \
+			  usernick.c \
+			  usernick.h \
+			  usertune.c \
+			  usertune.h
 
 AM_CFLAGS = $(st)
 libxmpp_la_LDFLAGS = -module -avoid-version
@@ -598,16 +625,20 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adhoccommands.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buddy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caps.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disco.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/google.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iq.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jabber.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jutil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-adhoccommands.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-buddy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-caps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-chat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-disco.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-google.Po@am__quote@
@@ -618,17 +649,27 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-message.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-oob.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-pep.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-ping.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-presence.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-roster.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-si.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-usermood.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-usernick.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-usertune.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_a-xdata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmpp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oob.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ping.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/presence.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roster.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/si.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usermood.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usernick.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usertune.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdata.Plo@am__quote@
 
 .c.o:
@@ -806,6 +847,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-parser.obj `if test -f 'parser.c'; then $(CYGPATH_W) 'parser.c'; else $(CYGPATH_W) '$(srcdir)/parser.c'; fi`
 
+libjabber_a-ping.o: ping.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-ping.o -MD -MP -MF "$(DEPDIR)/libjabber_a-ping.Tpo" -c -o libjabber_a-ping.o `test -f 'ping.c' || echo '$(srcdir)/'`ping.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-ping.Tpo" "$(DEPDIR)/libjabber_a-ping.Po"; else rm -f "$(DEPDIR)/libjabber_a-ping.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ping.c' object='libjabber_a-ping.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-ping.o `test -f 'ping.c' || echo '$(srcdir)/'`ping.c
+
+libjabber_a-ping.obj: ping.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-ping.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-ping.Tpo" -c -o libjabber_a-ping.obj `if test -f 'ping.c'; then $(CYGPATH_W) 'ping.c'; else $(CYGPATH_W) '$(srcdir)/ping.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-ping.Tpo" "$(DEPDIR)/libjabber_a-ping.Po"; else rm -f "$(DEPDIR)/libjabber_a-ping.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ping.c' object='libjabber_a-ping.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-ping.obj `if test -f 'ping.c'; then $(CYGPATH_W) 'ping.c'; else $(CYGPATH_W) '$(srcdir)/ping.c'; fi`
+
 libjabber_a-presence.o: presence.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-presence.o -MD -MP -MF "$(DEPDIR)/libjabber_a-presence.Tpo" -c -o libjabber_a-presence.o `test -f 'presence.c' || echo '$(srcdir)/'`presence.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-presence.Tpo" "$(DEPDIR)/libjabber_a-presence.Po"; else rm -f "$(DEPDIR)/libjabber_a-presence.Tpo"; exit 1; fi
@@ -862,6 +917,90 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-xdata.obj `if test -f 'xdata.c'; then $(CYGPATH_W) 'xdata.c'; else $(CYGPATH_W) '$(srcdir)/xdata.c'; fi`
 
+libjabber_a-caps.o: caps.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-caps.o -MD -MP -MF "$(DEPDIR)/libjabber_a-caps.Tpo" -c -o libjabber_a-caps.o `test -f 'caps.c' || echo '$(srcdir)/'`caps.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-caps.Tpo" "$(DEPDIR)/libjabber_a-caps.Po"; else rm -f "$(DEPDIR)/libjabber_a-caps.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='caps.c' object='libjabber_a-caps.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-caps.o `test -f 'caps.c' || echo '$(srcdir)/'`caps.c
+
+libjabber_a-caps.obj: caps.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-caps.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-caps.Tpo" -c -o libjabber_a-caps.obj `if test -f 'caps.c'; then $(CYGPATH_W) 'caps.c'; else $(CYGPATH_W) '$(srcdir)/caps.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-caps.Tpo" "$(DEPDIR)/libjabber_a-caps.Po"; else rm -f "$(DEPDIR)/libjabber_a-caps.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='caps.c' object='libjabber_a-caps.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-caps.obj `if test -f 'caps.c'; then $(CYGPATH_W) 'caps.c'; else $(CYGPATH_W) '$(srcdir)/caps.c'; fi`
+
+libjabber_a-adhoccommands.o: adhoccommands.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-adhoccommands.o -MD -MP -MF "$(DEPDIR)/libjabber_a-adhoccommands.Tpo" -c -o libjabber_a-adhoccommands.o `test -f 'adhoccommands.c' || echo '$(srcdir)/'`adhoccommands.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-adhoccommands.Tpo" "$(DEPDIR)/libjabber_a-adhoccommands.Po"; else rm -f "$(DEPDIR)/libjabber_a-adhoccommands.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adhoccommands.c' object='libjabber_a-adhoccommands.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-adhoccommands.o `test -f 'adhoccommands.c' || echo '$(srcdir)/'`adhoccommands.c
+
+libjabber_a-adhoccommands.obj: adhoccommands.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-adhoccommands.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-adhoccommands.Tpo" -c -o libjabber_a-adhoccommands.obj `if test -f 'adhoccommands.c'; then $(CYGPATH_W) 'adhoccommands.c'; else $(CYGPATH_W) '$(srcdir)/adhoccommands.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-adhoccommands.Tpo" "$(DEPDIR)/libjabber_a-adhoccommands.Po"; else rm -f "$(DEPDIR)/libjabber_a-adhoccommands.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='adhoccommands.c' object='libjabber_a-adhoccommands.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-adhoccommands.obj `if test -f 'adhoccommands.c'; then $(CYGPATH_W) 'adhoccommands.c'; else $(CYGPATH_W) '$(srcdir)/adhoccommands.c'; fi`
+
+libjabber_a-pep.o: pep.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-pep.o -MD -MP -MF "$(DEPDIR)/libjabber_a-pep.Tpo" -c -o libjabber_a-pep.o `test -f 'pep.c' || echo '$(srcdir)/'`pep.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-pep.Tpo" "$(DEPDIR)/libjabber_a-pep.Po"; else rm -f "$(DEPDIR)/libjabber_a-pep.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pep.c' object='libjabber_a-pep.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-pep.o `test -f 'pep.c' || echo '$(srcdir)/'`pep.c
+
+libjabber_a-pep.obj: pep.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-pep.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-pep.Tpo" -c -o libjabber_a-pep.obj `if test -f 'pep.c'; then $(CYGPATH_W) 'pep.c'; else $(CYGPATH_W) '$(srcdir)/pep.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-pep.Tpo" "$(DEPDIR)/libjabber_a-pep.Po"; else rm -f "$(DEPDIR)/libjabber_a-pep.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pep.c' object='libjabber_a-pep.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-pep.obj `if test -f 'pep.c'; then $(CYGPATH_W) 'pep.c'; else $(CYGPATH_W) '$(srcdir)/pep.c'; fi`
+
+libjabber_a-usermood.o: usermood.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usermood.o -MD -MP -MF "$(DEPDIR)/libjabber_a-usermood.Tpo" -c -o libjabber_a-usermood.o `test -f 'usermood.c' || echo '$(srcdir)/'`usermood.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usermood.Tpo" "$(DEPDIR)/libjabber_a-usermood.Po"; else rm -f "$(DEPDIR)/libjabber_a-usermood.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usermood.c' object='libjabber_a-usermood.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usermood.o `test -f 'usermood.c' || echo '$(srcdir)/'`usermood.c
+
+libjabber_a-usermood.obj: usermood.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usermood.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-usermood.Tpo" -c -o libjabber_a-usermood.obj `if test -f 'usermood.c'; then $(CYGPATH_W) 'usermood.c'; else $(CYGPATH_W) '$(srcdir)/usermood.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usermood.Tpo" "$(DEPDIR)/libjabber_a-usermood.Po"; else rm -f "$(DEPDIR)/libjabber_a-usermood.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usermood.c' object='libjabber_a-usermood.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usermood.obj `if test -f 'usermood.c'; then $(CYGPATH_W) 'usermood.c'; else $(CYGPATH_W) '$(srcdir)/usermood.c'; fi`
+
+libjabber_a-usernick.o: usernick.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usernick.o -MD -MP -MF "$(DEPDIR)/libjabber_a-usernick.Tpo" -c -o libjabber_a-usernick.o `test -f 'usernick.c' || echo '$(srcdir)/'`usernick.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usernick.Tpo" "$(DEPDIR)/libjabber_a-usernick.Po"; else rm -f "$(DEPDIR)/libjabber_a-usernick.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usernick.c' object='libjabber_a-usernick.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usernick.o `test -f 'usernick.c' || echo '$(srcdir)/'`usernick.c
+
+libjabber_a-usernick.obj: usernick.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usernick.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-usernick.Tpo" -c -o libjabber_a-usernick.obj `if test -f 'usernick.c'; then $(CYGPATH_W) 'usernick.c'; else $(CYGPATH_W) '$(srcdir)/usernick.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usernick.Tpo" "$(DEPDIR)/libjabber_a-usernick.Po"; else rm -f "$(DEPDIR)/libjabber_a-usernick.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usernick.c' object='libjabber_a-usernick.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usernick.obj `if test -f 'usernick.c'; then $(CYGPATH_W) 'usernick.c'; else $(CYGPATH_W) '$(srcdir)/usernick.c'; fi`
+
+libjabber_a-usertune.o: usertune.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usertune.o -MD -MP -MF "$(DEPDIR)/libjabber_a-usertune.Tpo" -c -o libjabber_a-usertune.o `test -f 'usertune.c' || echo '$(srcdir)/'`usertune.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usertune.Tpo" "$(DEPDIR)/libjabber_a-usertune.Po"; else rm -f "$(DEPDIR)/libjabber_a-usertune.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usertune.c' object='libjabber_a-usertune.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usertune.o `test -f 'usertune.c' || echo '$(srcdir)/'`usertune.c
+
+libjabber_a-usertune.obj: usertune.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-usertune.obj -MD -MP -MF "$(DEPDIR)/libjabber_a-usertune.Tpo" -c -o libjabber_a-usertune.obj `if test -f 'usertune.c'; then $(CYGPATH_W) 'usertune.c'; else $(CYGPATH_W) '$(srcdir)/usertune.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-usertune.Tpo" "$(DEPDIR)/libjabber_a-usertune.Po"; else rm -f "$(DEPDIR)/libjabber_a-usertune.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usertune.c' object='libjabber_a-usertune.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -c -o libjabber_a-usertune.obj `if test -f 'usertune.c'; then $(CYGPATH_W) 'usertune.c'; else $(CYGPATH_W) '$(srcdir)/usertune.c'; fi`
+
 libjabber_a-libxmpp.o: libxmpp.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_a_CFLAGS) $(CFLAGS) -MT libjabber_a-libxmpp.o -MD -MP -MF "$(DEPDIR)/libjabber_a-libxmpp.Tpo" -c -o libjabber_a-libxmpp.o `test -f 'libxmpp.c' || echo '$(srcdir)/'`libxmpp.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libjabber_a-libxmpp.Tpo" "$(DEPDIR)/libjabber_a-libxmpp.Po"; else rm -f "$(DEPDIR)/libjabber_a-libxmpp.Tpo"; exit 1; fi
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/Makefile.mingw pidgin-2.2.0/libpurple/protocols/jabber/Makefile.mingw
--- pidgin-2.1.1/libpurple/protocols/jabber/Makefile.mingw	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/Makefile.mingw	2007-09-14 00:45:40.000000000 -0400
@@ -42,8 +42,11 @@
 ##
 ##  SOURCES, OBJECTS
 ##
-C_SRC =			auth.c \
+C_SRC =	\
+			adhoccommands.c \
+			auth.c \
 			buddy.c \
+			caps.c \
 			chat.c \
 			disco.c \
 			google.c \
@@ -53,9 +56,14 @@
 			message.c \
 			oob.c \
 			parser.c \
+			pep.c \
+			ping.c \
 			presence.c \
 			roster.c \
 			si.c \
+			usermood.c \
+			usernick.c \
+			usertune.c \
 			xdata.c \
 			win32/posix.uname.c
 
@@ -74,6 +82,14 @@
 			-lintl \
 			-lpurple
 
+ifeq ($(CYRUS_SASL), 1)
+CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.22
+CFLAGS += -DHAVE_CYRUS_SASL
+INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
+LIB_PATHS += -L$(CYRUS_SASL_TOP)/lib
+LIBS += -llibsasl
+endif
+
 include $(PIDGIN_COMMON_RULES)
 
 ##
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/message.c pidgin-2.2.0/libpurple/protocols/jabber/message.c
--- pidgin-2.1.1/libpurple/protocols/jabber/message.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/message.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -30,6 +30,7 @@
 #include "google.h"
 #include "message.h"
 #include "xmlnode.h"
+#include "pep.h"
 
 void jabber_message_free(JabberMessage *jm)
 {
@@ -147,9 +148,13 @@
 static void handle_headline(JabberMessage *jm)
 {
 	char *title;
-	GString *body = g_string_new("");
+	GString *body;
 	GList *etc;
 
+	if(!jm->xhtml && !jm->body)
+		return; /* ignore headlines without any content */
+
+	body = g_string_new("");
 	title = g_strdup_printf(_("Message from %s"), jm->from);
 
 	if(jm->xhtml)
@@ -273,6 +278,36 @@
 	g_free(buf);
 }
 
+static void handle_buzz(JabberMessage *jm) {
+	PurpleBuddy *buddy;
+	PurpleAccount *account;
+	PurpleConversation *c;
+	char *username, *str;
+	
+	/* Delayed buzz MUST NOT be accepted */
+	if(jm->delayed)
+		return;
+	
+	/* Reject buzz when it's not enabled */
+	if(!jm->js->allowBuzz)
+		return;
+	
+	account = purple_connection_get_account(jm->js->gc);
+	
+	if ((buddy = purple_find_buddy(account, jm->from)) != NULL)
+		username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
+	else
+		return; /* Do not accept buzzes from unknown people */
+
+	c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, jm->from);
+
+	str = g_strdup_printf(_("%s has buzzed you!"), username);
+	
+	purple_conversation_write(c, NULL, str, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL));
+	g_free(username);
+	g_free(str);
+}
+
 void jabber_message_parse(JabberStream *js, xmlnode *packet)
 {
 	JabberMessage *jm;
@@ -308,22 +343,25 @@
 	jm->id = g_strdup(xmlnode_get_attrib(packet, "id"));
 
 	for(child = packet->child; child; child = child->next) {
+		const char *xmlns = xmlnode_get_namespace(child);
+		if(!xmlns)
+			xmlns = "";
 		if(child->type != XMLNODE_TYPE_TAG)
 			continue;
 
-		if(!strcmp(child->name, "subject")) {
+		if(!strcmp(child->name, "subject") && !strcmp(xmlns,"jabber:client")) {
 			if(!jm->subject)
 				jm->subject = xmlnode_get_data(child);
-		} else if(!strcmp(child->name, "thread")) {
+		} else if(!strcmp(child->name, "thread") && !strcmp(xmlns,"jabber:client")) {
 			if(!jm->thread_id)
 				jm->thread_id = xmlnode_get_data(child);
-		} else if(!strcmp(child->name, "body")) {
+		} else if(!strcmp(child->name, "body") && !strcmp(xmlns,"jabber:client")) {
 			if(!jm->body) {
 				char *msg = xmlnode_to_str(child, NULL);
 				jm->body = purple_strdup_withhtml(msg);
 				g_free(msg);
 			}
-		} else if(!strcmp(child->name, "html")) {
+		} else if(!strcmp(child->name, "html") && !strcmp(xmlns,"http://jabber.org/protocol/xhtml-im")) {
 			if(!jm->xhtml && xmlnode_get_child(child, "body")) {
 				char *c;
 				jm->xhtml = xmlnode_to_str(child, NULL);
@@ -335,21 +373,28 @@
 						*c = ' ';
 				}
 			}
-		} else if(!strcmp(child->name, "active")) {
+		} else if(!strcmp(child->name, "active") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_ACTIVE;
 			jm->typing_style |= JM_TS_JEP_0085;
-		} else if(!strcmp(child->name, "composing")) {
+		} else if(!strcmp(child->name, "composing") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_COMPOSING;
 			jm->typing_style |= JM_TS_JEP_0085;
-		} else if(!strcmp(child->name, "paused")) {
+		} else if(!strcmp(child->name, "paused") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_PAUSED;
 			jm->typing_style |= JM_TS_JEP_0085;
-		} else if(!strcmp(child->name, "inactive")) {
+		} else if(!strcmp(child->name, "inactive") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_INACTIVE;
 			jm->typing_style |= JM_TS_JEP_0085;
-		} else if(!strcmp(child->name, "gone")) {
+		} else if(!strcmp(child->name, "gone") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_GONE;
 			jm->typing_style |= JM_TS_JEP_0085;
+		} else if(!strcmp(child->name, "event") && !strcmp(xmlns,"http://jabber.org/protocol/pubsub#event")) {
+			xmlnode *items;
+			jm->type = JABBER_MESSAGE_EVENT;
+			for(items = xmlnode_get_child(child,"items"); items; items = items->next)
+				jm->eventitems = g_list_append(jm->eventitems, items);
+		} else if(!strcmp(child->name, "attention") && !strcmp(xmlns,"http://www.xmpp.org/extensions/xep-0224.html#ns")) {
+			jm->hasBuzz = TRUE;
 		} else if(!strcmp(child->name, "error")) {
 			const char *code = xmlnode_get_attrib(child, "code");
 			char *code_txt = NULL;
@@ -364,8 +409,12 @@
 
 			g_free(code_txt);
 			g_free(text);
+		} else if(!strcmp(child->name, "delay") && xmlns && !strcmp(xmlns,"urn:xmpp:delay")) {
+			const char *timestamp = xmlnode_get_attrib(child, "stamp");
+			jm->delayed = TRUE;
+			if(timestamp)
+				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
 		} else if(!strcmp(child->name, "x")) {
-			const char *xmlns = xmlnode_get_namespace(child);
 			if(xmlns && !strcmp(xmlns, "jabber:x:event")) {
 				if(xmlnode_get_child(child, "composing")) {
 					if(jm->chat_state == JM_STATE_ACTIVE)
@@ -411,6 +460,9 @@
 		}
 	}
 
+	if(jm->hasBuzz)
+		handle_buzz(jm);
+
 	switch(jm->type) {
 		case JABBER_MESSAGE_NORMAL:
 		case JABBER_MESSAGE_CHAT:
@@ -425,6 +477,9 @@
 		case JABBER_MESSAGE_GROUPCHAT_INVITE:
 			handle_groupchat_invite(jm);
 			break;
+		case JABBER_MESSAGE_EVENT:
+			jabber_handle_event(jm);
+			break;
 		case JABBER_MESSAGE_ERROR:
 			handle_error(jm);
 			break;
@@ -461,6 +516,7 @@
 			type = "error";
 			break;
 		case JABBER_MESSAGE_OTHER:
+		default:
 			type = NULL;
 			break;
 	}
@@ -689,3 +745,8 @@
 	jabber_message_send(jm);
 	jabber_message_free(jm);
 }
+
+gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace) {
+	return js->allowBuzz;
+}
+
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/message.h pidgin-2.2.0/libpurple/protocols/jabber/message.h
--- pidgin-2.1.1/libpurple/protocols/jabber/message.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/message.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_MESSAGE_H_
 #define _PURPLE_JABBER_MESSAGE_H_
@@ -35,10 +35,12 @@
 		JABBER_MESSAGE_HEADLINE,
 		JABBER_MESSAGE_ERROR,
 		JABBER_MESSAGE_GROUPCHAT_INVITE,
+		JABBER_MESSAGE_EVENT,
 		JABBER_MESSAGE_OTHER
 	} type;
 	time_t sent;
 	gboolean delayed;
+	gboolean hasBuzz;
 	char *id;
 	char *from;
 	char *to;
@@ -61,6 +63,7 @@
 		JM_STATE_GONE
 	} chat_state;
 	GList *etc;
+	GList *eventitems;
 } JabberMessage;
 
 void jabber_message_free(JabberMessage *jm);
@@ -75,4 +78,6 @@
 unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
 void jabber_message_conv_closed(JabberStream *js, const char *who);
 
+gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace);
+
 #endif /* _PURPLE_JABBER_MESSAGE_H_ */
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/oob.c pidgin-2.2.0/libpurple/protocols/jabber/oob.c
--- pidgin-2.1.1/libpurple/protocols/jabber/oob.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/oob.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/oob.h pidgin-2.2.0/libpurple/protocols/jabber/oob.h
--- pidgin-2.1.1/libpurple/protocols/jabber/oob.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/oob.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_OOB_H_
 #define _PURPLE_JABBER_OOB_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/parser.c pidgin-2.2.0/libpurple/protocols/jabber/parser.c
--- pidgin-2.1.1/libpurple/protocols/jabber/parser.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/parser.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -63,7 +63,7 @@
 		if(js->protocol_version == JABBER_PROTO_0_9)
 			js->auth_type = JABBER_AUTH_IQ_AUTH;
 
-		if(js->state == JABBER_STREAM_INITIALIZING)
+		if(js->state == JABBER_STREAM_INITIALIZING || js->state == JABBER_STREAM_INITIALIZING_ENCRYPTION)
 			jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING);
 	} else {
 
@@ -113,7 +113,7 @@
 	} else {
 		xmlnode *packet = js->current;
 		js->current = NULL;
-		jabber_process_packet(js, packet);
+		jabber_process_packet(js, &packet);
 		xmlnode_free(packet);
 	}
 }
@@ -174,6 +174,10 @@
 	 * the parser context when you try to use it (this way, it can figure
 	 * out the encoding at creation time. So, setting up the parser is
 	 * just a matter of destroying any current parser. */
+	jabber_parser_free(js);
+}
+
+void jabber_parser_free(JabberStream *js) {
 	if (js->context) {
 		xmlParseChunk(js->context, NULL,0,1);
 		xmlFreeParserCtxt(js->context);
@@ -181,7 +185,6 @@
 	}
 }
 
-
 void jabber_parser_process(JabberStream *js, const char *buf, int len)
 {
 	if (js->context ==  NULL) {
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/parser.h pidgin-2.2.0/libpurple/protocols/jabber/parser.h
--- pidgin-2.1.1/libpurple/protocols/jabber/parser.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/parser.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_PARSER_H_
 #define _PURPLE_JABBER_PARSER_H_
@@ -25,6 +25,7 @@
 #include "jabber.h"
 
 void jabber_parser_setup(JabberStream *js);
+void jabber_parser_free(JabberStream *js);
 void jabber_parser_process(JabberStream *js, const char *buf, int len);
 
 #endif /* _PURPLE_JABBER_PARSER_H_ */
Only in pidgin-2.2.0/libpurple/protocols/jabber: pep.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: pep.h
Only in pidgin-2.2.0/libpurple/protocols/jabber: ping.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: ping.h
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/presence.c pidgin-2.2.0/libpurple/protocols/jabber/presence.c
--- pidgin-2.1.1/libpurple/protocols/jabber/presence.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/presence.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -36,6 +36,9 @@
 #include "presence.h"
 #include "iq.h"
 #include "jutil.h"
+#include "adhoccommands.h"
+
+#include "usertune.h"
 
 
 static void chats_send_presence_foreach(gpointer key, gpointer val,
@@ -101,6 +104,9 @@
 	char *stripped = NULL;
 	JabberBuddyState state;
 	int priority;
+	const char *artist, *title, *source, *uri, *track;
+	int length;
+	gboolean allowBuzz;
 
 	if(NULL == status) {
 		PurplePresence *gpresence = purple_account_get_presence(account);
@@ -127,28 +133,95 @@
 	}
 
 	purple_status_to_jabber(status, &state, &stripped, &priority);
-
-
-	presence = jabber_presence_create(state, stripped, priority);
-	g_free(stripped);
-
-	if(js->avatar_hash) {
-		x = xmlnode_new_child(presence, "x");
-		xmlnode_set_namespace(x, "vcard-temp:x:update");
-		photo = xmlnode_new_child(x, "photo");
-		xmlnode_insert_data(photo, js->avatar_hash, -1);
+	
+	/* check for buzz support */
+	allowBuzz = purple_status_get_attr_boolean(status,"buzz");
+	/* changing the buzz state has to trigger a re-broadcasting of the presence for caps */
+	
+#define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
+					  (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b)))
+	/* check if there are any differences to the <presence> and send them in that case */
+	if (allowBuzz != js->allowBuzz || js->old_state != state || CHANGED(js->old_msg, stripped) ||
+		js->old_priority != priority || CHANGED(js->old_avatarhash, js->avatar_hash)) {
+		js->allowBuzz = allowBuzz;
+		presence = jabber_presence_create_js(js, state, stripped, priority);
+
+		if(js->avatar_hash) {
+			x = xmlnode_new_child(presence, "x");
+			xmlnode_set_namespace(x, "vcard-temp:x:update");
+			photo = xmlnode_new_child(x, "photo");
+			xmlnode_insert_data(photo, js->avatar_hash, -1);
+		}
+
+		jabber_send(js, presence);
+
+		g_hash_table_foreach(js->chats, chats_send_presence_foreach, presence);
+		xmlnode_free(presence);
+		
+		/* update old values */
+		
+		if(js->old_msg)
+			g_free(js->old_msg);
+		if(js->old_avatarhash)
+			g_free(js->old_avatarhash);
+		js->old_msg = g_strdup(stripped);
+		js->old_avatarhash = g_strdup(js->avatar_hash);
+		js->old_state = state;
+		js->old_priority = priority;
+		g_free(stripped);
+	}
+					  	
+	/* next, check if there are any changes to the tune values */
+	artist = purple_status_get_attr_string(status, PURPLE_TUNE_ARTIST);
+	title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE);
+	source = purple_status_get_attr_string(status, PURPLE_TUNE_ALBUM);
+	uri = purple_status_get_attr_string(status, PURPLE_TUNE_URL);
+	track = purple_status_get_attr_string(status, PURPLE_TUNE_TRACK);
+	length = (!purple_status_get_attr_value(status, PURPLE_TUNE_TIME))?-1:purple_status_get_attr_int(status, PURPLE_TUNE_TIME);
+	
+	if(CHANGED(artist, js->old_artist) || CHANGED(title, js->old_title) || CHANGED(source, js->old_source) ||
+	   CHANGED(uri, js->old_uri) || CHANGED(track, js->old_track) || (length != js->old_length)) {
+		PurpleJabberTuneInfo tuneinfo = {
+			(char*)artist,
+			(char*)title,
+			(char*)source,
+			(char*)track,
+			length,
+			(char*)uri
+		};
+		jabber_tune_set(js->gc, &tuneinfo);
+		
+		/* update old values */
+		if(js->old_artist)
+			g_free(js->old_artist);
+		if(js->old_title)
+			g_free(js->old_title);
+		if(js->old_source)
+			g_free(js->old_source);
+		if(js->old_uri)
+			g_free(js->old_uri);
+		if(js->old_track)
+			g_free(js->old_track);
+		js->old_artist = g_strdup(artist);
+		js->old_title = g_strdup(title);
+		js->old_source = g_strdup(source);
+		js->old_uri = g_strdup(uri);
+		js->old_length = length;
+		js->old_track = g_strdup(track);
 	}
 
-	jabber_send(js, presence);
-
-	g_hash_table_foreach(js->chats, chats_send_presence_foreach, presence);
-	xmlnode_free(presence);
+#undef CHANGED
 
 	jabber_presence_fake_to_self(js, status);
 }
 
 xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority)
 {
+    return jabber_presence_create_js(NULL, state, msg, priority);
+}
+
+xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, const char *msg, int priority)
+{
 	xmlnode *show, *status, *presence, *pri, *c;
 	const char *show_string = NULL;
 
@@ -183,7 +256,39 @@
 	xmlnode_set_namespace(c, "http://jabber.org/protocol/caps");
 	xmlnode_set_attrib(c, "node", CAPS0115_NODE);
 	xmlnode_set_attrib(c, "ver", VERSION);
-
+	
+	if(js != NULL) {
+		/* add the extensions */
+		char extlist[1024];
+		unsigned remaining = 1023; /* one less for the \0 */
+		GList *feature;
+		
+		extlist[0] = '\0';
+		for(feature = jabber_features; feature && remaining > 0; feature = feature->next) {
+			JabberFeature *feat = (JabberFeature*)feature->data;
+			unsigned featlen;
+			
+			if(feat->is_enabled != NULL && feat->is_enabled(js, feat->shortname, feat->namespace) == FALSE)
+				continue; /* skip this feature */
+			
+			featlen = strlen(feat->shortname);
+			
+			/* cut off when we don't have any more space left in our buffer (too bad) */
+			if(featlen > remaining)
+				break;
+			
+			strncat(extlist,feat->shortname,remaining);
+			remaining -= featlen;
+			if(feature->next) { /* no space at the end */
+				strncat(extlist," ",remaining);
+				--remaining;
+			}
+		}
+		/* did we add anything? */
+		if(remaining < 1023)
+			xmlnode_set_attrib(c, "ext", extlist);
+	}
+	
 	return presence;
 }
 
@@ -252,6 +357,35 @@
 	}
 }
 
+typedef struct _JabberPresenceCapabilities {
+	JabberStream *js;
+	JabberBuddyResource *jbr;
+	char *from;
+} JabberPresenceCapabilities;
+
+static void jabber_presence_set_capabilities(JabberCapsClientInfo *info, gpointer user_data) {
+	JabberPresenceCapabilities *userdata = user_data;
+	GList *iter;
+	
+	if(userdata->jbr->caps)
+		jabber_caps_free_clientinfo(userdata->jbr->caps);
+	userdata->jbr->caps = info;
+	
+	for(iter = info->features; iter; iter = g_list_next(iter)) {
+		if(!strcmp((const char*)iter->data, "http://jabber.org/protocol/commands")) {
+			JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
+			xmlnode *query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#items");
+			xmlnode_set_attrib(iq->node, "to", userdata->from);
+			xmlnode_set_attrib(query, "node", "http://jabber.org/protocol/commands");
+			
+			jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL);
+			jabber_iq_send(iq);
+			break;
+		}
+	}
+	g_free(user_data);
+}
+
 void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 {
 	const char *from = xmlnode_get_attrib(packet, "from");
@@ -273,6 +407,7 @@
 	xmlnode *y;
 	gboolean muc = FALSE;
 	char *avatar_hash = NULL;
+	xmlnode *caps = NULL;
 
 	if(!(jb = jabber_buddy_find(js, from, TRUE)))
 		return;
@@ -335,8 +470,10 @@
 
 
 	for(y = packet->child; y; y = y->next) {
+		const char *xmlns;
 		if(y->type != XMLNODE_TYPE_TAG)
 			continue;
+		xmlns = xmlnode_get_namespace(y);
 
 		if(!strcmp(y->name, "status")) {
 			g_free(status);
@@ -347,6 +484,11 @@
 				priority = atoi(p);
 				g_free(p);
 			}
+		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
+			/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
+			delayed = TRUE;
+		} else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) {
+			caps = y; /* store for later, when creating buddy resource */
 		} else if(!strcmp(y->name, "x")) {
 			const char *xmlns = xmlnode_get_namespace(y);
 			if(xmlns && !strcmp(xmlns, "jabber:x:delay")) {
@@ -524,18 +666,22 @@
 		g_free(room_jid);
 	} else {
 		buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
-				jid->node ? "@" : "", jid->domain);
+									 jid->node ? "@" : "", jid->domain);
 		if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) {
-			purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%x)\n",
-				buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
-			jabber_id_free(jid);
-			g_free(avatar_hash);
-			g_free(buddy_name);
-			g_free(status);
-			return;
+			if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) {
+				purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%x)\n",
+									 buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
+				jabber_id_free(jid);
+				g_free(avatar_hash);
+				g_free(buddy_name);
+				g_free(status);
+				return;
+			} else {
+				/* this is a different resource of our own account. Resume even when this account isn't on our blist */
+			}
 		}
 
-		if(avatar_hash) {
+		if(b && avatar_hash) {
 			const char *avatar_hash2 = purple_buddy_icons_get_checksum_for_user(b);
 			if(!avatar_hash2 || strcmp(avatar_hash, avatar_hash2)) {
 				JabberIq *iq;
@@ -573,6 +719,19 @@
 		} else {
 			jbr = jabber_buddy_track_resource(jb, jid->resource, priority,
 					state, status);
+			if(caps) {
+				const char *node = xmlnode_get_attrib(caps,"node");
+				const char *ver = xmlnode_get_attrib(caps,"ver");
+				const char *ext = xmlnode_get_attrib(caps,"ext");
+				
+				if(node && ver) {
+					JabberPresenceCapabilities *userdata = g_new0(JabberPresenceCapabilities, 1);
+					userdata->js = js;
+					userdata->jbr = jbr;
+					userdata->from = g_strdup(from);
+					jabber_caps_get_info(js, from, node, ver, ext, jabber_presence_set_capabilities, userdata);
+				}
+			}
 		}
 
 		if((found_jbr = jabber_buddy_find_resource(jb, NULL))) {
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/presence.h pidgin-2.2.0/libpurple/protocols/jabber/presence.h
--- pidgin-2.1.1/libpurple/protocols/jabber/presence.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/presence.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_PRESENCE_H_
 #define _PURPLE_JABBER_PRESENCE_H_
@@ -27,7 +27,8 @@
 #include "xmlnode.h"
 
 void jabber_presence_send(PurpleAccount *account, PurpleStatus *status);
-xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority);
+xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority); /* DEPRECATED */
+xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, const char *msg, int priority);
 void jabber_presence_parse(JabberStream *js, xmlnode *packet);
 void jabber_presence_subscription_set(JabberStream *js, const char *who,
 		const char *type);
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/roster.c pidgin-2.2.0/libpurple/protocols/jabber/roster.c
--- pidgin-2.1.1/libpurple/protocols/jabber/roster.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/roster.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -58,6 +58,7 @@
 {
 	GSList *buddies, *g2, *l;
 	gchar *my_bare_jid;
+	GList *pool = NULL;
 
 	buddies = purple_find_buddies(js->gc->account, jid);
 
@@ -89,13 +90,20 @@
 			g_free(l->data);
 			g2 = g_slist_delete_link(g2, l);
 		} else {
-			purple_blist_remove_buddy(b);
+			pool = g_list_prepend(pool, b);
 		}
 	}
 
 	while(g2) {
-		PurpleBuddy *b = purple_buddy_new(js->gc->account, jid, alias);
 		PurpleGroup *g = purple_find_group(g2->data);
+		PurpleBuddy *b = NULL;
+
+		if (pool) {
+			b = pool->data;
+			pool = g_list_delete_link(pool, pool);
+		} else {			
+			b = purple_buddy_new(js->gc->account, jid, alias);
+		}
 
 		if(!g) {
 			g = purple_group_new(g2->data);
@@ -121,6 +129,12 @@
 		g2 = g_slist_delete_link(g2, g2);
 	}
 
+	while (pool) {
+		PurpleBuddy *b = pool->data;
+		purple_blist_remove_buddy(b);
+		pool = g_list_delete_link(pool, pool);
+	}
+
 	g_free(my_bare_jid);
 	g_slist_free(buddies);
 }
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/roster.h pidgin-2.2.0/libpurple/protocols/jabber/roster.h
--- pidgin-2.1.1/libpurple/protocols/jabber/roster.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/roster.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_ROSTER_H_
 #define _PURPLE_JABBER_ROSTER_H_
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/si.c pidgin-2.2.0/libpurple/protocols/jabber/si.c
--- pidgin-2.1.1/libpurple/protocols/jabber/si.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/si.c	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -708,6 +708,10 @@
 
 	jabber_iq_set_callback(iq, jabber_si_xfer_send_method_cb, xfer);
 
+	/* Store the IQ id so that we can cancel the callback */
+	g_free(jsx->iq_id);
+	jsx->iq_id = g_strdup(iq->id);
+
 	jabber_iq_send(iq);
 }
 
@@ -722,6 +726,8 @@
 		purple_proxy_connect_cancel(jsx->connect_data);
 	if (jsx->listen_data != NULL)
 		purple_network_listen_cancel(jsx->listen_data);
+	if (jsx->iq_id != NULL)
+		jabber_iq_remove_callback_by_id(js, jsx->iq_id);
 
 	g_free(jsx->stream_id);
 	g_free(jsx->iq_id);
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/si.h pidgin-2.2.0/libpurple/protocols/jabber/si.h
--- pidgin-2.1.1/libpurple/protocols/jabber/si.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/si.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_SI_H_
 #define _PURPLE_JABBER_SI_H_
Only in pidgin-2.2.0/libpurple/protocols/jabber: usermood.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: usermood.h
Only in pidgin-2.2.0/libpurple/protocols/jabber: usernick.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: usernick.h
Only in pidgin-2.2.0/libpurple/protocols/jabber: usertune.c
Only in pidgin-2.2.0/libpurple/protocols/jabber: usertune.h
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/win32/posix.uname.c pidgin-2.2.0/libpurple/protocols/jabber/win32/posix.uname.c
--- pidgin-2.1.1/libpurple/protocols/jabber/win32/posix.uname.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/win32/posix.uname.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/xdata.c pidgin-2.2.0/libpurple/protocols/jabber/xdata.c
--- pidgin-2.1.1/libpurple/protocols/jabber/xdata.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/xdata.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -37,22 +37,39 @@
 struct jabber_x_data_data {
 	GHashTable *fields;
 	GSList *values;
-	jabber_x_data_cb cb;
+	jabber_x_data_action_cb cb;
 	gpointer user_data;
 	JabberStream *js;
+	GList *actions;
+	PurpleRequestFieldGroup *actiongroup;
 };
 
 static void jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) {
 	xmlnode *result = xmlnode_new("x");
-	jabber_x_data_cb cb = data->cb;
+	jabber_x_data_action_cb cb = data->cb;
 	gpointer user_data = data->user_data;
 	JabberStream *js = data->js;
 	GList *groups, *flds;
+	char *actionhandle = NULL;
+	gboolean hasActions = (data->actions != NULL);
 
 	xmlnode_set_namespace(result, "jabber:x:data");
 	xmlnode_set_attrib(result, "type", "submit");
 
 	for(groups = purple_request_fields_get_groups(fields); groups; groups = groups->next) {
+		if(groups->data == data->actiongroup) {
+			for(flds = purple_request_field_group_get_fields(groups->data); flds; flds = flds->next) {
+				PurpleRequestField *field = flds->data;
+				const char *id = purple_request_field_get_id(field);
+				int handleindex;
+				if(strcmp(id, "libpurple:jabber:xdata:actions"))
+					continue;
+				handleindex = purple_request_field_choice_get_value(field);
+				actionhandle = g_strdup(g_list_nth_data(data->actions, handleindex));
+				break;
+			}
+			continue;
+		}
 		for(flds = purple_request_field_group_get_fields(groups->data); flds; flds = flds->next) {
 			xmlnode *fieldnode, *valuenode;
 			PurpleRequestField *field = flds->data;
@@ -127,31 +144,59 @@
 		g_free(data->values->data);
 		data->values = g_slist_delete_link(data->values, data->values);
 	}
+	if (data->actions) {
+		GList *action;
+		for(action = data->actions; action; action = g_list_next(action)) {
+			g_free(action->data);
+		}
+		g_list_free(data->actions);
+	}
 	g_free(data);
 
-	cb(js, result, user_data);
+	if (hasActions) {
+		cb(js, result, actionhandle, user_data);
+		g_free(actionhandle);
+	} else
+		((jabber_x_data_cb)cb)(js, result, user_data);
 }
 
 static void jabber_x_data_cancel_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) {
 	xmlnode *result = xmlnode_new("x");
-	jabber_x_data_cb cb = data->cb;
+	jabber_x_data_action_cb cb = data->cb;
 	gpointer user_data = data->user_data;
 	JabberStream *js = data->js;
+	gboolean hasActions = FALSE;
 	g_hash_table_destroy(data->fields);
 	while(data->values) {
 		g_free(data->values->data);
 		data->values = g_slist_delete_link(data->values, data->values);
 	}
+	if (data->actions) {
+		GList *action;
+		hasActions = TRUE;
+		for(action = data->actions; action; action = g_list_next(action)) {
+			g_free(action->data);
+		}
+		g_list_free(data->actions);
+	}
 	g_free(data);
 
 	xmlnode_set_namespace(result, "jabber:x:data");
 	xmlnode_set_attrib(result, "type", "cancel");
 
-	cb(js, result, user_data);
+	if (hasActions)
+		cb(js, result, NULL, user_data);
+	else
+		((jabber_x_data_cb)cb)(js, result, user_data);
 }
 
 void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data)
 {
+	return jabber_x_data_request_with_actions(js, packet, NULL, 0, (jabber_x_data_action_cb)cb, user_data);
+}
+
+void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data)
+{
 	void *handle;
 	xmlnode *fn, *x;
 	PurpleRequestFields *fields;
@@ -180,7 +225,7 @@
 		char *value = NULL;
 
 		if(!type)
-			continue;
+			type = "text-single";
 
 		if(!var && strcmp(type, "fixed"))
 			continue;
@@ -191,8 +236,6 @@
 			value = xmlnode_get_data(valuenode);
 
 
-		/* XXX: handle <required/> */
-
 		if(!strcmp(type, "text-private")) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
@@ -324,6 +367,26 @@
 
 			g_free(value);
 		}
+
+		if(field && xmlnode_get_child(fn, "required"))
+			purple_request_field_set_required(field,TRUE);
+	}
+	
+	if(actions != NULL) {
+		PurpleRequestField *actionfield;
+		GList *action;
+		data->actiongroup = group = purple_request_field_group_new(_("Actions"));
+		purple_request_fields_add_group(fields, group);
+		actionfield = purple_request_field_choice_new("libpurple:jabber:xdata:actions", _("Select an action"), defaultaction);
+
+		for(action = actions; action; action = g_list_next(action)) {
+			JabberXDataAction *a = action->data;
+			
+			purple_request_field_choice_add(actionfield, a->name);
+			data->actions = g_list_append(data->actions, g_strdup(a->handle));
+		}
+		purple_request_field_set_required(actionfield,TRUE);
+		purple_request_field_group_add_field(group, actionfield);
 	}
 
 	if((x = xmlnode_get_child(packet, "title")))
diff -ru pidgin-2.1.1/libpurple/protocols/jabber/xdata.h pidgin-2.2.0/libpurple/protocols/jabber/xdata.h
--- pidgin-2.1.1/libpurple/protocols/jabber/xdata.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/jabber/xdata.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_JABBER_XDATA_H_
 #define _PURPLE_JABBER_XDATA_H_
@@ -25,7 +25,14 @@
 #include "jabber.h"
 #include "xmlnode.h"
 
+typedef struct _JabberXDataAction {
+	char *name;
+	char *handle;
+} JabberXDataAction;
+
 typedef void (*jabber_x_data_cb)(JabberStream *js, xmlnode *result, gpointer user_data);
+typedef void (*jabber_x_data_action_cb)(JabberStream *js, xmlnode *result, const char *actionhandle, gpointer user_data);
 void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data);
+void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data);
 
 #endif /* _PURPLE_JABBER_XDATA_H_ */
diff -ru pidgin-2.1.1/libpurple/protocols/Makefile.am pidgin-2.2.0/libpurple/protocols/Makefile.am
--- pidgin-2.1.1/libpurple/protocols/Makefile.am	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/Makefile.am	2007-08-26 23:36:49.000000000 -0400
@@ -1,5 +1,5 @@
 EXTRA_DIST = Makefile.mingw
 
-DIST_SUBDIRS = bonjour gg irc jabber msn novell null oscar qq sametime silc silc10 toc simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn myspace novell null oscar qq sametime silc silc10 toc simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
diff -ru pidgin-2.1.1/libpurple/protocols/Makefile.in pidgin-2.2.0/libpurple/protocols/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/Makefile.in	2007-08-20 14:13:55.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/Makefile.in	2007-09-14 03:31:22.000000000 -0400
@@ -107,6 +107,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -135,6 +137,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -190,14 +194,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -209,7 +211,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -270,6 +271,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -290,6 +292,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -403,7 +407,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 EXTRA_DIST = Makefile.mingw
-DIST_SUBDIRS = bonjour gg irc jabber msn novell null oscar qq sametime silc silc10 toc simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn myspace novell null oscar qq sametime silc silc10 toc simple yahoo zephyr
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
 all: all-recursive
 
diff -ru pidgin-2.1.1/libpurple/protocols/Makefile.mingw pidgin-2.2.0/libpurple/protocols/Makefile.mingw
--- pidgin-2.1.1/libpurple/protocols/Makefile.mingw	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -8,7 +8,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc10 simple yahoo bonjour
+SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace
 
 .PHONY: all install clean
 
diff -ru pidgin-2.1.1/libpurple/protocols/msn/cmdproc.c pidgin-2.2.0/libpurple/protocols/msn/cmdproc.c
--- pidgin-2.1.1/libpurple/protocols/msn/cmdproc.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/cmdproc.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "cmdproc.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/cmdproc.h pidgin-2.2.0/libpurple/protocols/msn/cmdproc.h
--- pidgin-2.1.1/libpurple/protocols/msn/cmdproc.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/cmdproc.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_CMDPROC_H_
 #define _MSN_CMDPROC_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/command.c pidgin-2.2.0/libpurple/protocols/msn/command.c
--- pidgin-2.1.1/libpurple/protocols/msn/command.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/command.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "command.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/command.h pidgin-2.2.0/libpurple/protocols/msn/command.h
--- pidgin-2.1.1/libpurple/protocols/msn/command.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/command.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_COMMAND_H
 #define _MSN_COMMAND_H
diff -ru pidgin-2.1.1/libpurple/protocols/msn/dialog.c pidgin-2.2.0/libpurple/protocols/msn/dialog.c
--- pidgin-2.1.1/libpurple/protocols/msn/dialog.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/dialog.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "msn.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/dialog.h pidgin-2.2.0/libpurple/protocols/msn/dialog.h
--- pidgin-2.1.1/libpurple/protocols/msn/dialog.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/dialog.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_DIALOG_H_
 #define _MSN_DIALOG_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/directconn.c pidgin-2.2.0/libpurple/protocols/msn/directconn.c
--- pidgin-2.1.1/libpurple/protocols/msn/directconn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/directconn.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "directconn.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/directconn.h pidgin-2.2.0/libpurple/protocols/msn/directconn.h
--- pidgin-2.1.1/libpurple/protocols/msn/directconn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/directconn.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_DIRECTCONN_H_
 #define _MSN_DIRECTCONN_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/error.c pidgin-2.2.0/libpurple/protocols/msn/error.c
--- pidgin-2.1.1/libpurple/protocols/msn/error.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/error.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "error.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/error.h pidgin-2.2.0/libpurple/protocols/msn/error.h
--- pidgin-2.1.1/libpurple/protocols/msn/error.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/error.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_ERROR_H_
 #define _MSN_ERROR_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/group.c pidgin-2.2.0/libpurple/protocols/msn/group.c
--- pidgin-2.1.1/libpurple/protocols/msn/group.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/group.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "group.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/group.h pidgin-2.2.0/libpurple/protocols/msn/group.h
--- pidgin-2.1.1/libpurple/protocols/msn/group.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/group.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_GROUP_H_
 #define _MSN_GROUP_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/history.c pidgin-2.2.0/libpurple/protocols/msn/history.c
--- pidgin-2.1.1/libpurple/protocols/msn/history.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/history.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "history.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/history.h pidgin-2.2.0/libpurple/protocols/msn/history.h
--- pidgin-2.1.1/libpurple/protocols/msn/history.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/history.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_HISTORY_H
 #define _MSN_HISTORY_H
diff -ru pidgin-2.1.1/libpurple/protocols/msn/httpconn.c pidgin-2.2.0/libpurple/protocols/msn/httpconn.c
--- pidgin-2.1.1/libpurple/protocols/msn/httpconn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/httpconn.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "debug.h"
@@ -181,7 +181,7 @@
 		{
 			msn_session_set_error(httpconn->session,
 								  MSN_ERROR_HTTP_MALFORMED, NULL);
-			purple_debug_error("msn", "Malformed X-MSN-Messenger field.\n{%s}",
+			purple_debug_error("msn", "Malformed X-MSN-Messenger field.\n{%s}\n",
 							 buf);
 
 			g_free(body);
@@ -725,7 +725,7 @@
 		msn_httpconn_disconnect(httpconn);
 
 	httpconn->connect_data = purple_proxy_connect(NULL, httpconn->session->account,
-		"gateway.messenger.hotmail.com", 80, connect_cb, httpconn);
+		host, 80, connect_cb, httpconn);
 
 	if (httpconn->connect_data != NULL)
 	{
diff -ru pidgin-2.1.1/libpurple/protocols/msn/httpconn.h pidgin-2.2.0/libpurple/protocols/msn/httpconn.h
--- pidgin-2.1.1/libpurple/protocols/msn/httpconn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/httpconn.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_HTTPCONN_H_
 #define _MSN_HTTPCONN_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/Makefile.in pidgin-2.2.0/libpurple/protocols/msn/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/msn/Makefile.in	2007-08-20 14:13:56.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/Makefile.in	2007-09-14 03:31:24.000000000 -0400
@@ -176,6 +176,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -204,6 +206,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -259,14 +263,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -278,7 +280,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -339,6 +340,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -359,6 +361,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msg.c pidgin-2.2.0/libpurple/protocols/msn/msg.c
--- pidgin-2.1.1/libpurple/protocols/msn/msg.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msg.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "msg.h"
@@ -400,7 +400,7 @@
 	GList *l;
 	char *n, *base, *end;
 	int len;
-	size_t body_len;
+	size_t body_len = 0;
 	const void *body;
 
 	g_return_val_if_fail(msg != NULL, NULL);
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msg.h pidgin-2.2.0/libpurple/protocols/msn/msg.h
--- pidgin-2.1.1/libpurple/protocols/msn/msg.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msg.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_MSG_H_
 #define _MSN_MSG_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msn.c pidgin-2.2.0/libpurple/protocols/msn/msn.c
--- pidgin-2.1.1/libpurple/protocols/msn/msn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msn.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #define PHOTO_SUPPORT 1
 
@@ -100,25 +100,53 @@
 	return buf;
 }
 
-static PurpleCmdRet
-msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data)
+static gboolean
+msn_send_attention(PurpleConnection *gc, const char *username, guint type)
 {
-	PurpleAccount *account = purple_conversation_get_account(conv);
-	PurpleConnection *gc = purple_account_get_connection(account);
 	MsnMessage *msg;
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 
 	msg = msn_message_new_nudge();
 	session = gc->proto_data;
-	swboard = msn_session_get_swboard(session, purple_conversation_get_name(conv), MSN_SB_FLAG_IM);
+	swboard = msn_session_get_swboard(session, username, MSN_SB_FLAG_IM);
 
 	if (swboard == NULL)
-		return PURPLE_CMD_RET_FAILED;
+		return FALSE;
 
 	msn_switchboard_send_msg(swboard, msg, TRUE);
 
-	purple_conversation_write(conv, NULL, _("You have just sent a Nudge!"), PURPLE_MESSAGE_SYSTEM, time(NULL));
+	return TRUE;
+}
+
+static GList *
+msn_attention_types(PurpleAccount *account)
+{
+	PurpleAttentionType *attn;
+	static GList *list = NULL;
+
+	if (!list) {
+		attn = g_new0(PurpleAttentionType, 1);
+		attn->name = _("Nudge");
+		attn->incoming_description = _("%s has nudged you!");
+		attn->outgoing_description = _("Nudging %s...");
+		list = g_list_append(list, attn);
+	}
+
+	return list;
+}
+
+
+static PurpleCmdRet
+msn_cmd_nudge(PurpleConversation *conv, const gchar *cmd, gchar **args, gchar **error, void *data)
+{
+	PurpleAccount *account = purple_conversation_get_account(conv);
+	PurpleConnection *gc = purple_account_get_connection(account);
+	const gchar *username;
+
+	username = purple_conversation_get_name(conv);
+
+	serv_send_attention(gc, username, MSN_NUDGE);
 
 	return PURPLE_CMD_RET_OK;
 }
@@ -323,7 +351,7 @@
 						_("Do you want to allow or disallow people on "
 						  "your buddy list to send you MSN Mobile pages "
 						  "to your cell phone or other mobile device?"),
-						-1, 
+						-1,
 						purple_connection_get_account(gc), NULL, NULL,
 						gc, 3,
 						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
@@ -509,13 +537,13 @@
 
 	user = buddy->proto_data;
 
-	
+
 	if (purple_presence_is_online(presence))
 	{
 		purple_notify_user_info_add_pair(user_info, _("Status"),
 									   (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status)));
 	}
-	
+
 	if (full && user)
 	{
 		purple_notify_user_info_add_pair(user_info, _("Has you"),
@@ -570,11 +598,11 @@
 	status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE,
 			NULL, NULL, FALSE, TRUE, FALSE);
 	types = g_list_append(types, status);
-	
+
 	status = purple_status_type_new_full(PURPLE_STATUS_MOBILE,
 			"mobile", NULL, FALSE, FALSE, TRUE);
 	types = g_list_append(types, status);
-	
+
 	return types;
 }
 
@@ -702,7 +730,10 @@
 
 	http_method = purple_account_get_bool(account, "http_method", FALSE);
 
-	host = purple_account_get_string(account, "server", MSN_SERVER);
+	if (http_method)
+		host = purple_account_get_string(account, "http_method_server", MSN_SERVER);
+	else
+		host = purple_account_get_string(account, "server", MSN_SERVER);
 	port = purple_account_get_int(account, "port", MSN_PORT);
 
 	session = msn_session_new(account);
@@ -1542,16 +1573,16 @@
 	/* No we're not. */
 	s = g_string_sized_new(strlen(url_buffer));
 	s2 = g_string_sized_new(strlen(url_buffer));
-	
+
 	/* General section header */
 	if (has_tooltip_text)
 		purple_notify_user_info_add_section_break(user_info);
-	
+
 	purple_notify_user_info_add_section_header(user_info, _("General"));
-	
+
 	/* Extract their Name and put it in */
 	MSN_GOT_INFO_GET_FIELD("Name", _("Name"));
-	
+
 	/* General */
 	MSN_GOT_INFO_GET_FIELD("Nickname", _("Nickname"));
 	MSN_GOT_INFO_GET_FIELD_NO_SEARCH("Age", _("Age"));
@@ -1569,24 +1600,24 @@
 		sect_info = TRUE;
 
 	MSN_GOT_INFO_GET_FIELD("More about me", _("A Little About Me"));
-	
+
 	if (sect_info)
 	{
 		has_info = TRUE;
 		sect_info = FALSE;
 	}
-    else 
+    else
     {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
 		if (has_tooltip_text)
 			purple_notify_user_info_remove_last_item(user_info);
 	}
-											   
+
 	/* Social */
 	purple_notify_user_info_add_section_break(user_info);
 	purple_notify_user_info_add_section_header(user_info, _("Social"));
-										   
+
 	MSN_GOT_INFO_GET_FIELD("Marital status", _("Marital Status"));
 	MSN_GOT_INFO_GET_FIELD("Interested in", _("Interests"));
 	MSN_GOT_INFO_GET_FIELD("Pets", _("Pets"));
@@ -1602,7 +1633,7 @@
 		has_info = TRUE;
 		sect_info = FALSE;
 	}
-    else 
+    else
     {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
@@ -1634,7 +1665,7 @@
 		sect_info = FALSE;
 		has_contact_info = TRUE;
 	}
-    else 
+    else
     {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
@@ -1664,7 +1695,7 @@
 		sect_info = FALSE;
 		has_contact_info = TRUE;
 	}
-    else 
+    else
     {
 		/* Remove the section header */
 		purple_notify_user_info_remove_last_item(user_info);
@@ -1839,7 +1870,7 @@
 	tmp = g_strdup_printf("<a href=\"%s%s\">%s%s</a>",
 					PROFILE_URL, info_data->name, PROFILE_URL, info_data->name);
 	purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp);
-	g_free(tmp);									   
+	g_free(tmp);
 
 #if PHOTO_SUPPORT
 	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
@@ -2101,11 +2132,11 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+	NULL,					/* unregister_user */
+	msn_send_attention,                     /* send_attention */
+	msn_attention_types,                    /* attention_types */
 
 	/* padding */
-	NULL,
-	NULL,
-	NULL,
 	NULL
 };
 
@@ -2165,6 +2196,12 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
+	/* TODO: Mark translatable as soon as 2.2.0 is released and we're not string frozen */
+	option = purple_account_option_string_new("HTTP Method Server",
+										  "http_method_server", MSN_HTTPCONN_SERVER);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+											   option);
+
 	option = purple_account_option_bool_new(_("Show custom smileys"),
 										  "custom_smileys", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msn.h pidgin-2.2.0/libpurple/protocols/msn/msn.h
--- pidgin-2.1.1/libpurple/protocols/msn/msn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msn.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_H_
 #define _MSN_H_
@@ -59,6 +59,7 @@
 
 #define USEROPT_MSNSERVER 3
 #define MSN_SERVER "messenger.hotmail.com"
+#define MSN_HTTPCONN_SERVER "gateway.messenger.hotmail.com"
 #define USEROPT_MSNPORT 4
 #define MSN_PORT 1863
 
@@ -79,6 +80,8 @@
 	"Client-Name: Purple/" VERSION "\r\n" \
 	"Chat-Logging: Y\r\n"
 
+/* Index into attention_types */
+#define MSN_NUDGE 0
 
 typedef enum
 {
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msn-utils.c pidgin-2.2.0/libpurple/protocols/msn/msn-utils.c
--- pidgin-2.1.1/libpurple/protocols/msn/msn-utils.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msn-utils.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "msn-utils.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/msn-utils.h pidgin-2.2.0/libpurple/protocols/msn/msn-utils.h
--- pidgin-2.1.1/libpurple/protocols/msn/msn-utils.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/msn-utils.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_UTILS_H_
 #define _MSN_UTILS_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/nexus.c pidgin-2.2.0/libpurple/protocols/msn/nexus.c
--- pidgin-2.1.1/libpurple/protocols/msn/nexus.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/nexus.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "nexus.h"
@@ -188,7 +188,7 @@
 	purple_ssl_close(nexus->gsc);
 	nexus->gsc = NULL;
 
-	purple_debug_misc("msn", "ssl buffer: {%s}", nexus->read_buf);
+	purple_debug_misc("msn", "ssl buffer: {%s}\n", nexus->read_buf);
 
 	if (strstr(nexus->read_buf, "HTTP/1.1 302") != NULL)
 	{
diff -ru pidgin-2.1.1/libpurple/protocols/msn/nexus.h pidgin-2.2.0/libpurple/protocols/msn/nexus.h
--- pidgin-2.1.1/libpurple/protocols/msn/nexus.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/nexus.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_NEXUS_H_
 #define _MSN_NEXUS_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/notification.c pidgin-2.2.0/libpurple/protocols/msn/notification.c
--- pidgin-2.1.1/libpurple/protocols/msn/notification.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/notification.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "notification.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/notification.h pidgin-2.2.0/libpurple/protocols/msn/notification.h
--- pidgin-2.1.1/libpurple/protocols/msn/notification.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/notification.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_NOTIFICATION_H_
 #define _MSN_NOTIFICATION_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/object.c pidgin-2.2.0/libpurple/protocols/msn/object.c
--- pidgin-2.1.1/libpurple/protocols/msn/object.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/object.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "object.h"
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/object.h pidgin-2.2.0/libpurple/protocols/msn/object.h
--- pidgin-2.1.1/libpurple/protocols/msn/object.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/object.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_OBJECT_H_
 #define _MSN_OBJECT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/page.c pidgin-2.2.0/libpurple/protocols/msn/page.c
--- pidgin-2.1.1/libpurple/protocols/msn/page.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/page.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "page.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/page.h pidgin-2.2.0/libpurple/protocols/msn/page.h
--- pidgin-2.1.1/libpurple/protocols/msn/page.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/page.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_PAGE_H_
 #define _MSN_PAGE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/servconn.c pidgin-2.2.0/libpurple/protocols/msn/servconn.c
--- pidgin-2.1.1/libpurple/protocols/msn/servconn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/servconn.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "servconn.h"
@@ -51,7 +51,7 @@
 	servconn->num = session->servconns_count++;
 
 	servconn->tx_buf = purple_circ_buffer_new(MSN_BUF_LEN);
-	servconn->tx_handler = -1;
+	servconn->tx_handler = 0;
 
 	return servconn;
 }
@@ -223,7 +223,7 @@
 
 		if (!servconn->httpconn->connected)
 			if (!msn_httpconn_connect(servconn->httpconn, host, port))
-				return FALSE;;
+				return FALSE;
 
 		servconn->connected = TRUE;
 		servconn->httpconn->virgin = TRUE;
@@ -303,7 +303,7 @@
 
 	if (writelen == 0) {
 		purple_input_remove(servconn->tx_handler);
-		servconn->tx_handler = -1;
+		servconn->tx_handler = 0;
 		return;
 	}
 
@@ -328,7 +328,7 @@
 
 	if (!servconn->session->http_method)
 	{
-		if (servconn->tx_handler == -1) {
+		if (servconn->tx_handler == 0) {
 			switch (servconn->type)
 			{
 				case MSN_SERVCONN_NS:
@@ -353,7 +353,7 @@
 		if (ret < 0 && errno == EAGAIN)
 			ret = 0;
 		if (ret >= 0 && ret < len) {
-			if (servconn->tx_handler == -1)
+			if (servconn->tx_handler == 0)
 				servconn->tx_handler = purple_input_add(
 					servconn->fd, PURPLE_INPUT_WRITE,
 					servconn_write_cb, servconn);
diff -ru pidgin-2.1.1/libpurple/protocols/msn/servconn.h pidgin-2.2.0/libpurple/protocols/msn/servconn.h
--- pidgin-2.1.1/libpurple/protocols/msn/servconn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/servconn.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SERVCONN_H_
 #define _MSN_SERVCONN_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/session.c pidgin-2.2.0/libpurple/protocols/msn/session.c
--- pidgin-2.1.1/libpurple/protocols/msn/session.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/session.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "session.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/session.h pidgin-2.2.0/libpurple/protocols/msn/session.h
--- pidgin-2.1.1/libpurple/protocols/msn/session.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/session.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SESSION_H_
 #define _MSN_SESSION_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slp.c pidgin-2.2.0/libpurple/protocols/msn/slp.c
--- pidgin-2.1.1/libpurple/protocols/msn/slp.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slp.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "slp.h"
@@ -343,7 +343,7 @@
 		if (xfer)
 		{
 			bin = (char *)purple_base64_decode(context, &bin_len);
-			file_size = GUINT32_FROM_LE(*((gsize *)bin + 2));
+			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 2));
 
 			uni_name = (gunichar2 *)(bin + 20);
 			while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) {
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpcall.c pidgin-2.2.0/libpurple/protocols/msn/slpcall.c
--- pidgin-2.1.1/libpurple/protocols/msn/slpcall.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpcall.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "slpcall.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpcall.h pidgin-2.2.0/libpurple/protocols/msn/slpcall.h
--- pidgin-2.1.1/libpurple/protocols/msn/slpcall.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpcall.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SLPCALL_H_
 #define _MSN_SLPCALL_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slp.h pidgin-2.2.0/libpurple/protocols/msn/slp.h
--- pidgin-2.1.1/libpurple/protocols/msn/slp.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slp.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SLP_H_
 #define _MSN_SLP_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slplink.c pidgin-2.2.0/libpurple/protocols/msn/slplink.c
--- pidgin-2.1.1/libpurple/protocols/msn/slplink.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slplink.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "slplink.h"
@@ -49,7 +49,7 @@
 	tf = g_fopen(tmp, "wb");
 	if (tf == NULL)
 	{
-		purple_debug_error("msn", "could not open debug file");
+		purple_debug_error("msn", "could not open debug file\n");
 		return;
 	}
 	pload = msn_message_gen_payload(msg, &pload_size);
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slplink.h pidgin-2.2.0/libpurple/protocols/msn/slplink.h
--- pidgin-2.1.1/libpurple/protocols/msn/slplink.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slplink.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SLPLINK_H_
 #define _MSN_SLPLINK_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpmsg.c pidgin-2.2.0/libpurple/protocols/msn/slpmsg.c
--- pidgin-2.1.1/libpurple/protocols/msn/slpmsg.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpmsg.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "slpmsg.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpmsg.h pidgin-2.2.0/libpurple/protocols/msn/slpmsg.h
--- pidgin-2.1.1/libpurple/protocols/msn/slpmsg.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpmsg.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SLPMSG_H_
 #define _MSN_SLPMSG_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpsession.c pidgin-2.2.0/libpurple/protocols/msn/slpsession.c
--- pidgin-2.1.1/libpurple/protocols/msn/slpsession.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpsession.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "slpsession.h"
 
diff -ru pidgin-2.1.1/libpurple/protocols/msn/slpsession.h pidgin-2.2.0/libpurple/protocols/msn/slpsession.h
--- pidgin-2.1.1/libpurple/protocols/msn/slpsession.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/slpsession.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SLPSESSION_H_
 #define _MSN_SLPSESSION_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/state.c pidgin-2.2.0/libpurple/protocols/msn/state.c
--- pidgin-2.1.1/libpurple/protocols/msn/state.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/state.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "state.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/state.h pidgin-2.2.0/libpurple/protocols/msn/state.h
--- pidgin-2.1.1/libpurple/protocols/msn/state.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/state.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_STATE_H_
 #define _MSN_STATE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/switchboard.c pidgin-2.2.0/libpurple/protocols/msn/switchboard.c
--- pidgin-2.1.1/libpurple/protocols/msn/switchboard.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/switchboard.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "prefs.h"
@@ -771,7 +771,8 @@
 		msg->ack_cb(msg, msg->ack_data);
 
 	swboard = cmdproc->data;
-	swboard->ack_list = g_list_remove(swboard->ack_list, msg);
+	if (swboard)
+		swboard->ack_list = g_list_remove(swboard->ack_list, msg);
 	msn_message_unref(msg);
 }
 
@@ -951,6 +952,8 @@
 	PurpleBuddy *buddy;
 	const char *user;
 
+	str = NULL;
+
 	swboard = cmdproc->data;
 	account = cmdproc->session->account;
 	user = msg->remote_user;
@@ -960,9 +963,8 @@
 	else
 		username = g_markup_escape_text(user, -1);
 
-	str = g_strdup_printf(_("%s just sent you a Nudge!"), username);
+	serv_got_attention(account->gc, buddy->name, MSN_NUDGE);
 	g_free(username);
-	msn_switchboard_report_user(swboard, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, str);
 	g_free(str);
 }
 
diff -ru pidgin-2.1.1/libpurple/protocols/msn/switchboard.h pidgin-2.2.0/libpurple/protocols/msn/switchboard.h
--- pidgin-2.1.1/libpurple/protocols/msn/switchboard.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/switchboard.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SWITCHBOARD_H_
 #define _MSN_SWITCHBOARD_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/sync.c pidgin-2.2.0/libpurple/protocols/msn/sync.c
--- pidgin-2.1.1/libpurple/protocols/msn/sync.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/sync.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "sync.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/sync.h pidgin-2.2.0/libpurple/protocols/msn/sync.h
--- pidgin-2.1.1/libpurple/protocols/msn/sync.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/sync.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_SYNC_H_
 #define _MSN_SYNC_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/table.c pidgin-2.2.0/libpurple/protocols/msn/table.c
--- pidgin-2.1.1/libpurple/protocols/msn/table.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/table.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "table.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/table.h pidgin-2.2.0/libpurple/protocols/msn/table.h
--- pidgin-2.1.1/libpurple/protocols/msn/table.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/table.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_TABLE_H_
 #define _MSN_TABLE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/transaction.c pidgin-2.2.0/libpurple/protocols/msn/transaction.c
--- pidgin-2.1.1/libpurple/protocols/msn/transaction.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/transaction.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "transaction.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/transaction.h pidgin-2.2.0/libpurple/protocols/msn/transaction.h
--- pidgin-2.1.1/libpurple/protocols/msn/transaction.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/transaction.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_TRANSACTION_H
 #define _MSN_TRANSACTION_H
diff -ru pidgin-2.1.1/libpurple/protocols/msn/user.c pidgin-2.2.0/libpurple/protocols/msn/user.c
--- pidgin-2.1.1/libpurple/protocols/msn/user.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/user.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "user.h"
diff -ru pidgin-2.1.1/libpurple/protocols/msn/user.h pidgin-2.2.0/libpurple/protocols/msn/user.h
--- pidgin-2.1.1/libpurple/protocols/msn/user.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/user.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_USER_H_
 #define _MSN_USER_H_
diff -ru pidgin-2.1.1/libpurple/protocols/msn/userlist.c pidgin-2.2.0/libpurple/protocols/msn/userlist.c
--- pidgin-2.1.1/libpurple/protocols/msn/userlist.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/userlist.c	2007-09-14 01:43:19.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "msn.h"
 #include "userlist.h"
@@ -452,7 +452,7 @@
 void
 msn_userlist_add_user(MsnUserList *userlist, MsnUser *user)
 {
-	userlist->users = g_list_append(userlist->users, user);
+	userlist->users = g_list_prepend(userlist->users, user);
 }
 
 void
diff -ru pidgin-2.1.1/libpurple/protocols/msn/userlist.h pidgin-2.2.0/libpurple/protocols/msn/userlist.h
--- pidgin-2.1.1/libpurple/protocols/msn/userlist.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/msn/userlist.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _MSN_USERLIST_H_
 #define _MSN_USERLIST_H_
Only in pidgin-2.2.0/libpurple/protocols: myspace
diff -ru pidgin-2.1.1/libpurple/protocols/novell/Makefile.in pidgin-2.2.0/libpurple/protocols/novell/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/novell/Makefile.in	2007-08-20 14:13:57.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/Makefile.in	2007-09-14 03:31:24.000000000 -0400
@@ -158,6 +158,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -186,6 +188,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -241,14 +245,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -260,7 +262,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -321,6 +322,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -341,6 +343,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmconference.c pidgin-2.2.0/libpurple/protocols/novell/nmconference.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmconference.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmconference.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmconference.h pidgin-2.2.0/libpurple/protocols/novell/nmconference.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmconference.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmconference.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmconn.c pidgin-2.2.0/libpurple/protocols/novell/nmconn.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmconn.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmconn.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmconn.h pidgin-2.2.0/libpurple/protocols/novell/nmconn.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmconn.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmconn.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmcontact.c pidgin-2.2.0/libpurple/protocols/novell/nmcontact.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmcontact.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmcontact.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmcontact.h pidgin-2.2.0/libpurple/protocols/novell/nmcontact.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmcontact.h	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmcontact.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmevent.c pidgin-2.2.0/libpurple/protocols/novell/nmevent.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmevent.c	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmevent.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmevent.h pidgin-2.2.0/libpurple/protocols/novell/nmevent.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmevent.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmevent.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmfield.c pidgin-2.2.0/libpurple/protocols/novell/nmfield.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmfield.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmfield.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmfield.h pidgin-2.2.0/libpurple/protocols/novell/nmfield.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmfield.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmfield.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmmessage.c pidgin-2.2.0/libpurple/protocols/novell/nmmessage.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmmessage.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmmessage.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmmessage.h pidgin-2.2.0/libpurple/protocols/novell/nmmessage.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmmessage.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmmessage.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmrequest.c pidgin-2.2.0/libpurple/protocols/novell/nmrequest.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmrequest.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmrequest.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmrequest.h pidgin-2.2.0/libpurple/protocols/novell/nmrequest.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmrequest.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmrequest.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmrtf.c pidgin-2.2.0/libpurple/protocols/novell/nmrtf.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmrtf.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmrtf.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
@@ -233,7 +233,7 @@
 	if (status == NMRTF_OK)
 		return g_strdup(ctx->output->str);
 
-	purple_debug_info("novell", "RTF parser failed with error code %d", status);
+	purple_debug_info("novell", "RTF parser failed with error code %d\n", status);
 	return NULL;
 }
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmrtf.h pidgin-2.2.0/libpurple/protocols/novell/nmrtf.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmrtf.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmrtf.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmuser.c pidgin-2.2.0/libpurple/protocols/novell/nmuser.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmuser.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmuser.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmuser.h pidgin-2.2.0/libpurple/protocols/novell/nmuser.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmuser.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmuser.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmuserrecord.c pidgin-2.2.0/libpurple/protocols/novell/nmuserrecord.c
--- pidgin-2.1.1/libpurple/protocols/novell/nmuserrecord.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmuserrecord.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/nmuserrecord.h pidgin-2.2.0/libpurple/protocols/novell/nmuserrecord.h
--- pidgin-2.1.1/libpurple/protocols/novell/nmuserrecord.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/nmuserrecord.h	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/novell/novell.c pidgin-2.2.0/libpurple/protocols/novell/novell.c
--- pidgin-2.1.1/libpurple/protocols/novell/novell.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/novell/novell.c	2007-09-14 00:45:40.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA	02111-1307	USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA	02111-1301	USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/null/Makefile.in pidgin-2.2.0/libpurple/protocols/null/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/null/Makefile.in	2007-08-20 14:13:57.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/null/Makefile.in	2007-09-14 03:31:24.000000000 -0400
@@ -127,6 +127,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -155,6 +157,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -210,14 +214,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -229,7 +231,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -290,6 +291,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -310,6 +312,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/null/nullprpl.c pidgin-2.2.0/libpurple/protocols/null/nullprpl.c
--- pidgin-2.1.1/libpurple/protocols/null/nullprpl.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/null/nullprpl.c	2007-09-14 00:45:40.000000000 -0400
@@ -37,7 +37,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <stdarg.h>
@@ -321,7 +321,7 @@
 }
 
 static void blist_example_menu_item(PurpleBlistNode *node, gpointer userdata) {
-  purple_debug_info("nullprpl", "example menu item clicked on user",
+  purple_debug_info("nullprpl", "example menu item clicked on user\n",
                     ((PurpleBuddy *)node)->name);
 
   purple_notify_info(NULL,  /* plugin handle or PurpleConnection */
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/bstream.c pidgin-2.2.0/libpurple/protocols/oscar/bstream.c
--- pidgin-2.1.1/libpurple/protocols/oscar/bstream.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/bstream.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/COPYING pidgin-2.2.0/libpurple/protocols/oscar/COPYING
--- pidgin-2.1.1/libpurple/protocols/oscar/COPYING	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/COPYING	2007-09-14 00:45:40.000000000 -0400
@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_admin.c pidgin-2.2.0/libpurple/protocols/oscar/family_admin.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_admin.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_admin.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_advert.c pidgin-2.2.0/libpurple/protocols/oscar/family_advert.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_advert.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_advert.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_alert.c pidgin-2.2.0/libpurple/protocols/oscar/family_alert.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_alert.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_alert.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_auth.c pidgin-2.2.0/libpurple/protocols/oscar/family_auth.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_auth.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_auth.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -211,7 +211,7 @@
 
 #ifdef USE_XOR_FOR_ICQ
 	/* If we're signing on an ICQ account then use the older, XOR login method */
-	if (aim_sn_is_icq(sn))
+	if (aim_snvalid_icq(sn))
 		return goddamnicq2(od, conn, sn, password, ci);
 #endif
 
@@ -224,7 +224,7 @@
 
 	/* Truncate ICQ and AOL passwords, if necessary */
 	password_len = strlen(password);
-	if (aim_sn_is_icq(sn) && (password_len > MAXICQPASSLEN))
+	if (aim_snvalid_icq(sn) && (password_len > MAXICQPASSLEN))
 		password_len = MAXICQPASSLEN;
 	else if (truncate_pass && password_len > 8)
 		password_len = 8;
@@ -477,7 +477,7 @@
 		return -EINVAL;
 
 #ifdef USE_XOR_FOR_ICQ
-	if (aim_sn_is_icq(sn))
+	if (aim_snvalid_icq(sn))
 		return goddamnicq(od, conn, sn);
 #endif
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_bart.c pidgin-2.2.0/libpurple/protocols/oscar/family_bart.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_bart.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_bart.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_bos.c pidgin-2.2.0/libpurple/protocols/oscar/family_bos.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_bos.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_bos.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_buddy.c pidgin-2.2.0/libpurple/protocols/oscar/family_buddy.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_buddy.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_buddy.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_chat.c pidgin-2.2.0/libpurple/protocols/oscar/family_chat.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_chat.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_chat.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_chatnav.c pidgin-2.2.0/libpurple/protocols/oscar/family_chatnav.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_chatnav.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_chatnav.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_feedbag.c pidgin-2.2.0/libpurple/protocols/oscar/family_feedbag.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_feedbag.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_feedbag.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -505,13 +505,13 @@
 	 * buddy ID#s, which makes things more efficient.  I think.
 	 */
 
-	/* Additions */
+	/* Deletions */
 	if (!od->ssi.pending) {
-		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
-			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
+		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
+			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
 				n++;
 				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
-				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
+				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
 				new->ack = 0xffff;
 				new->name = NULL;
 				new->item = cur1;
@@ -525,13 +525,13 @@
 		}
 	}
 
-	/* Deletions */
+	/* Additions */
 	if (!od->ssi.pending) {
-		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
-			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
+		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
+			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
 				n++;
 				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
-				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
+				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
 				new->ack = 0xffff;
 				new->name = NULL;
 				new->item = cur1;
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_icbm.c pidgin-2.2.0/libpurple/protocols/oscar/family_icbm.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_icbm.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_icbm.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -1461,7 +1461,7 @@
 		msglen = byte_stream_get16(&mbs);
 		if (msglen > byte_stream_empty(&mbs))
 		{
-			purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.", userinfo->sn);
+			purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
 			break;
 		}
 
@@ -2101,7 +2101,11 @@
 	args.uin = byte_stream_getle32(&meat);
 	args.type = byte_stream_getle8(&meat);
 	args.flags = byte_stream_getle8(&meat);
-	args.msglen = byte_stream_getle16(&meat);
+	if (args.type == 0x1a)
+		/* There seems to be a problem with the length in SMS msgs from server, this fixed it */
+		args.msglen = block->length - 6;
+	else
+		args.msglen = byte_stream_getle16(&meat);
 	args.msg = (gchar *)byte_stream_getraw(&meat, args.msglen);
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_icq.c pidgin-2.2.0/libpurple/protocols/oscar/family_icq.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_icq.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_icq.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -340,7 +340,6 @@
 }
 #endif
 
-#if 0
 /*
  * Send an SMS message.  This is the non-US way.  The US-way is to IM
  * their cell phone number (+19195551234).
@@ -369,6 +368,7 @@
 	const char *timestr;
 	time_t t;
 	struct tm *tm;
+	gchar *stripped;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0015)))
 		return -EINVAL;
@@ -380,22 +380,24 @@
 	tm = gmtime(&t);
 	timestr = purple_utf8_strftime("%a, %d %b %Y %T %Z", tm);
 
+	stripped = purple_markup_strip_html(msg);
+
 	/* The length of xml included the null terminating character */
-	xmllen = 225 + strlen(name) + strlen(msg) + strlen(od->sn) + strlen(alias) + strlen(timestr) + 1;
+	xmllen = 209 + strlen(name) + strlen(stripped) + strlen(od->sn) + strlen(alias) + strlen(timestr) + 1;
 
 	xml = g_new(char, xmllen);
-	snprintf(xml, xmllen, "<icq_sms_message>\n"
-		"\t<destination>%s</destination>\n"
-		"\t<text>%s</text>\n"
-		"\t<codepage>1252</codepage>\n"
-		"\t<senders_UIN>%s</senders_UIN>\n"
-		"\t<senders_name>%s</senders_name>\n"
-		"\t<delivery_receipt>Yes</delivery_receipt>\n"
-		"\t<time>%s</time>\n"
-		"</icq_sms_message>\n",
-		name, msg, od->sn, alias, timestr);
+	snprintf(xml, xmllen, "<icq_sms_message>"
+		"<destination>%s</destination>"
+		"<text>%s</text>"
+		"<codepage>1252</codepage>"
+		"<senders_UIN>%s</senders_UIN>"
+		"<senders_name>%s</senders_name>"
+		"<delivery_receipt>Yes</delivery_receipt>"
+		"<time>%s</time>"
+		"</icq_sms_message>",
+		name, stripped, od->sn, alias, timestr);
 
-	bslen = 37 + xmllen;
+	bslen = 36 + xmllen;
 
 	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
 
@@ -412,7 +414,7 @@
 	byte_stream_putle16(&frame->data, snacid); /* eh. */
 
 	/* From libicq200-0.3.2/src/SNAC-SRV.cpp */
-	byte_stream_putle16(&frame->data, 0x8214);
+	byte_stream_putle16(&frame->data, 0x1482);
 	byte_stream_put16(&frame->data, 0x0001);
 	byte_stream_put16(&frame->data, 0x0016);
 	byte_stream_put32(&frame->data, 0x00000000);
@@ -423,14 +425,15 @@
 	byte_stream_put16(&frame->data, 0x0000);
 	byte_stream_put16(&frame->data, xmllen);
 	byte_stream_putstr(&frame->data, xml);
+	byte_stream_put8(&frame->data, 0x00);
 
 	flap_connection_send(conn, frame);
 
 	g_free(xml);
+	g_free(stripped);
 
 	return 0;
 }
-#endif
 
 static void aim_icq_freeinfo(struct aim_icq_info *info) {
 	int i;
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_invite.c pidgin-2.2.0/libpurple/protocols/oscar/family_invite.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_invite.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_invite.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_locate.c pidgin-2.2.0/libpurple/protocols/oscar/family_locate.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_locate.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_locate.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -636,13 +636,11 @@
 	 * Parse out the Type-Length-Value triples as they're found.
 	 */
 	for (curtlv = 0; curtlv < tlvcnt; curtlv++) {
-		guint16 type;
-		guint8 number, length;
+		guint16 type, length;
 		int endpos;
 
 		type = byte_stream_get16(bs);
-		number = byte_stream_get8(bs);
-		length = byte_stream_get8(bs);
+		length = byte_stream_get16(bs);
 
 		endpos = byte_stream_curpos(bs) + MIN(length, byte_stream_empty(bs));
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_odir.c pidgin-2.2.0/libpurple/protocols/oscar/family_odir.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_odir.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_odir.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_oservice.c pidgin-2.2.0/libpurple/protocols/oscar/family_oservice.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_oservice.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_oservice.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_popup.c pidgin-2.2.0/libpurple/protocols/oscar/family_popup.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_popup.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_popup.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_stats.c pidgin-2.2.0/libpurple/protocols/oscar/family_stats.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_stats.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_stats.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_translate.c pidgin-2.2.0/libpurple/protocols/oscar/family_translate.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_translate.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_translate.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/family_userlookup.c pidgin-2.2.0/libpurple/protocols/oscar/family_userlookup.c
--- pidgin-2.1.1/libpurple/protocols/oscar/family_userlookup.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/family_userlookup.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/flap_connection.c pidgin-2.2.0/libpurple/protocols/oscar/flap_connection.c
--- pidgin-2.1.1/libpurple/protocols/oscar/flap_connection.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/flap_connection.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 #include "oscar.h"
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/libaim.c pidgin-2.2.0/libpurple/protocols/oscar/libaim.c
--- pidgin-2.1.1/libpurple/protocols/oscar/libaim.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/libaim.c	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/libicq.c pidgin-2.2.0/libpurple/protocols/oscar/libicq.c
--- pidgin-2.1.1/libpurple/protocols/oscar/libicq.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/libicq.c	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/Makefile.in pidgin-2.2.0/libpurple/protocols/oscar/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/oscar/Makefile.in	2007-08-20 14:13:57.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/Makefile.in	2007-09-14 03:31:25.000000000 -0400
@@ -205,6 +205,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -233,6 +235,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -288,14 +292,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -307,7 +309,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -368,6 +369,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -388,6 +390,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/misc.c pidgin-2.2.0/libpurple/protocols/oscar/misc.c
--- pidgin-2.1.1/libpurple/protocols/oscar/misc.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/misc.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/msgcookie.c pidgin-2.2.0/libpurple/protocols/oscar/msgcookie.c
--- pidgin-2.1.1/libpurple/protocols/oscar/msgcookie.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/msgcookie.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/odc.c pidgin-2.2.0/libpurple/protocols/oscar/odc.c
--- pidgin-2.1.1/libpurple/protocols/oscar/odc.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/odc.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /* From the oscar PRPL */
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/oft.c pidgin-2.2.0/libpurple/protocols/oscar/oft.c
--- pidgin-2.1.1/libpurple/protocols/oscar/oft.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/oft.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -266,7 +266,7 @@
 	size_t length;
 	ByteStream bs;
 
-	length = 192 + MAX(64, frame->name_length + 1);
+	length = 192 + frame->name_length;
 	byte_stream_new(&bs, length);
 	byte_stream_putraw(&bs, conn->magic, 4);
 	byte_stream_put16(&bs, length);
@@ -300,7 +300,7 @@
 	 * The name can be more than 64 characters, but if it is less than
 	 * 64 characters it is padded with NULLs.
 	 */
-	byte_stream_putraw(&bs, frame->name, MAX(64, frame->name_length + 1));
+	byte_stream_putraw(&bs, frame->name, frame->name_length);
 
 	peer_connection_send(conn, &bs);
 
@@ -340,8 +340,7 @@
 peer_oft_send_done(PeerConnection *conn)
 {
 	conn->xferdata.type = PEER_TYPE_DONE;
-	conn->xferdata.filesleft = 0;
-	conn->xferdata.partsleft = 0;
+	conn->xferdata.rfrcsum = 0xffff0000;
 	conn->xferdata.nrecvd = purple_xfer_get_bytes_sent(conn->xfer);
 	peer_oft_send(conn, &conn->xferdata);
 }
@@ -677,12 +676,12 @@
 	conn->xferdata.rfrcsum = 0xffff0000;
 	conn->xferdata.rfcsum = 0xffff0000;
 	conn->xferdata.recvcsum = 0xffff0000;
-	strncpy((gchar *)conn->xferdata.idstring, "OFT_Windows ICBMFT V1.1 32", 31);
+	strncpy((gchar *)conn->xferdata.idstring, "Cool FileXfer", 31);
 	conn->xferdata.modtime = 0;
 	conn->xferdata.cretime = 0;
 	xfer->filename = g_path_get_basename(xfer->local_filename);
-	conn->xferdata.name = (guchar *)g_strdup(xfer->filename);
-	conn->xferdata.name_length = strlen(xfer->filename);
+	conn->xferdata.name_length = MAX(64, strlen(xfer->filename) + 1);
+	conn->xferdata.name = (guchar *)g_strndup(xfer->filename, conn->xferdata.name_length - 1);
 
 	peer_oft_checksum_file(conn, xfer,
 			peer_oft_checksum_calculated_cb, G_MAXUINT32);
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/oscar.c pidgin-2.2.0/libpurple/protocols/oscar/oscar.c
--- pidgin-2.1.1/libpurple/protocols/oscar/oscar.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/oscar.c	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -358,7 +358,7 @@
 	const char *charset = NULL;
 	char *ret = NULL;
 
-	if(aim_sn_is_icq(purple_account_get_username(account)))
+	if(aim_snvalid_icq(purple_account_get_username(account)))
 		charset = purple_account_get_string(account, "encoding", NULL);
 
 	if(charset && *charset)
@@ -424,7 +424,7 @@
 		charsetstr1 = "UCS-2BE";
 		charsetstr2 = "UTF-8";
 	} else if (charset == AIM_CHARSET_CUSTOM) {
-		if ((sourcesn != NULL) && aim_sn_is_icq(sourcesn))
+		if ((sourcesn != NULL) && aim_snvalid_icq(sourcesn))
 			charsetstr1 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 		else
 			charsetstr1 = "ISO-8859-1";
@@ -495,7 +495,7 @@
 	 * capability, and they are online, then attempt to send
 	 * as UCS-2BE.
 	 */
-	if ((destsn != NULL) && aim_sn_is_icq(destsn))
+	if ((destsn != NULL) && aim_snvalid_icq(destsn))
 		userinfo = aim_locate_finduserinfo(od, destsn);
 
 	if ((userinfo != NULL) && (userinfo->capabilities & OSCAR_CAPABILITY_UNICODE))
@@ -520,7 +520,7 @@
 	 * ICQ then attempt to send as the user specified character encoding.
 	 */
 	charsetstr = "ISO-8859-1";
-	if ((destsn != NULL) && aim_sn_is_icq(destsn))
+	if ((destsn != NULL) && aim_snvalid_icq(destsn))
 		charsetstr = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 
 	/*
@@ -815,7 +815,7 @@
 
 	if (b != NULL) {
 		if (purple_presence_is_online(presence)) {
-			if (aim_sn_is_icq(b->name)) {
+			if (aim_snvalid_icq(b->name)) {
 				PurpleStatus *status = purple_presence_get_active_status(presence);
 				oscar_user_info_add_pair(user_info, _("Status"),	purple_status_get_name(status));
 			}
@@ -1019,7 +1019,7 @@
 			PURPLE_INPUT_READ, flap_connection_recv_cb, conn);
 	if (conn->cookie == NULL)
 	{
-		if (!aim_sn_is_icq(purple_account_get_username(account)))
+		if (!aim_snvalid_icq(purple_account_get_username(account)))
 			/*
 			 * We don't send this when authenticating an ICQ account
 			 * because for some reason ICQ is still using the
@@ -1261,7 +1261,7 @@
 		g_free(buf);
 	}
 
-	if (aim_sn_is_icq((purple_account_get_username(account)))) {
+	if (aim_snvalid_icq((purple_account_get_username(account)))) {
 		od->icq = TRUE;
 	} else {
 		gc->flags |= PURPLE_CONNECTION_HTML;
@@ -1752,7 +1752,7 @@
 		}
 	}
 
-	if (aim_sn_is_icq(info->sn)) {
+	if (aim_snvalid_icq(info->sn)) {
 		if (type & AIM_ICQ_STATE_CHAT)
 			status_id = OSCAR_STATUS_ID_FREE4CHAT;
 		else if (type & AIM_ICQ_STATE_DND)
@@ -1987,7 +1987,7 @@
 	 * Note: There *may* be some clients which send messages as HTML formatted -
 	 *       they need to be special-cased somehow.
 	 */
-	if (aim_sn_is_icq(purple_account_get_username(account)) && aim_sn_is_icq(userinfo->sn)) {
+	if (aim_snvalid_icq(purple_account_get_username(account)) && aim_snvalid_icq(userinfo->sn)) {
 		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
 		gchar *tmp2 = g_markup_escape_text(tmp, -1);
 		g_free(tmp);
@@ -2125,28 +2125,11 @@
 		}
 		else if (args->status == AIM_RENDEZVOUS_CONNECTED)
 		{
-			/* Remote user has accepted our peer request */
-			PeerConnection *conn;
-
-			conn = peer_connection_find_by_cookie(od, userinfo->sn, args->cookie);
 			/*
-			 * If conn is NULL it means we haven't tried to create
-			 * a connection with that user.  They may be trying to
-			 * do something malicious.
+			 * Remote user has accepted our peer request.  If we
+			 * wanted to we could look up the PeerConnection using
+			 * args->cookie, but we don't need to do anything here.
 			 */
-			if (conn != NULL)
-			{
-				if (conn->listenerfd != -1)
-				{
-					/*
-					 * If they are connecting directly to us then
-					 * continue the peer negotiation by
-					 * accepting connections on our listener port.
-					 */
-					conn->watcher_incoming = purple_input_add(conn->listenerfd,
-							PURPLE_INPUT_READ, peer_connection_listen_cb, conn);
-				}
-			}
 		}
 	}
 
@@ -2486,8 +2469,48 @@
 			}
 		} break;
 
-		case 0x1a: { /* Someone has sent you a greeting card or requested buddies? */
-			/* This is boring and silly. */
+		case 0x1a: { /* Handle SMS or someone has sent you a greeting card or requested buddies? */
+			ByteStream qbs;
+			int smstype, taglen, smslen;
+			char *tagstr = NULL, *smsmsg = NULL;
+			xmlnode *xmlroot = NULL, *xmltmp = NULL;
+			gchar *uin = NULL, *message = NULL;
+
+			/* From libicq2000-0.3.2/src/ICQ.cpp */
+			byte_stream_init(&qbs, (guint8 *)args->msg, args->msglen);
+			byte_stream_advance(&qbs, 21);
+			smstype = byte_stream_getle16(&qbs);
+			taglen = byte_stream_getle32(&qbs);
+			tagstr = byte_stream_getstr(&qbs, taglen);
+			byte_stream_advance(&qbs, 3);
+			byte_stream_advance(&qbs, 4);
+			smslen = byte_stream_getle32(&qbs);
+			smsmsg = byte_stream_getstr(&qbs, smslen);
+
+			/* Check if this is an SMS being sent from server */
+			if ((smstype == 0) && (!strcmp(tagstr, "ICQSMS")) && (smsmsg != NULL))
+			{
+				xmlroot = xmlnode_from_str(smsmsg, -1);
+				if (xmlroot != NULL)
+				{
+					xmltmp = xmlnode_get_child(xmlroot, "sender");
+					if (xmltmp != NULL)
+						uin = xmlnode_get_data(xmltmp);
+
+					xmltmp = xmlnode_get_child(xmlroot, "text");
+					if (xmltmp != NULL)
+						message = xmlnode_get_data(xmltmp);
+
+					if ((uin != NULL) && (message != NULL))
+							serv_got_im(gc, uin, message, 0, time(NULL));
+
+					g_free(uin);
+					g_free(message);
+					xmlnode_free(xmlroot);
+				}
+			}
+			g_free(tagstr);
+			g_free(smsmsg);
 		} break;
 
 		default: {
@@ -2963,7 +2986,7 @@
 	if (b == NULL)
 		return 1;
 
-	if (!aim_sn_is_icq(userinfo->sn))
+	if (!aim_snvalid_icq(userinfo->sn))
 	{
 		if (strcmp(purple_buddy_get_name(b), userinfo->sn))
 			serv_got_alias(gc, purple_buddy_get_name(b), userinfo->sn);
@@ -3529,6 +3552,7 @@
 	PurpleConnection *gc;
 	PurpleAccount *account;
 	PurpleStatus *status;
+	PurplePresence *presence;
 	const char *message, *itmsurl;
 	char *tmp;
 	va_list ap;
@@ -3572,7 +3596,8 @@
 	aim_srv_setextrainfo(od, FALSE, 0, TRUE, tmp, itmsurl);
 	g_free(tmp);
 
-	aim_srv_setidle(od, 0);
+	presence = purple_status_get_presence(status);
+	aim_srv_setidle(od, !purple_presence_is_idle(presence) ? 0 : time(NULL) - purple_presence_get_idle_time(presence));
 
 	if (od->icq) {
 		aim_icq_reqofflinemsgs(od);
@@ -4152,6 +4177,17 @@
 	account = purple_connection_get_account(gc);
 	ret = 0;
 
+	if (od->icq && aim_snvalid_sms(name)) {
+		/*
+		 * We're sending to a phone number and this is ICQ,
+		 * so send the message as an SMS using aim_icq_sendsms()
+		 */
+		int ret;
+		purple_debug_info("oscar", "Sending SMS to %s.\n", name);
+		ret = aim_icq_sendsms(od, name, message, purple_account_get_username(account));
+		return (ret >= 0 ? 1 : ret);
+	}
+
 	if (imflags & PURPLE_MESSAGE_AUTO_RESP)
 		tmp1 = purple_str_sub_away_formatters(message, name);
 	else
@@ -4252,12 +4288,12 @@
 		/*
 		 * If we're IMing an SMS user or an ICQ user from an ICQ account, then strip HTML.
 		 */
-		if (aim_sn_is_sms(name)) {
+		if (aim_snvalid_sms(name)) {
 			/* Messaging an SMS (mobile) user */
 			tmp2 = purple_markup_strip_html(tmp1);
 			is_html = FALSE;
-		} else if (aim_sn_is_icq(purple_account_get_username(account))) {
-			if (aim_sn_is_icq(name)) {
+		} else if (aim_snvalid_icq(purple_account_get_username(account))) {
+			if (aim_snvalid_icq(name)) {
 				/* From ICQ to ICQ */
 				tmp2 = purple_markup_strip_html(tmp1);
 				is_html = FALSE;
@@ -4293,7 +4329,7 @@
 
 			purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset);
 
-			purple_debug_info("oscar", "Sending %s as %s because the original was too long.",
+			purple_debug_info("oscar", "Sending %s as %s because the original was too long.\n",
 								  message, (char *)args.msg);
 		}
 
@@ -4319,7 +4355,7 @@
 void oscar_get_info(PurpleConnection *gc, const char *name) {
 	OscarData *od = (OscarData *)gc->proto_data;
 
-	if (od->icq && aim_sn_is_icq(name))
+	if (od->icq && aim_snvalid_icq(name))
 		aim_icq_getallinfo(od, name);
 	else
 		aim_locate_getinfoshort(od, name, 0x00000003);
@@ -4564,7 +4600,7 @@
 	oscar_set_info_and_status(account, FALSE, NULL, TRUE, status);
 
 	/* Set the ICQ status for ICQ accounts only */
-	if (aim_sn_is_icq(purple_account_get_username(account)))
+	if (aim_snvalid_icq(purple_account_get_username(account)))
 		oscar_set_status_icq(account, status);
 }
 
@@ -4774,7 +4810,7 @@
 			   "ssi: syncing local list and server list\n");
 
 	if ((timestamp == 0) || (numitems == 0)) {
-		purple_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing.  This probably means your buddy list is empty.", NULL);
+		purple_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing.  This probably means your buddy list is empty.\n");
 		return 1;
 	}
 
@@ -5377,14 +5413,14 @@
 		purple_plugin_oscar_convert_to_best_encoding(gc, NULL, buf, &buf2, &len, &charset, &charsubset);
 
 		if ((len > c->maxlen) || (len > c->maxvis)) {
-			purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)",
+			purple_debug_warning("oscar", "Could not send %s because (%i > maxlen %i) or (%i > maxvis %i)\n",
 					buf2, len, c->maxlen, len, c->maxvis);
 			g_free(buf);
 			g_free(buf2);
 			return -E2BIG;
 		}
 
-		purple_debug_info("oscar", "Sending %s as %s because the original was too long.",
+		purple_debug_info("oscar", "Sending %s as %s because the original was too long.\n",
 				message, buf2);
 	}
 
@@ -5403,30 +5439,30 @@
 
 const char *oscar_list_icon_icq(PurpleAccount *a, PurpleBuddy *b)
 {
-	if ((b == NULL) || (b->name == NULL) || aim_sn_is_sms(b->name))
+	if ((b == NULL) || (b->name == NULL) || aim_snvalid_sms(b->name))
 	{
-		if (a == NULL || aim_sn_is_icq(purple_account_get_username(a)))
+		if (a == NULL || aim_snvalid_icq(purple_account_get_username(a)))
 			return "icq";
 		else
 			return "aim";
 	}
 
-	if (aim_sn_is_icq(b->name))
+	if (aim_snvalid_icq(b->name))
 		return "icq";
 	return "aim";
 }
 
 const char *oscar_list_icon_aim(PurpleAccount *a, PurpleBuddy *b)
 {
-	if ((b == NULL) || (b->name == NULL) || aim_sn_is_sms(b->name))
+	if ((b == NULL) || (b->name == NULL) || aim_snvalid_sms(b->name))
 	{
-		if (a != NULL && aim_sn_is_icq(purple_account_get_username(a)))
+		if (a != NULL && aim_snvalid_icq(purple_account_get_username(a)))
 			return "icq";
 		else
 			return "aim";
 	}
 
-	if (aim_sn_is_icq(b->name))
+	if (aim_snvalid_icq(b->name))
 		return "icq";
 	return "aim";
 }
@@ -5710,7 +5746,7 @@
 	g_return_val_if_fail(account != NULL, NULL);
 
 	/* Used to flag some statuses as "user settable" or not */
-	is_icq = aim_sn_is_icq(purple_account_get_username(account));
+	is_icq = aim_snvalid_icq(purple_account_get_username(account));
 
 	/* Common status types */
 	/* Really the available message should only be settable for AIM accounts */
@@ -5918,7 +5954,7 @@
 	userinfo = aim_locate_finduserinfo(od, buddy->name);
 	menu = NULL;
 
-	if (od->icq && aim_sn_is_icq(purple_buddy_get_name(buddy)))
+	if (od->icq && aim_snvalid_icq(purple_buddy_get_name(buddy)))
 	{
 		act = purple_menu_action_new(_("Get AIM Info"),
 								   PURPLE_CALLBACK(oscar_get_aim_info_cb),
@@ -6513,7 +6549,7 @@
 			od = (OscarData *)gc->proto_data;
 	}
 
-	return (od != NULL && od->icq && aim_sn_is_icq(purple_account_get_username(account)));
+	return (od != NULL && od->icq && aim_snvalid_icq(purple_account_get_username(account)));
 }
 
 /* TODO: Find somewhere to put this instead of including it in a bunch of places.
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/oscarcommon.h pidgin-2.2.0/libpurple/protocols/oscar/oscarcommon.h
--- pidgin-2.1.1/libpurple/protocols/oscar/oscarcommon.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/oscarcommon.h	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -30,7 +30,7 @@
 #include "version.h"
 #include "notify.h"
 
-#define OSCAR_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define OSCAR_DEFAULT_LOGIN_SERVER "login.messaging.aol.com"
 #define OSCAR_DEFAULT_LOGIN_PORT 5190
 #ifndef _WIN32
 #define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/oscar_data.c pidgin-2.2.0/libpurple/protocols/oscar/oscar_data.c
--- pidgin-2.1.1/libpurple/protocols/oscar/oscar_data.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/oscar_data.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 #include "oscar.h"
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/oscar.h pidgin-2.2.0/libpurple/protocols/oscar/oscar.h
--- pidgin-2.1.1/libpurple/protocols/oscar/oscar.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/oscar.h	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -1320,6 +1320,7 @@
 int aim_icq_getsimpleinfo(OscarData *od, const char *uin);
 int aim_icq_getalias(OscarData *od, const char *uin);
 int aim_icq_getallinfo(OscarData *od, const char *uin);
+int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char *alias);
 
 
 
@@ -1458,8 +1459,8 @@
 char *aimutil_itemindex(char *toSearch, int theindex, char dl);
 
 gboolean aim_snvalid(const char *sn);
-gboolean aim_sn_is_icq(const char *sn);
-gboolean aim_sn_is_sms(const char *sn);
+gboolean aim_snvalid_icq(const char *sn);
+gboolean aim_snvalid_sms(const char *sn);
 int aim_snlen(const char *sn);
 int aim_sncmp(const char *sn1, const char *sn2);
 
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/peer.c pidgin-2.2.0/libpurple/protocols/oscar/peer.c
--- pidgin-2.1.1/libpurple/protocols/oscar/peer.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/peer.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -416,6 +416,25 @@
 	{
 		purple_input_remove(conn->watcher_outgoing);
 		conn->watcher_outgoing = 0;
+		/*
+		 * The buffer is currently empty, so reset the current input
+		 * and output positions to the start of the buffer.  We do
+		 * this so that the next chunk of data that we put into the
+		 * buffer can be read back out of the buffer in one fell swoop.
+		 * Otherwise it gets fragmented and we have to read from the
+		 * second half of the buffer than go back and read the rest of
+		 * the chunk from the first half.
+		 *
+		 * We're using TCP, which is a stream based protocol, so this
+		 * isn't supposed to matter.  However, experience has shown
+		 * that at least the proxy file transfer code in AIM 6.1.41.2
+		 * requires that the entire OFT frame arrive all at once.  If
+		 * the frame is fragmented then AIM freaks out and aborts the
+		 * file transfer.  Somebody should teach those guys how to
+		 * write good TCP code.
+		 */
+		conn->buffer_outgoing->inptr = conn->buffer_outgoing->buffer;
+		conn->buffer_outgoing->outptr = conn->buffer_outgoing->buffer;
 		return;
 	}
 
@@ -652,6 +671,10 @@
 	account = purple_connection_get_account(gc);
 	conn->listenerfd = listenerfd;
 
+	/* Watch for new connections on our listener socket */
+	conn->watcher_incoming = purple_input_add(conn->listenerfd,
+			PURPLE_INPUT_READ, peer_connection_listen_cb, conn);
+
 	/* Send the "please connect to me!" ICBM */
 	bos_conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM);
 	if (bos_conn == NULL)
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/peer.h pidgin-2.2.0/libpurple/protocols/oscar/peer.h
--- pidgin-2.1.1/libpurple/protocols/oscar/peer.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/peer.h	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/peer_proxy.c pidgin-2.2.0/libpurple/protocols/oscar/peer_proxy.c
--- pidgin-2.1.1/libpurple/protocols/oscar/peer_proxy.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/peer_proxy.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 #ifdef HAVE_CONFIG_H
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/rxhandlers.c pidgin-2.2.0/libpurple/protocols/oscar/rxhandlers.c
--- pidgin-2.1.1/libpurple/protocols/oscar/rxhandlers.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/rxhandlers.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 #include "oscar.h"
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/snac.c pidgin-2.2.0/libpurple/protocols/oscar/snac.c
--- pidgin-2.1.1/libpurple/protocols/oscar/snac.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/snac.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/snactypes.h pidgin-2.2.0/libpurple/protocols/oscar/snactypes.h
--- pidgin-2.1.1/libpurple/protocols/oscar/snactypes.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/snactypes.h	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/tlv.c pidgin-2.2.0/libpurple/protocols/oscar/tlv.c
--- pidgin-2.1.1/libpurple/protocols/oscar/tlv.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/tlv.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 #include "oscar.h"
diff -ru pidgin-2.1.1/libpurple/protocols/oscar/util.c pidgin-2.2.0/libpurple/protocols/oscar/util.c
--- pidgin-2.1.1/libpurple/protocols/oscar/util.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/oscar/util.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
 */
 
 /*
@@ -171,7 +171,7 @@
  *
  * @return TRUE if the screen name is valid, FALSE if not.
  */
-static gboolean
+gboolean
 aim_snvalid_icq(const char *sn)
 {
 	int i;
@@ -190,7 +190,7 @@
  *
  * @return TRUE if the screen name is valid, FALSE if not.
  */
-static gboolean
+gboolean
 aim_snvalid_sms(const char *sn)
 {
 	int i;
@@ -221,34 +221,6 @@
 }
 
 /**
- * Determine if a given screen name is an ICQ screen name
- * (i.e. it is composed of only numbers).
- *
- * @param sn A valid AIM or ICQ screen name.
- * @return TRUE if the screen name is an ICQ screen name.  Otherwise
- *         FALSE is returned.
- */
-gboolean
-aim_sn_is_icq(const char *sn)
-{
-	return aim_snvalid_icq(sn);
-}
-
-/**
- * Determine if a given screen name is an SMS number
- * (i.e. it begins with a +).
- *
- * @param sn A valid AIM or ICQ screen name.
- * @return TRUE if the screen name is an SMS number.  Otherwise
- *         FALSE is returned.
- */
-gboolean
-aim_sn_is_sms(const char *sn)
-{
-	return (sn[0] == '+');
-}
-
-/**
  * This takes two screen names and compares them using the rules
  * on screen names for AIM/AOL.  Mainly, this means case and space
  * insensitivity (all case differences and spacing differences are
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_info.c pidgin-2.2.0/libpurple/protocols/qq/buddy_info.c
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_info.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_info.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_info.h pidgin-2.2.0/libpurple/protocols/qq/buddy_info.h
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_info.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_info.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_BUDDY_INFO_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_list.c pidgin-2.2.0/libpurple/protocols/qq/buddy_list.c
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_list.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_list.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <string.h>
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_list.h pidgin-2.2.0/libpurple/protocols/qq/buddy_list.h
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_list.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_list.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_BUDDY_LIST_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_opt.c pidgin-2.2.0/libpurple/protocols/qq/buddy_opt.c
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_opt.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_opt.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_opt.h pidgin-2.2.0/libpurple/protocols/qq/buddy_opt.h
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_opt.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_opt.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_BUDDY_OPT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_status.c pidgin-2.2.0/libpurple/protocols/qq/buddy_status.c
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_status.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_status.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <string.h>
diff -ru pidgin-2.1.1/libpurple/protocols/qq/buddy_status.h pidgin-2.2.0/libpurple/protocols/qq/buddy_status.h
--- pidgin-2.1.1/libpurple/protocols/qq/buddy_status.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/buddy_status.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/qq/char_conv.c pidgin-2.2.0/libpurple/protocols/qq/char_conv.c
--- pidgin-2.1.1/libpurple/protocols/qq/char_conv.c	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/char_conv.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/char_conv.h pidgin-2.2.0/libpurple/protocols/qq/char_conv.h
--- pidgin-2.1.1/libpurple/protocols/qq/char_conv.h	2007-08-20 14:12:49.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/char_conv.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_CHAR_CONV_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/crypt.c pidgin-2.2.0/libpurple/protocols/qq/crypt.c
--- pidgin-2.1.1/libpurple/protocols/qq/crypt.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/crypt.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  *
  * QQ encryption algorithm
diff -ru pidgin-2.1.1/libpurple/protocols/qq/crypt.h pidgin-2.2.0/libpurple/protocols/qq/crypt.h
--- pidgin-2.1.1/libpurple/protocols/qq/crypt.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/crypt.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_CRYPT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/file_trans.c pidgin-2.2.0/libpurple/protocols/qq/file_trans.c
--- pidgin-2.1.1/libpurple/protocols/qq/file_trans.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/file_trans.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifdef _WIN32
diff -ru pidgin-2.1.1/libpurple/protocols/qq/file_trans.h pidgin-2.2.0/libpurple/protocols/qq/file_trans.h
--- pidgin-2.1.1/libpurple/protocols/qq/file_trans.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/file_trans.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_QQ_FILE_TRANS_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group.c pidgin-2.2.0/libpurple/protocols/qq/group.c
--- pidgin-2.1.1/libpurple/protocols/qq/group.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_conv.c pidgin-2.2.0/libpurple/protocols/qq/group_conv.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_conv.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_conv.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_conv.h pidgin-2.2.0/libpurple/protocols/qq/group_conv.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_conv.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_conv.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_CONV_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_find.c pidgin-2.2.0/libpurple/protocols/qq/group_find.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_find.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_find.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "qq.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_find.h pidgin-2.2.0/libpurple/protocols/qq/group_find.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_find.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_find.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_FIND_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_free.c pidgin-2.2.0/libpurple/protocols/qq/group_free.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_free.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_free.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_free.h pidgin-2.2.0/libpurple/protocols/qq/group_free.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_free.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_free.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_FREE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group.h pidgin-2.2.0/libpurple/protocols/qq/group.h
--- pidgin-2.1.1/libpurple/protocols/qq/group.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_im.c pidgin-2.2.0/libpurple/protocols/qq/group_im.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_im.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_im.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_im.h pidgin-2.2.0/libpurple/protocols/qq/group_im.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_im.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_im.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_IM_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_info.c pidgin-2.2.0/libpurple/protocols/qq/group_info.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_info.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_info.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_info.h pidgin-2.2.0/libpurple/protocols/qq/group_info.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_info.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_info.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_INFO_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_internal.c pidgin-2.2.0/libpurple/protocols/qq/group_internal.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_internal.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_internal.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_internal.h pidgin-2.2.0/libpurple/protocols/qq/group_internal.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_internal.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_internal.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_HASH_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_join.c pidgin-2.2.0/libpurple/protocols/qq/group_join.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_join.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_join.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_join.h pidgin-2.2.0/libpurple/protocols/qq/group_join.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_join.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_join.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_JOIN_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_network.c pidgin-2.2.0/libpurple/protocols/qq/group_network.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_network.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_network.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_network.h pidgin-2.2.0/libpurple/protocols/qq/group_network.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_network.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_network.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_NETWORK_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_opt.c pidgin-2.2.0/libpurple/protocols/qq/group_opt.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_opt.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_opt.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "qq.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_opt.h pidgin-2.2.0/libpurple/protocols/qq/group_opt.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_opt.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_opt.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_OPT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_search.c pidgin-2.2.0/libpurple/protocols/qq/group_search.c
--- pidgin-2.1.1/libpurple/protocols/qq/group_search.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_search.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/group_search.h pidgin-2.2.0/libpurple/protocols/qq/group_search.h
--- pidgin-2.1.1/libpurple/protocols/qq/group_search.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/group_search.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_GROUP_SEARCH_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/header_info.c pidgin-2.2.0/libpurple/protocols/qq/header_info.c
--- pidgin-2.1.1/libpurple/protocols/qq/header_info.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/header_info.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -35,6 +35,7 @@
 #define QQ_CLIENT_0B35 0x0b35	/* GB QQ2003iii build 0304 (offical release) */
 #define QQ_CLIENT_0B37 0x0b37	/* GB QQ2003iii build 0304 (April 05 updates) */
 #define QQ_CLIENT_0E1B 0x0e1b	/* QQ2005? QQ2006? */
+#define QQ_CLIENT_0E35 0x0e35	/* EN QQ2005 V05.0.200.020 */
 #define QQ_CLIENT_0F15 0x0f15	/* QQ2006 Spring Festival build */
 #define QQ_CLIENT_0F5F 0x0f5f	/* QQ2006 final build */
 
@@ -115,6 +116,8 @@
 		return "GB QQ2003iii build 0304 (April 5 update)";
 	case QQ_CLIENT_0E1B:
 		return "QQ2005 or QQ2006";
+	case QQ_CLIENT_0E35:
+		return "En QQ2005 V05.0.200.020";
 	case QQ_CLIENT_0F15:
 		return "QQ2006 Spring Festival build";
 	case QQ_CLIENT_0F5F:
diff -ru pidgin-2.1.1/libpurple/protocols/qq/header_info.h pidgin-2.2.0/libpurple/protocols/qq/header_info.h
--- pidgin-2.1.1/libpurple/protocols/qq/header_info.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/header_info.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_HEADER_INFO_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/im.c pidgin-2.2.0/libpurple/protocols/qq/im.c
--- pidgin-2.1.1/libpurple/protocols/qq/im.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/im.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/im.h pidgin-2.2.0/libpurple/protocols/qq/im.h
--- pidgin-2.1.1/libpurple/protocols/qq/im.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/im.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_IM_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/keep_alive.c pidgin-2.2.0/libpurple/protocols/qq/keep_alive.c
--- pidgin-2.1.1/libpurple/protocols/qq/keep_alive.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/keep_alive.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  *
  * OICQ encryption algorithm
diff -ru pidgin-2.1.1/libpurple/protocols/qq/keep_alive.h pidgin-2.2.0/libpurple/protocols/qq/keep_alive.h
--- pidgin-2.1.1/libpurple/protocols/qq/keep_alive.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/keep_alive.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/qq/login_logout.c pidgin-2.2.0/libpurple/protocols/qq/login_logout.c
--- pidgin-2.1.1/libpurple/protocols/qq/login_logout.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/login_logout.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
@@ -380,33 +380,33 @@
 
 void qq_process_request_login_token_reply(guint8 *buf, gint buf_len, PurpleConnection *gc)
 {
-        qq_data *qd;
+	qq_data *qd;
 	gchar *hex_dump;
 
-        g_return_if_fail(buf != NULL && buf_len != 0);
+	g_return_if_fail(buf != NULL && buf_len != 0);
 
-        qd = (qq_data *) gc->proto_data;
+	qd = (qq_data *) gc->proto_data;
 
 	if (buf[0] == QQ_REQUEST_LOGIN_TOKEN_REPLY_OK) {
 		if (buf[1] != buf_len-2) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"Malformed login token reply packet. Packet specifies length of %d, actual length is %d\n", buf[1], buf_len-2);
 			purple_debug(PURPLE_DEBUG_INFO, "QQ",
 					"Attempting to proceed with the actual packet length.\n");
 		}
 		hex_dump = hex_dump_to_str(buf+2, buf_len-2);
 		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-                                   "<<< got a token with %d bytes -> [default] decrypt and dump\n%s", buf_len-2, hex_dump);
+				"<<< got a token with %d bytes -> [default] decrypt and dump\n%s", buf_len-2, hex_dump);
 		qq_send_packet_login(gc, buf_len-2, buf+2);
 	} else {
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown request login token reply code : %d\n", buf[0]);
 		hex_dump = hex_dump_to_str(buf, buf_len);
-                purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-           		           ">>> %d bytes -> [default] decrypt and dump\n%s",
-	                           buf_len, hex_dump);
-               		try_dump_as_gbk(buf, buf_len);
+		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+				">>> %d bytes -> [default] decrypt and dump\n%s",
+				buf_len, hex_dump);
+		try_dump_as_gbk(buf, buf_len);
 		purple_connection_error(gc, _("Error requesting login token"));
-	}		
+	}
 	g_free(hex_dump);
 }
 
@@ -463,11 +463,11 @@
 			default:
 				purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown reply code: %d\n", data[0]);
 				hex_dump = hex_dump_to_str(data, len);
-		                purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-                		           ">>> %d bytes -> [default] decrypt and dump\n%s",
-		                           buf_len, hex_dump);
+				purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+						">>> %d bytes -> [default] decrypt and dump\n%s",
+						buf_len, hex_dump);
 				g_free(hex_dump);
-                		try_dump_as_gbk(data, len);
+				try_dump_as_gbk(data, len);
 
 				ret = QQ_LOGIN_REPLY_MISC_ERROR;
 			}
diff -ru pidgin-2.1.1/libpurple/protocols/qq/login_logout.h pidgin-2.2.0/libpurple/protocols/qq/login_logout.h
--- pidgin-2.1.1/libpurple/protocols/qq/login_logout.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/login_logout.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_LOGIN_LOGOUT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/Makefile.in pidgin-2.2.0/libpurple/protocols/qq/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/qq/Makefile.in	2007-08-20 14:13:58.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/Makefile.in	2007-09-14 03:31:25.000000000 -0400
@@ -188,6 +188,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -216,6 +218,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -271,14 +275,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -290,7 +292,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -351,6 +352,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -371,6 +373,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/qq/packet_parse.c pidgin-2.2.0/libpurple/protocols/qq/packet_parse.c
--- pidgin-2.1.1/libpurple/protocols/qq/packet_parse.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/packet_parse.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <string.h>
diff -ru pidgin-2.1.1/libpurple/protocols/qq/packet_parse.h pidgin-2.2.0/libpurple/protocols/qq/packet_parse.h
--- pidgin-2.1.1/libpurple/protocols/qq/packet_parse.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/packet_parse.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_PACKET_PARSE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/qq.c pidgin-2.2.0/libpurple/protocols/qq/qq.c
--- pidgin-2.1.1/libpurple/protocols/qq/qq.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/qq.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/qq.h pidgin-2.2.0/libpurple/protocols/qq/qq.h
--- pidgin-2.1.1/libpurple/protocols/qq/qq.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/qq.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_QQ_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/qq_proxy.c pidgin-2.2.0/libpurple/protocols/qq/qq_proxy.c
--- pidgin-2.1.1/libpurple/protocols/qq/qq_proxy.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/qq_proxy.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "cipher.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/qq_proxy.h pidgin-2.2.0/libpurple/protocols/qq/qq_proxy.h
--- pidgin-2.1.1/libpurple/protocols/qq/qq_proxy.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/qq_proxy.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_PROXY_H
diff -ru pidgin-2.1.1/libpurple/protocols/qq/recv_core.c pidgin-2.2.0/libpurple/protocols/qq/recv_core.c
--- pidgin-2.1.1/libpurple/protocols/qq/recv_core.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/recv_core.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/recv_core.h pidgin-2.2.0/libpurple/protocols/qq/recv_core.h
--- pidgin-2.1.1/libpurple/protocols/qq/recv_core.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/recv_core.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_RECV_CORE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/send_core.c pidgin-2.2.0/libpurple/protocols/qq/send_core.c
--- pidgin-2.1.1/libpurple/protocols/qq/send_core.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/send_core.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/send_core.h pidgin-2.2.0/libpurple/protocols/qq/send_core.h
--- pidgin-2.1.1/libpurple/protocols/qq/send_core.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/send_core.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_SEND_CORE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/send_file.c pidgin-2.2.0/libpurple/protocols/qq/send_file.c
--- pidgin-2.1.1/libpurple/protocols/qq/send_file.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/send_file.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "qq.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/send_file.h pidgin-2.2.0/libpurple/protocols/qq/send_file.h
--- pidgin-2.1.1/libpurple/protocols/qq/send_file.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/send_file.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_QQ_SEND_FILE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/sendqueue.c pidgin-2.2.0/libpurple/protocols/qq/sendqueue.c
--- pidgin-2.1.1/libpurple/protocols/qq/sendqueue.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/sendqueue.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/sendqueue.h pidgin-2.2.0/libpurple/protocols/qq/sendqueue.h
--- pidgin-2.1.1/libpurple/protocols/qq/sendqueue.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/sendqueue.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_SEND_QUEUE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/sys_msg.c pidgin-2.2.0/libpurple/protocols/qq/sys_msg.c
--- pidgin-2.1.1/libpurple/protocols/qq/sys_msg.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/sys_msg.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
@@ -166,7 +166,7 @@
 		message = g_strdup_printf(_("You have been added by %s"), from);
 		_qq_sys_msg_log_write(gc, message, from);
 		purple_request_action(gc, NULL, message,
-				    _("Would like to add him?"), 2,
+				    _("Would you like to add him?"), 2,
 					purple_connection_get_account(gc), name, NULL,
 					g, 3,
 				    _("Cancel"), NULL,
diff -ru pidgin-2.1.1/libpurple/protocols/qq/sys_msg.h pidgin-2.2.0/libpurple/protocols/qq/sys_msg.h
--- pidgin-2.1.1/libpurple/protocols/qq/sys_msg.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/sys_msg.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_SYS_MSG_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/udp_proxy_s5.c pidgin-2.2.0/libpurple/protocols/qq/udp_proxy_s5.c
--- pidgin-2.1.1/libpurple/protocols/qq/udp_proxy_s5.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/udp_proxy_s5.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "debug.h"
@@ -285,7 +285,7 @@
 	unsigned char buf[512];
 	int i;
 	struct PHB *phb = data;
-	unsigned int len;
+	socklen_t len;
 	int error = ETIMEDOUT;
 
 	purple_debug(PURPLE_DEBUG_INFO, "socks5 proxy", "Connected.\n");
diff -ru pidgin-2.1.1/libpurple/protocols/qq/udp_proxy_s5.h pidgin-2.2.0/libpurple/protocols/qq/udp_proxy_s5.h
--- pidgin-2.1.1/libpurple/protocols/qq/udp_proxy_s5.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/udp_proxy_s5.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_UDP_PROXY_S5_H_
diff -ru pidgin-2.1.1/libpurple/protocols/qq/utils.c pidgin-2.2.0/libpurple/protocols/qq/utils.c
--- pidgin-2.1.1/libpurple/protocols/qq/utils.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/utils.c	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "cipher.h"
diff -ru pidgin-2.1.1/libpurple/protocols/qq/utils.h pidgin-2.2.0/libpurple/protocols/qq/utils.h
--- pidgin-2.1.1/libpurple/protocols/qq/utils.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/qq/utils.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _QQ_MY_UTILS_H_
diff -ru pidgin-2.1.1/libpurple/protocols/sametime/Makefile.in pidgin-2.2.0/libpurple/protocols/sametime/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/sametime/Makefile.in	2007-08-20 14:13:58.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/sametime/Makefile.in	2007-09-14 03:31:25.000000000 -0400
@@ -143,6 +143,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -171,6 +173,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -226,14 +230,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -245,7 +247,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -306,6 +307,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -326,6 +328,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/sametime/sametime.c pidgin-2.2.0/libpurple/protocols/sametime/sametime.c
--- pidgin-2.1.1/libpurple/protocols/sametime/sametime.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/sametime/sametime.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
 
   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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301,
   USA.
 */
 
@@ -3183,13 +3183,12 @@
   PurpleConnection *gc;
   struct mwPurplePluginData *pd;
   struct mwAwareIdBlock t = { mwAware_USER, b->name, NULL };
-  const char *ret;
+  const char *ret = NULL;
 
-  gc = b->account->gc;
-  pd = gc->proto_data;
+  if ((gc = purple_account_get_connection(b->account))
+      && (pd = gc->proto_data))
+    ret = mwServiceAware_getText(pd->srvc_aware, &t);
 
-  ret = mwServiceAware_getText(pd->srvc_aware, &t);
-  
   return (ret && g_utf8_validate(ret, -1, NULL)) ? g_markup_escape_text(ret, -1): NULL;
 }
 
@@ -3242,17 +3241,17 @@
 
 static void mw_prpl_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) {
   PurpleConnection *gc;
-  struct mwPurplePluginData *pd;
+  struct mwPurplePluginData *pd = NULL;
   struct mwAwareIdBlock idb = { mwAware_USER, b->name, NULL };
 
-  const char *message;
+  const char *message = NULL;
   const char *status;
   char *tmp;
 
-  gc = b->account->gc;
-  pd = gc->proto_data;
+  if ((gc = purple_account_get_connection(b->account))
+      && (pd = gc->proto_data))
+     message = mwServiceAware_getText(pd->srvc_aware, &idb);
 
-  message = mwServiceAware_getText(pd->srvc_aware, &idb);
   status = status_text(b);
 
   if(message != NULL && g_utf8_validate(message, -1, NULL) && purple_utf8_strcasecmp(status, message)) {
@@ -3264,7 +3263,7 @@
 	purple_notify_user_info_add_pair(user_info, _("Status"), status);
   }
 
-  if(full) {
+  if(full && pd != NULL) {
     tmp = user_supports_text(pd->srvc_aware, b->name);
     if(tmp) {
 	  purple_notify_user_info_add_pair(user_info, _("Supports"), tmp);
diff -ru pidgin-2.1.1/libpurple/protocols/silc/Makefile.in pidgin-2.2.0/libpurple/protocols/silc/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/silc/Makefile.in	2007-08-20 14:13:58.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc/Makefile.in	2007-09-14 03:31:25.000000000 -0400
@@ -148,6 +148,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -176,6 +178,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -231,14 +235,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -250,7 +252,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -311,6 +312,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -331,6 +333,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/silc/Makefile.mingw pidgin-2.2.0/libpurple/protocols/silc/Makefile.mingw
--- pidgin-2.1.1/libpurple/protocols/silc/Makefile.mingw	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -8,8 +8,8 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 TARGET = libsilc
-NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
-			$(SILC_TOOLKIT)/lib/silcclient.dll
+NEEDED_DLLS =		$(SILC_TOOLKIT)/bin/libsilc-1-1-2.dll \
+			$(SILC_TOOLKIT)/bin/libsilcclient-1-1-2.dll
 TYPE = PLUGIN
 
 # Static or Plugin...
diff -ru pidgin-2.1.1/libpurple/protocols/silc/ops.c pidgin-2.2.0/libpurple/protocols/silc/ops.c
--- pidgin-2.1.1/libpurple/protocols/silc/ops.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc/ops.c	2007-09-06 00:09:41.000000000 -0400
@@ -868,7 +868,7 @@
 				/* Find buddy by nickname */
 				b = purple_find_buddy(sg->account, client_entry->nickname);
 				if (!b) {
-					purple_debug_warning("silc", "WATCH for %s, unknown buddy",
+					purple_debug_warning("silc", "WATCH for %s, unknown buddy\n",
 						client_entry->nickname);
 					break;
 				}
diff -ru pidgin-2.1.1/libpurple/protocols/silc/silc.c pidgin-2.2.0/libpurple/protocols/silc/silc.c
--- pidgin-2.1.1/libpurple/protocols/silc/silc.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc/silc.c	2007-08-30 00:36:32.000000000 -0400
@@ -1975,9 +1975,6 @@
 silc_log_set_debug_string("*client*");
 #endif
 
-#ifdef _WIN32
-	silc_net_win32_init();
-#endif
 }
 
 PURPLE_INIT_PLUGIN(silc, init_plugin, info);
diff -ru pidgin-2.1.1/libpurple/protocols/silc10/Makefile.in pidgin-2.2.0/libpurple/protocols/silc10/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/silc10/Makefile.in	2007-08-20 14:13:58.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc10/Makefile.in	2007-09-14 03:31:26.000000000 -0400
@@ -148,6 +148,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -176,6 +178,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -231,14 +235,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -250,7 +252,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -311,6 +312,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -331,6 +333,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/silc10/ops.c pidgin-2.2.0/libpurple/protocols/silc10/ops.c
--- pidgin-2.1.1/libpurple/protocols/silc10/ops.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/silc10/ops.c	2007-09-06 00:09:41.000000000 -0400
@@ -902,7 +902,7 @@
 				/* Find buddy by nickname */
 				b = purple_find_buddy(sg->account, client_entry->nickname);
 				if (!b) {
-					purple_debug_warning("silc", "WATCH for %s, unknown buddy",
+					purple_debug_warning("silc", "WATCH for %s, unknown buddy\n",
 						client_entry->nickname);
 					break;
 				}
diff -ru pidgin-2.1.1/libpurple/protocols/simple/Makefile.in pidgin-2.2.0/libpurple/protocols/simple/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/simple/Makefile.in	2007-08-20 14:13:59.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/simple/Makefile.in	2007-09-14 03:31:26.000000000 -0400
@@ -140,6 +140,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -168,6 +170,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -223,14 +227,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -242,7 +244,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -303,6 +304,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -323,6 +325,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/simple/simple.c pidgin-2.2.0/libpurple/protocols/simple/simple.c
--- pidgin-2.1.1/libpurple/protocols/simple/simple.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/simple/simple.c	2007-09-14 00:45:40.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -693,19 +693,24 @@
 }
 
 static void do_register_exp(struct simple_account_data *sip, int expire) {
-	char *uri = g_strdup_printf("sip:%s", sip->servername);
-	char *to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
-	char *contact = get_contact(sip);
-	char *hdr = g_strdup_printf("Contact: %s\r\nExpires: %d\r\n", contact, expire);
-	g_free(contact);
+	char *uri, *to, *contact, *hdr;
 
-	sip->registerstatus = 1;
+	/* Set our default expiration to 900, 
+	 * as done in the initialization of the simple_account_data
+	 * structure.
+	 */
+	if (!expire)
+		expire = 900;
 
-	if(expire) {
-		sip->reregister = time(NULL) + expire - 50;
-	} else {
-		sip->reregister = time(NULL) + 600;
-	}
+	sip->reregister = time(NULL) + expire - 50;
+
+	uri = g_strdup_printf("sip:%s", sip->servername);
+	to = g_strdup_printf("sip:%s@%s", sip->username, sip->servername);
+	contact = get_contact(sip);
+	hdr = g_strdup_printf("Contact: %s\r\nExpires: %d\r\n", contact, expire);
+	g_free(contact);
+
+	sip->registerstatus = SIMPLE_REGISTER_SENT;
 
 	send_sip_request(sip->gc, "REGISTER", uri, to, hdr, "", NULL,
 		process_register_response);
@@ -1001,7 +1006,7 @@
 		found = TRUE;
 	}
 	if(!found) {
-		purple_debug_info("simple", "got unknown mime-type");
+		purple_debug_info("simple", "got unknown mime-type\n");
 		send_sip_response(sip->gc, msg, 415, "Unsupported media type", NULL);
 	}
 	g_free(from);
@@ -1013,12 +1018,12 @@
 	purple_debug(PURPLE_DEBUG_MISC, "simple", "in process register response response: %d\n", msg->response);
 	switch (msg->response) {
 		case 200:
-			if(sip->registerstatus < 3) { /* registered */
+			if(sip->registerstatus < SIMPLE_REGISTER_COMPLETE) { /* registered */
 				if(purple_account_get_bool(sip->account, "dopublish", TRUE)) {
 					send_publish(sip);
 				}
 			}
-			sip->registerstatus = 3;
+			sip->registerstatus = SIMPLE_REGISTER_COMPLETE;
 			purple_connection_set_state(sip->gc, PURPLE_CONNECTED);
 
 			/* get buddies from blist */
@@ -1032,16 +1037,29 @@
 
 			break;
 		case 401:
-			if(sip->registerstatus != 2) {
+			if(sip->registerstatus != SIMPLE_REGISTER_RETRY) {
 				purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
-				if(sip->registrar.retries > 3) {
+				if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
+					purple_debug_info("simple", "Setting wants_to_die to true.\n");
 					sip->gc->wants_to_die = TRUE;
 					purple_connection_error(sip->gc, _("Incorrect password."));
 					return TRUE;
 				}
 				tmp = sipmsg_find_header(msg, "WWW-Authenticate");
 				fill_auth(sip, tmp, &sip->registrar);
-				sip->registerstatus = 2;
+				sip->registerstatus = SIMPLE_REGISTER_RETRY;
+				do_register(sip);
+			}
+			break;
+		default:
+			if (sip->registerstatus != SIMPLE_REGISTER_RETRY) {
+				purple_debug_info("simple", "Unrecognized return code for REGISTER.\n");
+				if (sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
+					sip->gc->wants_to_die = TRUE;
+					purple_connection_error(sip->gc, _("Unknown server response."));
+					return TRUE;
+				}
+				sip->registerstatus = SIMPLE_REGISTER_RETRY;
 				do_register(sip);
 			}
 			break;
@@ -1066,6 +1084,7 @@
 	if(!pidf) {
 		purple_debug_info("simple", "process_incoming_notify: no parseable pidf\n");
 		g_free(from);
+		send_sip_response(sip->gc, msg, 200, "OK", NULL);
 		return;
 	}
 
@@ -1326,13 +1345,29 @@
 				} else {
 					sip->proxy.retries = 0;
 					if(!strcmp(trans->msg->method, "REGISTER")) {
-						if(msg->response == 401) sip->registrar.retries++;
-						else sip->registrar.retries = 0;
+
+						/* This is encountered when a REGISTER request was ...
+						 */
+						if(msg->response == 401) {
+							/* denied until further authentication was provided. */
+							sip->registrar.retries++;
+						}
+						else if (msg->response != 200) {
+							/* denied for some other reason! */
+							sip->registrar.retries++;
+						}
+						else {
+							/* accepted! */
+							sip->registrar.retries = 0;
+						}
 					} else {
 						if(msg->response == 401) {
+							/* This is encountered when a generic (MESSAGE, NOTIFY, etc)
+							 * was denied until further authorization is provided.
+							 */
 							gchar *resend, *auth, *ptmp;
 
-							if(sip->registrar.retries > 4) return;
+							if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) return;
 							sip->registrar.retries++;
 
 							ptmp = sipmsg_find_header(msg, "WWW-Authenticate");
@@ -1346,6 +1381,11 @@
 							/* resend request */
 							sendout_pkt(sip->gc, resend);
 							g_free(resend);
+						} else {
+							/* Reset any count of retries that may have
+							 * accumulated in the above branch.
+							 */
+							sip->registrar.retries = 0;
 						}
 					}
 					if(trans->callback) {
@@ -1695,7 +1735,8 @@
 
 	if(sip) {
 		/* unregister */
-		do_register_exp(sip, 0);
+		if (sip->registerstatus == SIMPLE_REGISTER_COMPLETE)
+			do_register_exp(sip, 0);
 		connection_free_all(sip);
 
 		if (sip->query_data != NULL)
diff -ru pidgin-2.1.1/libpurple/protocols/simple/simple.h pidgin-2.2.0/libpurple/protocols/simple/simple.h
--- pidgin-2.1.1/libpurple/protocols/simple/simple.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/simple/simple.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_SIMPLE_H
@@ -37,6 +37,11 @@
 #include "sipmsg.h"
 
 #define SIMPLE_BUF_INC 1024
+#define SIMPLE_REGISTER_RETRY_MAX 2
+
+#define SIMPLE_REGISTER_SENT 1
+#define SIMPLE_REGISTER_RETRY 2
+#define SIMPLE_REGISTER_COMPLETE 3
 
 struct sip_dialog {
 	gchar *ourtag;
diff -ru pidgin-2.1.1/libpurple/protocols/simple/sipmsg.c pidgin-2.2.0/libpurple/protocols/simple/sipmsg.c
--- pidgin-2.1.1/libpurple/protocols/simple/sipmsg.c	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/simple/sipmsg.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/simple/sipmsg.h pidgin-2.2.0/libpurple/protocols/simple/sipmsg.h
--- pidgin-2.1.1/libpurple/protocols/simple/sipmsg.h	2007-08-20 14:12:50.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/simple/sipmsg.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_SIPMSG_H
diff -ru pidgin-2.1.1/libpurple/protocols/toc/Makefile.in pidgin-2.2.0/libpurple/protocols/toc/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/toc/Makefile.in	2007-08-20 14:13:59.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/toc/Makefile.in	2007-09-14 03:31:26.000000000 -0400
@@ -138,6 +138,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -166,6 +168,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -221,14 +225,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -240,7 +242,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -301,6 +302,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -321,6 +323,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/toc/PROTOCOL pidgin-2.2.0/libpurple/protocols/toc/PROTOCOL
--- pidgin-2.1.1/libpurple/protocols/toc/PROTOCOL	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/toc/PROTOCOL	2007-09-14 00:45:40.000000000 -0400
@@ -12,7 +12,7 @@
 #
 #   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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301, USA.
 
 # Note from Jim Duchek, former libpurple maintainer -- this may not be
 # the latest version of this document, I provide it as a service.
diff -ru pidgin-2.1.1/libpurple/protocols/toc/toc.c pidgin-2.2.0/libpurple/protocols/toc/toc.c
--- pidgin-2.1.1/libpurple/protocols/toc/toc.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/toc/toc.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/Makefile.in pidgin-2.2.0/libpurple/protocols/yahoo/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/yahoo/Makefile.in	2007-08-20 14:13:59.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/Makefile.in	2007-09-14 03:31:26.000000000 -0400
@@ -162,6 +162,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -190,6 +192,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -245,14 +249,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -264,7 +266,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -325,6 +326,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -345,6 +347,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/util.c pidgin-2.2.0/libpurple/protocols/yahoo/util.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/util.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/util.c	2007-09-14 00:45:40.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_aliases.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_aliases.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_aliases.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_aliases.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_aliases.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_aliases.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_aliases.h	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_aliases.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -238,14 +238,18 @@
 		case 8: /* how many online buddies we have */
 			break;
 		case 7: /* the current buddy */
-			if (name && f) /* update the previous buddy before changing the variables */
-				yahoo_update_status(gc, name, f);
-			name = pair->value;
-			if (name && g_utf8_validate(name, -1, NULL))
+			/* update the previous buddy before changing the variables */
+			if (f) {
+				if (message)
+					yahoo_friend_set_status_message(f, yahoo_string_decode(gc, message, unicode));
+				if (name)
+					yahoo_update_status(gc, name, f);
+			}
+			name = message = NULL;
+			f = NULL;
+			if (pair->value && g_utf8_validate(pair->value, -1, NULL)) {
+				name = pair->value;
 				f = yahoo_friend_find_or_new(gc, name);
-			else {
-				f = NULL;
-				name = NULL;
 			}
 			break;
 		case 10: /* state */
@@ -568,6 +572,11 @@
 				purple_debug_info("yahoo", "Setting protocol to %d\n", f->protocol);
 			}
 			break;
+		case 317: /* Stealth Setting */
+			if (f && (strtol(pair->value, NULL, 10) == 2)) {
+				f->presence = YAHOO_PRESENCE_PERM_OFFLINE;
+			}
+			break;
 		/* case 242: */ /* this seems related to 241 */
 			/* break; */
 		}
@@ -768,7 +777,13 @@
 			if (bud)
 				yahoo_update_status(gc, from, f);
 		}
+	} else if (!g_ascii_strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) {
+                PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, from, gc->account);
+		char *buf = g_strdup_printf(_("%s has sent you a webcam invite, which is not yet supported."), from);
+		purple_conversation_write(conv, NULL, buf, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL));
+		g_free(buf);
 	}
+
 }
 
 
@@ -884,6 +899,8 @@
 			PurpleConversation *c;
 			char *username, *str;
 
+			str = NULL;
+
 			account = purple_connection_get_account(gc);
 			c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
 
@@ -892,9 +909,7 @@
 			else
 				username = g_markup_escape_text(im->from, -1);
 
-			str = g_strdup_printf(_("%s just sent you a Buzz!"), username);
-
-			purple_conversation_write(c, NULL, str, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, im->time);
+			serv_got_attention(gc, username, YAHOO_BUZZ);
 
 			g_free(username);
 			g_free(str);
@@ -949,7 +964,6 @@
 	PurpleConnection *gc;
 	char *id;
 	char *who;
-	char *msg;
 	int protocol;
 };
 
@@ -964,10 +978,9 @@
 	yahoo_packet_hash(pkt, "ssiii", 1, add_req->id, 5, add_req->who, 241, add_req->protocol,
 	                  13, 1, 334, 0);
 	yahoo_packet_send_and_free(pkt, yd);
-	
+
 	g_free(add_req->id);
 	g_free(add_req->who);
-	g_free(add_req->msg);
 	g_free(add_req);
 }
 
@@ -976,19 +989,20 @@
 	struct yahoo_packet *pkt;
 	char *encoded_msg = NULL;
 	struct yahoo_data *yd = add_req->gc->proto_data;
+	PurpleAccount *account = purple_connection_get_account(add_req->gc);
 
-	if (msg)
+	if (msg && *msg)
 		encoded_msg = yahoo_string_encode(add_req->gc, msg, NULL);
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_REJECTCONTACT,
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15,
 			YAHOO_STATUS_AVAILABLE, 0);
 
-	yahoo_packet_hash(pkt, "sss",
-			1, purple_normalize(add_req->gc->account,
-				purple_account_get_username(
-					purple_connection_get_account(
-						add_req->gc))),
-			7, add_req->who,
+	yahoo_packet_hash(pkt, "ssiiis",
+			1, purple_normalize(account, purple_account_get_username(account)),
+			5, add_req->who,
+			13, 2,
+			334, 0,
+			97, 1,
 			14, encoded_msg ? encoded_msg : "");
 
 	yahoo_packet_send_and_free(pkt, yd);
@@ -997,7 +1011,6 @@
 
 	g_free(add_req->id);
 	g_free(add_req->who);
-	g_free(add_req->msg);
 	g_free(add_req);
 }
 
@@ -1018,54 +1031,140 @@
 			add_req);
 }
 
+static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
+{
+	char *notify_msg;
+	struct yahoo_data *yd = gc->proto_data;
+
+	if (who == NULL)
+		return;
+
+	if (reason != NULL) {
+		char *msg2 = yahoo_string_decode(gc, reason, FALSE);
+		notify_msg = g_strdup_printf(_("%s has (retroactively) denied your request to add them to your list for the following reason: %s."), who, msg2);
+		g_free(msg2);
+	} else
+		notify_msg = g_strdup_printf(_("%s has (retroactively) denied your request to add them to your list."), who);
+
+	purple_notify_info(gc, NULL, _("Add buddy rejected"), notify_msg);
+	g_free(notify_msg);
+
+	g_hash_table_remove(yd->friends, who);
+	purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL); /* FIXME: make this set not on list status instead */
+	/* TODO: Shouldn't we remove the buddy from our local list? */
+}
+
 static void yahoo_buddy_auth_req_15(PurpleConnection *gc, struct yahoo_packet *pkt) {
-	struct yahoo_add_request *add_req;
-	char *msg = NULL;
 	GSList *l = pkt->hash;
+	const char *msg = NULL;
 
-	add_req = g_new0(struct yahoo_add_request, 1);
-	add_req->gc = gc;
+	/* Buddy authorized/declined our addition */
+	if (pkt->status == 1) {
+		const char *who = NULL;
+		int response = 0;
 
-	while (l) {
-		struct yahoo_pair *pair = l->data;
+		while (l) {
+			struct yahoo_pair *pair = l->data;
 
-		switch (pair->key) {
-		case 5:
-			add_req->id = g_strdup(pair->value);
-			break;
-		case 4:
-			add_req->who = g_strdup(pair->value);
-			break;
-		case 241:
-			add_req->protocol = strtol(pair->value, NULL, 10);
-			break;
-		case 14:
-			msg = pair->value;
-			break;
+			switch (pair->key) {
+			case 4:
+				who = pair->value;
+				break;
+			case 13:
+				response = strtol(pair->value, NULL, 10);
+				break;
+			case 14:
+				msg = pair->value;
+				break;
+			}
+			l = l->next;
 		}
-		l = l->next;
+
+		if (response == 1) /* Authorized */
+			purple_debug_info("yahoo", "Received authorization from buddy '%s'.\n", who ? who : "(Unknown Buddy)");
+		else if (response == 2) { /* Declined */
+			purple_debug_info("yahoo", "Received authorization decline from buddy '%s'.\n", who ? who : "(Unknown Buddy)");
+			yahoo_buddy_denied_our_add(gc, who, msg);
+		} else
+			purple_debug_error("yahoo", "Received unknown authorization response of %d from buddy '%s'.\n", response, who ? who : "(Unknown Buddy)");
+
 	}
+	/* Buddy requested authorization to add us. */
+	else if (pkt->status == 3) {
+		struct yahoo_add_request *add_req;
+		const char *firstname = NULL, *lastname = NULL;
 
-	if (add_req->id) {
-		if (msg)
-			add_req->msg = yahoo_string_decode(gc, msg, FALSE);
+		add_req = g_new0(struct yahoo_add_request, 1);
+		add_req->gc = gc;
 
-		/* DONE! this is almost exactly the same as what MSN does,
-		 * this should probably be moved to the core.
-		 */
-		 purple_account_request_authorization(purple_connection_get_account(gc), add_req->who, add_req->id,
-                                                    NULL, add_req->msg, purple_find_buddy(purple_connection_get_account(gc),add_req->who) != NULL,
+		while (l) {
+			struct yahoo_pair *pair = l->data;
+
+			switch (pair->key) {
+			case 4:
+				add_req->who = g_strdup(pair->value);
+				break;
+			case 5:
+				add_req->id = g_strdup(pair->value);
+				break;
+			case 14:
+				msg = pair->value;
+				break;
+			case 216:
+				firstname = pair->value;
+				break;
+			case 241:
+				add_req->protocol = strtol(pair->value, NULL, 10);
+				break;
+			case 254:
+				lastname = pair->value;
+				break;
+
+			}
+			l = l->next;
+		}
+
+		if (add_req->id && add_req->who) {
+			char *alias = NULL, *dec_msg = NULL;
+
+			if (!yahoo_privacy_check(gc, add_req->who)) {
+				purple_debug_misc("yahoo", "Auth. request from %s dropped and automatically denied due to privacy settings!\n",
+						  add_req->who);
+				yahoo_buddy_add_deny_cb(add_req, NULL);
+				return;
+			}
+
+			if (msg)
+				dec_msg = yahoo_string_decode(gc, msg, FALSE);
+
+			if (firstname && lastname)
+				alias = g_strdup_printf("%s %s", firstname, lastname);
+			else if (firstname)
+				alias = g_strdup(firstname);
+			else if (lastname)
+				alias = g_strdup(lastname);
+
+			/* DONE! this is almost exactly the same as what MSN does,
+			 * this should probably be moved to the core.
+			 */
+			 purple_account_request_authorization(purple_connection_get_account(gc), add_req->who, add_req->id,
+						    alias, dec_msg, purple_find_buddy(purple_connection_get_account(gc), add_req->who) != NULL,
 						    yahoo_buddy_add_authorize_cb,
 						    yahoo_buddy_add_deny_reason_cb,
-                                                    add_req);
+						    add_req);
+			g_free(alias);
+			g_free(dec_msg);
+		} else {
+			g_free(add_req->id);
+			g_free(add_req->who);
+			g_free(add_req);
+		}
 	} else {
-		g_free(add_req->id);
-		g_free(add_req->who);
-		/*g_free(add_req->msg);*/
-		g_free(add_req);
+		purple_debug_error("yahoo", "Received authorization of unknown status (%d).\n", pkt->status);
 	}
 }
 
+/* I don't think this happens anymore in Version 15 */
 static void yahoo_buddy_added_us(PurpleConnection *gc, struct yahoo_packet *pkt) {
 	struct yahoo_add_request *add_req;
 	char *msg = NULL;
@@ -1093,33 +1192,41 @@
 		l = l->next;
 	}
 
-	if (add_req->id) {
+	if (add_req->id && add_req->who) {
+		char *dec_msg = NULL;
+
+		if (!yahoo_privacy_check(gc, add_req->who)) {
+			purple_debug_misc("yahoo", "Auth. request from %s dropped and automatically denied due to privacy settings!\n",
+					  add_req->who);
+			yahoo_buddy_add_deny_cb(add_req, NULL);
+			return;
+		}
+
 		if (msg)
-			add_req->msg = yahoo_string_decode(gc, msg, FALSE);
+			dec_msg = yahoo_string_decode(gc, msg, FALSE);
 
 		/* DONE! this is almost exactly the same as what MSN does,
 		 * this should probably be moved to the core.
 		 */
 		 purple_account_request_authorization(purple_connection_get_account(gc), add_req->who, add_req->id,
-                                                    NULL, add_req->msg, purple_find_buddy(purple_connection_get_account(gc),add_req->who) != NULL,
+                                                    NULL, dec_msg, purple_find_buddy(purple_connection_get_account(gc),add_req->who) != NULL,
 						    yahoo_buddy_add_authorize_cb,
 						    yahoo_buddy_add_deny_reason_cb,
                                                     add_req);
+		g_free(dec_msg);
 	} else {
 		g_free(add_req->id);
 		g_free(add_req->who);
-		/*g_free(add_req->msg);*/
 		g_free(add_req);
 	}
 }
 
-static void yahoo_buddy_denied_our_add(PurpleConnection *gc, struct yahoo_packet *pkt)
+/* I have no idea if this every gets called in version 15 */
+static void yahoo_buddy_denied_our_add_old(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	char *who = NULL;
 	char *msg = NULL;
 	GSList *l = pkt->hash;
-	GString *buf = NULL;
-	struct yahoo_data *yd = gc->proto_data;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -1135,22 +1242,7 @@
 		l = l->next;
 	}
 
-	if (who) {
-		char *msg2;
-		buf = g_string_sized_new(0);
-		if (!msg) {
-			g_string_printf(buf, _("%s has (retroactively) denied your request to add them to your list."), who);
-		} else {
-			msg2 = yahoo_string_decode(gc, msg, FALSE);
-			g_string_printf(buf, _("%s has (retroactively) denied your request to add them to your list for the following reason: %s."), who, msg2);
-			g_free(msg2);
-		}
-		purple_notify_info(gc, NULL, _("Add buddy rejected"), buf->str);
-		g_string_free(buf, TRUE);
-		g_hash_table_remove(yd->friends, who);
-		purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL); /* FIXME: make this set not on list status instead */
-		/* TODO: Shouldn't we remove the buddy from our local list? */
-	}
+	yahoo_buddy_denied_our_add(gc, who, msg);
 }
 
 static void yahoo_process_contact(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -1163,7 +1255,7 @@
 		yahoo_buddy_added_us(gc, pkt);
 		break;
 	case 7:
-		yahoo_buddy_denied_our_add(gc, pkt);
+		yahoo_buddy_denied_our_add_old(gc, pkt);
 		break;
 	default:
 		break;
@@ -2265,7 +2357,7 @@
 		break;
 	case YAHOO_SERVICE_AUTH_REQ_15:
 		yahoo_buddy_auth_req_15(gc, pkt);
-		break;	       
+		break;
 	case YAHOO_SERVICE_ADDBUDDY:
 		yahoo_process_addbuddy(gc, pkt);
 		break;
@@ -2846,7 +2938,7 @@
 	purple_connection_set_display_name(gc, purple_account_get_username(account));
 
 	yd->fd = -1;
-	yd->txhandler = -1;
+	yd->txhandler = 0;
 	/* TODO: Is there a good grow size for the buffer? */
 	yd->txbuf = purple_circ_buffer_new(0);
 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
@@ -2933,6 +3025,11 @@
 	if (yd->ycht)
 		ycht_connection_close(yd->ycht);
 
+	g_free(yd->pending_chat_room);
+	g_free(yd->pending_chat_id);
+	g_free(yd->pending_chat_topic);
+	g_free(yd->pending_chat_goto);
+
 	g_free(yd);
 	gc->proto_data = NULL;
 }
@@ -3344,7 +3441,7 @@
 
 	if (!set_cookie) {
 		struct yahoo_data *yd = gc->proto_data;
-		purple_debug_error("yahoo", "No mail login token; forwarding to login screen.");
+		purple_debug_error("yahoo", "No mail login token; forwarding to login screen.\n");
 		url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL);
 	}
 
@@ -3403,7 +3500,7 @@
 static void yahoo_show_chat_goto(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input(gc, NULL, _("Join who in chat?"), NULL,
+	purple_request_input(gc, NULL, _("Join whom in chat?"), NULL,
 					   "", FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(yahoo_chat_goto),
 					   _("Cancel"), NULL,
@@ -3723,10 +3820,10 @@
 	struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;
 	struct yahoo_packet *pkt;
 	PurpleGroup *g;
-	char *group = NULL;
-	char *group2 = NULL;
+	const char *group = NULL;
+	char *group2;
 	YahooFriend *f;
-	
+
 	if (!yd->logged_in)
 		return;
 
@@ -3734,7 +3831,7 @@
 		return;
 
 	f = yahoo_friend_find(gc, purple_buddy_get_name(buddy));
-	
+
 	if (foo)
 		group = foo->name;
 	if (!group) {
@@ -3934,17 +4031,13 @@
 
 static PurpleCmdRet
 yahoopurple_cmd_buzz(PurpleConversation *c, const gchar *cmd, gchar **args, gchar **error, void *data) {
-
 	PurpleAccount *account = purple_conversation_get_account(c);
-	const char *username = purple_account_get_username(account);
 
 	if (*args && args[0])
 		return PURPLE_CMD_RET_FAILED;
 
-	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
-	           "Sending <ding> on account %s to buddy %s.\n", username, c->name);
-	purple_conv_im_send(PURPLE_CONV_IM(c), "<ding>");
-	purple_conversation_write(c, NULL, _("You have just sent a Buzz!"), PURPLE_MESSAGE_SYSTEM, time(NULL));
+	serv_send_attention(account->gc, c->name, YAHOO_BUZZ);
+
 	return PURPLE_CMD_RET_OK;
 }
 
@@ -3994,6 +4087,40 @@
 {
 	return TRUE;
 }
+	
+gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type)
+{
+	PurpleConversation *c;
+
+	c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, 
+			username, gc->account);
+
+	g_return_val_if_fail(c != NULL, FALSE);
+
+	purple_debug(PURPLE_DEBUG_INFO, "yahoo",
+	           "Sending <ding> on account %s to buddy %s.\n", username, c->name);
+	purple_conv_im_send_with_flags(PURPLE_CONV_IM(c), "<ding>", PURPLE_MESSAGE_INVISIBLE);
+
+	return TRUE;
+}
+
+GList *yahoo_attention_types(PurpleAccount *account)
+{
+	PurpleAttentionType *attn;
+	static GList *list = NULL;
+
+	if (!list) {
+		/* Yahoo only supports one attention command: the 'buzz'. */
+		/* This is index number YAHOO_BUZZ. */
+		attn = g_new0(PurpleAttentionType, 1);
+		attn->name = _("Buzz");
+		attn->incoming_description = _("%s has buzzed you!");
+		attn->outgoing_description = _("Buzzing %s...");
+		list = g_list_append(list, attn);
+	} 
+
+	return list;
+}
 
 /************************** Plugin Initialization ****************************/
 static void
@@ -4202,11 +4329,12 @@
 	&yahoo_whiteboard_prpl_ops,
 	NULL, /* send_raw */
 	NULL, /* roomlist_room_serialize */
+	NULL, /* unregister_user */
+
+	yahoo_send_attention,
+	yahoo_attention_types,
 
 	/* padding */
-	NULL,
-	NULL,
-	NULL,
 	NULL
 };
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoochat.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoochat.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoochat.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoochat.c	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -55,15 +55,24 @@
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;
+	const char *rll;
 
 	if (yd->wm) {
 		ycht_connection_open(gc);
 		return;
 	}
 
+	rll = purple_account_get_string(purple_connection_get_account(gc),
+								  "room_list_locale", YAHOO_ROOMLIST_LOCALE);
+
 	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE,0);
-	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
-	                  109, purple_connection_get_display_name(gc), 6, "abcde");
+	yahoo_packet_hash(pkt, "sssss",
+					  109, purple_connection_get_display_name(gc),
+					  1, purple_connection_get_display_name(gc),
+					  6, "abcde",
+					/* I'm not sure this is the correct way to set this. */
+					  98, rll,
+					  135, "ym8.1.0.415");
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
@@ -124,6 +133,7 @@
 		case 1: /* us, but we already know who we are */
 			break;
 		case 57:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 50: /* inviter */
@@ -135,6 +145,7 @@
 			g_string_append_printf(members, "%s\n", pair->value);
 			break;
 		case 58:
+			g_free(msg);
 			msg = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 13: /* ? */
@@ -144,27 +155,28 @@
 
 	if (!room) {
 		g_string_free(members, TRUE);
+		g_free(msg);
 		return;
 	}
 
-	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	g_hash_table_replace(components, g_strdup("room"), room);
-	if (msg)
-		g_hash_table_replace(components, g_strdup("topic"), msg);
-	g_hash_table_replace(components, g_strdup("type"), g_strdup("Conference"));
-	if (members) {
-		g_hash_table_replace(components, g_strdup("members"), g_strdup(members->str));
-	}
-	if (!yahoo_privacy_check(gc, who) || 
-		(purple_account_get_bool(purple_connection_get_account(gc), "ignore_invites", FALSE))) {
+	if (!yahoo_privacy_check(gc, who) ||
+			(purple_account_get_bool(purple_connection_get_account(gc), "ignore_invites", FALSE))) {
 		purple_debug_info("yahoo",
 		    "Invite to conference %s from %s has been dropped.\n", room, who);
+		g_free(room);
+		g_free(msg);
 		g_string_free(members, TRUE);
 		return;
 	}
+
+	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	g_hash_table_replace(components, g_strdup("room"), room);
+	if (msg)
+		g_hash_table_replace(components, g_strdup("topic"), msg);
+	g_hash_table_replace(components, g_strdup("type"), g_strdup("Conference"));
+	g_hash_table_replace(components, g_strdup("members"), g_string_free(members, FALSE));
 	serv_got_chat_invite(gc, room, who, msg, components);
 
-	g_string_free(members, TRUE);
 }
 
 void yahoo_process_conference_decline(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -179,20 +191,21 @@
 
 		switch (pair->key) {
 		case 57:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 54:
 			who = pair->value;
 			break;
 		case 14:
+			g_free(msg);
 			msg = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		}
 	}
 	if (!yahoo_privacy_check(gc, who)) {
 		g_free(room);
-		if (msg != NULL)
-			g_free(msg);
+		g_free(msg);
 		return;
 	}
 
@@ -208,8 +221,7 @@
 		}
 
 		g_free(room);
-		if (msg)
-			g_free(msg);
+		g_free(msg);
 	}
 }
 
@@ -225,6 +237,7 @@
 
 		switch (pair->key) {
 		case 57:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 53:
@@ -253,6 +266,7 @@
 
 		switch (pair->key) {
 		case 57:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 56:
@@ -275,7 +289,6 @@
 	char *room = NULL;
 	char *who = NULL;
 	char *msg = NULL;
-	char *msg2;
 	int utf8 = 0;
 	PurpleConversation *c;
 
@@ -284,6 +297,7 @@
 
 		switch (pair->key) {
 		case 57:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 3:
@@ -298,28 +312,82 @@
 		}
 	}
 
-		if (room && who && msg) {
-			msg2 = yahoo_string_decode(gc, msg, utf8);
-			c = yahoo_find_conference(gc, room);
-			if (!c)
-				return;
-			msg = yahoo_codes_to_html(msg2);
-			serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(c)), who, 0, msg, time(NULL));
-			g_free(msg);
-			g_free(msg2);
-		}
-		if (room)
+	if (room && who && msg) {
+		char *msg2;
+
+		c = yahoo_find_conference(gc, room);
+		if (!c) {
 			g_free(room);
+			return;
+		}
+
+		msg2 = yahoo_string_decode(gc, msg, utf8);
+		msg = yahoo_codes_to_html(msg2);
+		serv_got_chat_in(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(c)), who, 0, msg, time(NULL));
+		g_free(msg);
+		g_free(msg2);
+	}
+
+	g_free(room);
 }
 
+static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *room, const char *topic, const char *id)
+{
+	struct yahoo_data *yd = gc->proto_data;
+	struct yahoo_packet *pkt;
+	char *room2;
+	gboolean utf8 = TRUE;
+
+	if (yd->wm) {
+		g_return_if_fail(yd->ycht != NULL);
+		ycht_chat_join(yd->ycht, room);
+		return;
+	}
+
+	/* apparently room names are always utf8, or else always not utf8,
+	 * so we don't have to actually pass the flag in the packet. Or something. */
+	room2 = yahoo_string_encode(gc, room, &utf8);
+
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, 0);
+	yahoo_packet_hash(pkt, "ssss",
+						1, purple_connection_get_display_name(gc),
+						104, room2,
+						62, "2",
+						129, id ? id : "0");
+	yahoo_packet_send_and_free(pkt, yd);
+	g_free(room2);
+}
 
 /* this is a confirmation of yahoo_chat_online(); */
 void yahoo_process_chat_online(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
 
-	if (pkt->status == 1)
+	if (pkt->status == 1) {
 		yd->chat_online = 1;
+
+		/* We need to goto a user in chat */
+		if (yd->pending_chat_goto) {
+			struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
+			yahoo_packet_hash(pkt, "sss",
+				109, yd->pending_chat_goto,
+				1, purple_connection_get_display_name(gc),
+				62, "2");
+			yahoo_packet_send_and_free(pkt, yd);
+		} else if (yd->pending_chat_room) {
+			yahoo_chat_join(gc, purple_connection_get_display_name(gc), yd->pending_chat_room,
+				yd->pending_chat_topic, yd->pending_chat_id);
+		}
+
+		g_free(yd->pending_chat_room);
+		yd->pending_chat_room = NULL;
+		g_free(yd->pending_chat_id);
+		yd->pending_chat_id = NULL;
+		g_free(yd->pending_chat_topic);
+		yd->pending_chat_topic = NULL;
+		g_free(yd->pending_chat_goto);
+		yd->pending_chat_goto = NULL;
+	}
 }
 
 /* this is basicly the opposite of chat_online */
@@ -339,6 +407,14 @@
 
 	if (pkt->status == 1) {
 		yd->chat_online = 0;
+		g_free(yd->pending_chat_room);
+		yd->pending_chat_room = NULL;
+		g_free(yd->pending_chat_id);
+		yd->pending_chat_id = NULL;
+		g_free(yd->pending_chat_topic);
+		yd->pending_chat_topic = NULL;
+		g_free(yd->pending_chat_goto);
+		yd->pending_chat_goto = NULL;
 		if (yd->in_chat)
 			yahoo_c_leave(gc, YAHOO_CHAT_ID);
 	}
@@ -383,9 +459,11 @@
 		switch (pair->key) {
 
 		case 104:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, TRUE);
 			break;
 		case 105:
+			g_free(topic);
 			topic = yahoo_string_decode(gc, pair->value, TRUE);
 			break;
 		case 128:
@@ -444,8 +522,11 @@
 			purple_conversation_set_name(c, room);
 
 			c = serv_got_joined_chat(gc, YAHOO_CHAT_ID, room);
-			if (topic)
+			if (topic) {
 				purple_conv_chat_set_topic(PURPLE_CONV_CHAT(c), NULL, topic);
+				/* Also print the topic to the backlog so that the captcha link is clickable */
+				purple_conv_chat_write(PURPLE_CONV_CHAT(c), "", topic, PURPLE_MESSAGE_SYSTEM, time(NULL));
+			}
 			yd->in_chat = 1;
 			yd->chat_name = g_strdup(room);
 			purple_conv_chat_add_users(PURPLE_CONV_CHAT(c), members, NULL, flags, FALSE);
@@ -455,14 +536,22 @@
 			g_free(tmpmsg);
 		} else {
 			c = serv_got_joined_chat(gc, YAHOO_CHAT_ID, room);
-			if (topic)
+			if (topic) {
 				purple_conv_chat_set_topic(PURPLE_CONV_CHAT(c), NULL, topic);
+				/* Also print the topic to the backlog so that the captcha link is clickable */
+				purple_conv_chat_write(PURPLE_CONV_CHAT(c), "", topic, PURPLE_MESSAGE_SYSTEM, time(NULL));
+			}
 			yd->in_chat = 1;
 			yd->chat_name = g_strdup(room);
 			purple_conv_chat_add_users(PURPLE_CONV_CHAT(c), members, NULL, flags, FALSE);
 		}
 		g_list_free(flags);
 	} else if (c) {
+		if (topic) {
+			const char *cur_topic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(c));
+			if (cur_topic == NULL || strcmp(cur_topic, topic) != 0)
+				purple_conv_chat_set_topic(PURPLE_CONV_CHAT(c), NULL, topic);
+		}
 		yahoo_chat_add_users(PURPLE_CONV_CHAT(c), members);
 	}
 
@@ -496,8 +585,10 @@
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 
-		if (pair->key == 104)
+		if (pair->key == 104) {
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, TRUE);
+		}
 		if (pair->key == 109)
 			who = pair->value;
 	}
@@ -528,6 +619,7 @@
 			utf8 = strtol(pair->value, NULL, 10);
 			break;
 		case 104:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, TRUE);
 			break;
 		case 109:
@@ -582,6 +674,7 @@
 
 		switch (pair->key) {
 		case 104:
+			g_free(room);
 			room = yahoo_string_decode(gc, pair->value, TRUE);
 			break;
 		case 129: /* room id? */
@@ -589,6 +682,7 @@
 		case 126: /* ??? */
 			break;
 		case 117:
+			g_free(msg);
 			msg = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 119:
@@ -602,24 +696,21 @@
 	if (room && who) {
 		GHashTable *components;
 
-		components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-		g_hash_table_replace(components, g_strdup("room"), g_strdup(room));
 		if (!yahoo_privacy_check(gc, who) ||
-			(purple_account_get_bool(purple_connection_get_account(gc), "ignore_invites", FALSE))) {
-			purple_debug_info("yahoo",
-			"Invite to room %s from %s has been dropped.\n", room, who);
-			if (room != NULL)
-				g_free(room);
-			if (msg != NULL)
-				g_free(msg);
+				(purple_account_get_bool(purple_connection_get_account(gc), "ignore_invites", FALSE))) {
+			purple_debug_info("yahoo", "Invite to room %s from %s has been dropped.\n", room, who);
+			g_free(room);
+			g_free(msg);
 			return;
 		}
+
+		components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+		g_hash_table_replace(components, g_strdup("room"), g_strdup(room));
 		serv_got_chat_invite(gc, room, who, msg, components);
 	}
-	if (room)
-		g_free(room);
-	if (msg)
-		g_free(msg);
+
+	g_free(room);
+	g_free(msg);
 }
 
 void yahoo_process_chat_goto(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -640,7 +731,7 @@
 	GList *w;
 
 	purple_debug_misc("yahoo", "leaving conference %s\n", room);
-	
+
 	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, 0);
 
 	yahoo_packet_hash_str(pkt, 1, dn);
@@ -732,7 +823,7 @@
 			continue;
 		yahoo_packet_hash(pkt, "ss", 52, name, 53, name);
 	}
-	
+
 	yahoo_packet_send_and_free(pkt, yd);
 	g_free(msg2);
 }
@@ -782,6 +873,14 @@
 	yahoo_packet_send_and_free(pkt, yd);
 
 	yd->chat_online = 0;
+	g_free(yd->pending_chat_room);
+	yd->pending_chat_room = NULL;
+	g_free(yd->pending_chat_id);
+	yd->pending_chat_id = NULL;
+	g_free(yd->pending_chat_topic);
+	yd->pending_chat_topic = NULL;
+	g_free(yd->pending_chat_goto);
+	yd->pending_chat_goto = NULL;
 	g_free(eroom);
 }
 
@@ -828,29 +927,6 @@
 	return 0;
 }
 
-static void yahoo_chat_join(PurpleConnection *gc, const char *dn, const char *room, const char *topic)
-{
-	struct yahoo_data *yd = gc->proto_data;
-	struct yahoo_packet *pkt;
-	char *room2;
-	gboolean utf8 = TRUE;
-
-	if (yd->wm) {
-		g_return_if_fail(yd->ycht != NULL);
-		ycht_chat_join(yd->ycht, room);
-		return;
-	}
-
-	/* apparently room names are always utf8, or else always not utf8,
-	 * so we don't have to actually pass the flag in the packet. Or something. */
-	room2 = yahoo_string_encode(gc, room, &utf8);
-
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash(pkt, "ssss", 1, purple_connection_get_display_name(gc),
-	                  62, "2", 104, room2, 129, "0");
-	yahoo_packet_send_and_free(pkt, yd);
-	g_free(room2);
-}
 
 static void yahoo_chat_invite(PurpleConnection *gc, const char *dn, const char *buddy,
 							const char *room, const char *msg)
@@ -891,8 +967,18 @@
 		return;
 	}
 
-	if (!yd->chat_online)
+	if (!yd->chat_online) {
 		yahoo_chat_online(gc);
+		g_free(yd->pending_chat_room);
+		yd->pending_chat_room = NULL;
+		g_free(yd->pending_chat_id);
+		yd->pending_chat_id = NULL;
+		g_free(yd->pending_chat_topic);
+		yd->pending_chat_topic = NULL;
+		g_free(yd->pending_chat_goto);
+		yd->pending_chat_goto = g_strdup(name);
+		return;
+	}
 
 	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
 	yahoo_packet_hash(pkt, "sss", 109, name, 1, purple_connection_get_display_name(gc), 62, "2");
@@ -987,8 +1073,7 @@
 void yahoo_c_join(PurpleConnection *gc, GHashTable *data)
 {
 	struct yahoo_data *yd;
-	char *room, *topic, *members, *type;
-	int id;
+	char *room, *topic, *type;
 	PurpleConversation *c;
 
 	yd = (struct yahoo_data *) gc->proto_data;
@@ -1003,9 +1088,9 @@
 	if (!topic)
 		topic = "";
 
-	members = g_hash_table_lookup(data, "members");
-
 	if ((type = g_hash_table_lookup(data, "type")) && !strcmp(type, "Conference")) {
+		int id;
+		const char *members = g_hash_table_lookup(data, "members");
 		id = yd->conf_id++;
 		c = serv_got_joined_chat(gc, id, room);
 		yd->confs = g_slist_prepend(yd->confs, c);
@@ -1013,13 +1098,27 @@
 		yahoo_conf_join(yd, c, purple_connection_get_display_name(gc), room, topic, members);
 		return;
 	} else {
-		if (yd->in_chat)
+		const char *id;
+		/*if (yd->in_chat)
 			yahoo_chat_leave(gc, room,
 					purple_connection_get_display_name(gc),
-					FALSE);
-		if (!yd->chat_online)
+					FALSE);*/
+
+		id = g_hash_table_lookup(data, "id");
+
+		if (!yd->chat_online) {
 			yahoo_chat_online(gc);
-		yahoo_chat_join(gc, purple_connection_get_display_name(gc), room, topic);
+			g_free(yd->pending_chat_room);
+			yd->pending_chat_room = g_strdup(room);
+			g_free(yd->pending_chat_id);
+			yd->pending_chat_id = g_strdup(id);
+			g_free(yd->pending_chat_topic);
+			yd->pending_chat_topic = g_strdup(topic);
+			g_free(yd->pending_chat_goto);
+			yd->pending_chat_goto = NULL;
+		} else {
+			yahoo_chat_join(gc, purple_connection_get_display_name(gc), room, topic, id);
+		}
 		return;
 	}
 }
@@ -1147,16 +1246,13 @@
 
 		for (i = 0; anames[i]; i++) {
 			if (!strcmp(anames[i], "id")) {
-				if (s->room.id)
-					g_free(s->room.id);
+				g_free(s->room.id);
 				s->room.id = g_strdup(avalues[i]);
 			} else if (!strcmp(anames[i], "name")) {
-				if (s->room.name)
-					g_free(s->room.name);
+				g_free(s->room.name);
 				s->room.name = g_strdup(avalues[i]);
 			} else if (!strcmp(anames[i], "topic")) {
-				if (s->room.topic)
-					g_free(s->room.topic);
+				g_free(s->room.topic);
 				s->room.topic = g_strdup(avalues[i]);
 			} else if (!strcmp(anames[i], "type")) {
 				if (!strcmp("yahoo", avalues[i]))
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoochat.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoochat.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoochat.h	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoochat.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _YAHOOCHAT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_crypt.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_crypt.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_crypt.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_crypt.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02111-1301 USA.  */
 
 /* warmenhoven took this file and made it work with the md5.[ch] we
  * already had. isn't that lovely. people should just use linux or
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_crypt.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_crypt.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_crypt.h	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_crypt.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _YAHOO_CRYPT_H_
 #define _YAHOO_CRYPT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_doodle.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_doodle.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_doodle.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_doodle.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_doodle.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_doodle.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_doodle.h	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_doodle.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _YAHOO_DOODLE_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_filexfer.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_filexfer.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_filexfer.c	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_filexfer.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_filexfer.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_filexfer.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_filexfer.h	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_filexfer.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _YAHOO_FILEXFER_H_
 #define _YAHOO_FILEXFER_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_friend.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_friend.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_friend.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_friend.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -196,6 +196,8 @@
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = NULL;
 	YahooFriend *f;
+	const char *thirtyone, *thirteen;
+	int service = -1;
 
 	if (!yd->logged_in)
 		return;
@@ -211,44 +213,48 @@
 	}
 
 	if (presence == YAHOO_PRESENCE_PERM_OFFLINE) {
-		pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_PERM,
-				YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-		yahoo_packet_hash(pkt, "ssss",
-				1, purple_connection_get_display_name(gc),
-				31, "1", 13, "2", 7, name);
+		service = YAHOO_SERVICE_PRESENCE_PERM;
+		thirtyone = "1";
+		thirteen = "2";
 	} else if (presence == YAHOO_PRESENCE_DEFAULT) {
 		if (f->presence == YAHOO_PRESENCE_PERM_OFFLINE) {
-			pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_PERM,
-					YAHOO_STATUS_AVAILABLE, yd->session_id);
-
-			yahoo_packet_hash(pkt, "ssss",
-					1, purple_connection_get_display_name(gc),
-					31, "2", 13, "2", 7, name);
+			service = YAHOO_SERVICE_PRESENCE_PERM;
+			thirtyone = "2";
+			thirteen = "2";
 		} else if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
-			pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_SESSION,
-					YAHOO_STATUS_AVAILABLE, yd->session_id);
-			yahoo_packet_hash(pkt, "ssss",
-				1, purple_connection_get_display_name(gc),
-				31, "2", 13, "1", 7, name);
+			service = YAHOO_SERVICE_PRESENCE_SESSION;
+			thirtyone = "2";
+			thirteen = "1";
 		}
 	} else if (presence == YAHOO_PRESENCE_ONLINE) {
 		if (f->presence == YAHOO_PRESENCE_PERM_OFFLINE) {
 			pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_PERM,
 					YAHOO_STATUS_AVAILABLE, yd->session_id);
-			yahoo_packet_hash(pkt, "ssss",
+			yahoo_packet_hash(pkt, "ssssssss",
 					1, purple_connection_get_display_name(gc),
-					31, "2", 13, "2", 7, name);
+					31, "2", 13, "2",
+					302, "319", 300, "319",
+					7, name,
+					301, "319", 303, "319");
 			yahoo_packet_send_and_free(pkt, yd);
 		}
 
-		pkt = yahoo_packet_new(YAHOO_SERVICE_PRESENCE_SESSION,
+		service = YAHOO_SERVICE_PRESENCE_SESSION;
+		thirtyone = "1";
+		thirteen = "1";
+	}
+
+	if (service > 0) {
+		pkt = yahoo_packet_new(service,
 				YAHOO_STATUS_AVAILABLE, yd->session_id);
-		yahoo_packet_hash(pkt, "ssss",
+
+		yahoo_packet_hash(pkt, "ssssssss",
 				1, purple_connection_get_display_name(gc),
-				31, "1", 13, "1", 7, name);
-	}
+				31, thirtyone, 13, thirteen,
+				302, "319", 300, "319",
+				7, name,
+				301, "319", 303, "319");
 
-	if (pkt)
 		yahoo_packet_send_and_free(pkt, yd);
+	}
 }
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_friend.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_friend.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_friend.h	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_friend.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _YAHOO_FRIEND_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo.h	2007-08-20 14:12:51.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _YAHOO_H_
@@ -67,6 +67,9 @@
 #define YAHOO_STATUS_TYPE_INVISIBLE "invisible"
 #define YAHOO_STATUS_TYPE_MOBILE "mobile"
 
+/* Index into attention types list. */
+#define YAHOO_BUZZ 0
+
 enum yahoo_status {
 	YAHOO_STATUS_AVAILABLE = 0,
 	YAHOO_STATUS_BRB,
@@ -123,6 +126,10 @@
 	gboolean chat_online;
 	gboolean in_chat;
 	char *chat_name;
+	char *pending_chat_room;
+	char *pending_chat_id;
+	char *pending_chat_topic;
+	char *pending_chat_goto;
 	char *auth;
 	gsize auth_written;
 	char *cookie_y;
@@ -213,4 +220,7 @@
 gboolean yahoo_privacy_check
 	(PurpleConnection *gc, const char *who);
 
+gboolean yahoo_send_attention(PurpleConnection *gc, const char *username, guint type);
+GList *yahoo_attention_types(PurpleAccount *account);
+
 #endif /* _YAHOO_H_ */
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_packet.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_packet.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_packet.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_packet.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -294,7 +294,7 @@
 
 	if (writelen == 0) {
 		purple_input_remove(yd->txhandler);
-		yd->txhandler = -1;
+		yd->txhandler = 0;
 		return;
 	}
 
@@ -355,7 +355,7 @@
 	len = yahoo_packet_build(pkt, 0, yd->wm, yd->jp, &data);
 
 	yahoo_packet_dump(data, len);
-	if (yd->txhandler == -1)
+	if (yd->txhandler == 0)
 		ret = write(yd->fd, data, len);
 	else {
 		ret = -1;
@@ -365,13 +365,13 @@
 	if (ret < 0 && errno == EAGAIN)
 		ret = 0;
 	else if (ret <= 0) {
-		purple_debug_warning("yahoo", "Only wrote %d of %d bytes!", ret, len);
+		purple_debug_warning("yahoo", "Only wrote %d of %d bytes!\n", ret, len);
 		g_free(data);
 		return ret;
 	}
 
 	if (ret < len) {
-		if (yd->txhandler == -1)
+		if (yd->txhandler == 0)
 			yd->txhandler = purple_input_add(yd->fd, PURPLE_INPUT_WRITE,
 				yahoo_packet_send_can_write, yd);
 		purple_circ_buffer_append(yd->txbuf, data + ret, len - ret);
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_packet.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_packet.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_packet.h	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_packet.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _YAHOO_PACKET_H_
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_picture.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_picture.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_picture.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_picture.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_picture.h pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_picture.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_picture.h	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_picture.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_profile.c pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_profile.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/yahoo_profile.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/yahoo_profile.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/ycht.c pidgin-2.2.0/libpurple/protocols/yahoo/ycht.c
--- pidgin-2.1.1/libpurple/protocols/yahoo/ycht.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/ycht.c	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <string.h>
diff -ru pidgin-2.1.1/libpurple/protocols/yahoo/ycht.h pidgin-2.2.0/libpurple/protocols/yahoo/ycht.h
--- pidgin-2.1.1/libpurple/protocols/yahoo/ycht.h	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/yahoo/ycht.h	2007-09-14 00:45:40.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_YCHT_H_
diff -ru pidgin-2.1.1/libpurple/protocols/zephyr/Makefile.in pidgin-2.2.0/libpurple/protocols/zephyr/Makefile.in
--- pidgin-2.1.1/libpurple/protocols/zephyr/Makefile.in	2007-08-20 14:14:00.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/zephyr/Makefile.in	2007-09-14 03:31:27.000000000 -0400
@@ -214,6 +214,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -242,6 +244,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -297,14 +301,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -316,7 +318,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -377,6 +378,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -397,6 +399,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/protocols/zephyr/zephyr.c pidgin-2.2.0/libpurple/protocols/zephyr/zephyr.c
--- pidgin-2.1.1/libpurple/protocols/zephyr/zephyr.c	2007-08-20 14:12:52.000000000 -0400
+++ pidgin-2.2.0/libpurple/protocols/zephyr/zephyr.c	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307	 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301	 USA
  *
 
 */
@@ -1117,7 +1117,7 @@
 		bufcur++;
 		if ((bufcur - buf) > (bufsize - 1)) {
 			if ((buf = realloc(buf, bufsize * 2)) == NULL) {
-				purple_debug_error("zephyr","Ran out of memory");
+				purple_debug_error("zephyr","Ran out of memory\n");
 				exit(-1);
 			} else {
 				bufcur = buf + bufsize;
@@ -2218,12 +2218,12 @@
 		notice.z_message_len = strlen(html_buf2) + strlen(sig) + 2;
 		notice.z_message = buf;
 		notice.z_opcode = g_strdup(opcode);
-		purple_debug_info("zephyr","About to send notice");
+		purple_debug_info("zephyr","About to send notice\n");
 		if (! ZSendNotice(&notice, ZAUTH) == ZERR_NONE) {
 			/* XXX handle errors here */
 			return 0;
 		}
-		purple_debug_info("zephyr","notice sent");
+		purple_debug_info("zephyr","notice sent\n");
 		g_free(buf);
 	}
 
@@ -2815,19 +2815,19 @@
 		title = g_strdup_printf("Server subscriptions for %s", zephyr->username);
 		
 		if (zephyr->port == 0) {
-			purple_debug_error("zephyr", "error while retrieving port");
+			purple_debug_error("zephyr", "error while retrieving port\n");
 			return;
 		} 
 		if ((retval = ZRetrieveSubscriptions(zephyr->port,&nsubs)) != ZERR_NONE) {
 			/* XXX better error handling */
-			purple_debug_error("zephyr", "error while retrieving subscriptions from server");
+			purple_debug_error("zephyr", "error while retrieving subscriptions from server\n");
 			return;
 		}
 		for(i=0;i<nsubs;i++) {
 			one = 1;
 			if ((retval = ZGetSubscriptions(&subs,&one)) != ZERR_NONE) {
 				/* XXX better error handling */
-				purple_debug_error("zephyr", "error while retrieving individual subscription");
+				purple_debug_error("zephyr", "error while retrieving individual subscription\n");
 				return;
 			}
 			g_string_append_printf(subout, "Class %s Instance %s Recipient %s<br>",
diff -ru pidgin-2.1.1/libpurple/proxy.c pidgin-2.2.0/libpurple/proxy.c
--- pidgin-2.1.1/libpurple/proxy.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/proxy.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -420,7 +420,7 @@
 	if (ret == 0 && error == EINPROGRESS) {
 		/* No worries - we'll be called again later */
 		/* TODO: Does this ever happen? */
-		purple_debug_info("proxy", "(ret == 0 && error == EINPROGRESS)");
+		purple_debug_info("proxy", "(ret == 0 && error == EINPROGRESS)\n");
 		return;
 	}
 
@@ -668,6 +668,16 @@
 		if (status == 407 /* Proxy Auth */)
 		{
 			gchar *ntlm;
+			char hostname[256];
+			int ret;
+
+			ret = gethostname(hostname, sizeof(hostname));
+			hostname[sizeof(hostname) - 1] = '\0';
+			if (ret < 0 || hostname[0] == '\0') {
+				purple_debug_warning("proxy", "gethostname() failed -- is your hostname set?");
+				strcpy(hostname, "localhost");
+			}
+
 			ntlm = g_strrstr((const gchar *)connect_data->read_buffer,
 					"Proxy-Authenticate: NTLM ");
 			if (ntlm != NULL)
@@ -679,6 +689,7 @@
 				gchar *username;
 				gchar *request;
 				gchar *response;
+
 				username = strchr(domain, '\\');
 				if (username == NULL)
 				{
@@ -694,7 +705,7 @@
 				nonce = purple_ntlm_parse_type2(ntlm, NULL);
 				response = purple_ntlm_gen_type3(username,
 					(gchar*) purple_proxy_info_get_password(connect_data->gpi),
-					(gchar*) purple_proxy_info_get_host(connect_data->gpi),
+					hostname,
 					domain, nonce, NULL);
 				username--;
 				*username = '\\';
@@ -745,9 +756,7 @@
 					sizeof(request) - request_len,
 					"Proxy-Authorization: NTLM %s\r\n"
 					"Proxy-Connection: Keep-Alive\r\n\r\n",
-					purple_ntlm_gen_type1(
-						(gchar*) purple_proxy_info_get_host(connect_data->gpi),
-						domain));
+					purple_ntlm_gen_type1(hostname, domain));
 				*username = '\\';
 
 				purple_input_remove(connect_data->inpa);
@@ -832,6 +841,14 @@
 	if (purple_proxy_info_get_username(connect_data->gpi) != NULL)
 	{
 		char *t1, *t2;
+		char hostname[256];
+
+		ret = gethostname(hostname, sizeof(hostname));
+		hostname[sizeof(hostname) - 1] = '\0';
+		if (ret < 0 || hostname[0] == '\0') {
+			purple_debug_warning("proxy", "gethostname() failed -- is your hostname set?");
+			strcpy(hostname, "localhost");
+		}
 
 		t1 = g_strdup_printf("%s:%s",
 			purple_proxy_info_get_username(connect_data->gpi),
@@ -844,8 +861,7 @@
 			"Proxy-Authorization: Basic %s\r\n"
 			"Proxy-Authorization: NTLM %s\r\n"
 			"Proxy-Connection: Keep-Alive\r\n",
-			t2, purple_ntlm_gen_type1(
-					purple_proxy_info_get_host(connect_data->gpi), ""));
+			t2, purple_ntlm_gen_type1(hostname, ""));
 		g_free(t2);
 	}
 
diff -ru pidgin-2.1.1/libpurple/proxy.h pidgin-2.2.0/libpurple/proxy.h
--- pidgin-2.1.1/libpurple/proxy.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/proxy.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_PROXY_H_
 #define _PURPLE_PROXY_H_
diff -ru pidgin-2.1.1/libpurple/prpl.c pidgin-2.2.0/libpurple/prpl.c
--- pidgin-2.1.1/libpurple/prpl.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/prpl.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -199,7 +199,10 @@
 		if(NULL == status)
 			continue;
 
-		purple_status_set_active(status, FALSE);
+		if (purple_status_is_active(status)) {
+			purple_status_set_active(status, FALSE);
+			purple_blist_update_buddy_status(buddy, status);
+		}
 	}
 
 	g_slist_free(list);
diff -ru pidgin-2.1.1/libpurple/prpl.h pidgin-2.2.0/libpurple/prpl.h
--- pidgin-2.1.1/libpurple/prpl.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/prpl.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 /* this file should be all that prpls need to include. therefore, by including
@@ -30,6 +30,7 @@
 #define _PURPLE_PRPL_H_
 
 typedef struct _PurplePluginProtocolInfo PurplePluginProtocolInfo;
+typedef struct _PurpleAttentionType PurpleAttentionType;
 
 /**************************************************************************/
 /** @name Basic Protocol Information                                      */
@@ -91,6 +92,20 @@
 	gboolean secret;
 };
 
+struct _PurpleAttentionType
+{
+	const char *name;                  /**< Shown in GUI elements */
+	const char *incoming_description;  /**< Shown when sent */
+	const char *outgoing_description;  /**< Shown when receied */
+	const char *icon_name;             /**< Icon to display (optional) */
+
+	/* Reserved fields for future purposes */
+	gpointer _reserved1;
+	gpointer _reserved2;
+	gpointer _reserved3;
+	gpointer _reserved4;
+};
+
 /**
  * Protocol options
  *
@@ -332,9 +347,16 @@
 	/* room list serialize */
 	char *(*roomlist_room_serialize)(PurpleRoomlistRoom *room);
 
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
+	/* Remove the user from the server. (This is only at the bottom to keep binary compatibility.)
+	 * The account can either be connected or disconnected. After the removal is finished,
+	 * the connection will stay open and has to be closed!
+	 */
+	void (*unregister_user)(PurpleAccount *, PurpleAccountUnregistrationCb cb, void *user_data);
+	
+	/* Attention API for sending & receiving zaps/nudges/buzzes etc. */
+	gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type);
+	GList *(*get_attention_types)(PurpleAccount *acct);
+
 	void (*_purple_reserved4)(void);
 };
 
diff -ru pidgin-2.1.1/libpurple/purple-url-handler pidgin-2.2.0/libpurple/purple-url-handler
--- pidgin-2.1.1/libpurple/purple-url-handler	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/purple-url-handler	2007-08-21 03:33:13.000000000 -0400
@@ -44,6 +44,12 @@
     else:
         return list
 
+def convert(value):
+    try:
+        return int(value)
+    except:
+        return value
+
 def findaccount(protocolname, accountname=""):
     # prefer connected accounts
     account = cpurple.PurpleAccountsFindConnected(accountname, protocolname)
@@ -84,6 +90,32 @@
     cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
 
 
+def aim(uri):
+    protocol = "prpl-aim"
+    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+    if not match:
+        print "Invalid aim URI: %s" % uri
+        return
+
+    command = urllib.unquote_plus(match.group(1))
+    paramstring = match.group(3)
+    params = {}
+    if paramstring:
+        for param in paramstring.split("&"):
+            key, value = extendlist(param.split("=", 1), 2, "")
+            params[key] = urllib.unquote_plus(value)
+    accountname = params.get("account", "")
+    screenname = params.get("screenname", "")
+
+    account = findaccount(protocol, accountname)
+
+    if command.lower() == "goim":
+        goim(account, screenname, params.get("message"))
+    elif command.lower() == "gochat":
+        gochat(account, params)
+    elif command.lower() == "addbuddy":
+        addbuddy(account, screenname, params.get("group", ""))
+
 def gg(uri):
     protocol = "prpl-gg"
     match = re.match(r"^gg:(.*)", uri)
@@ -95,6 +127,32 @@
     account = findaccount(protocol)
     goim(account, screenname)
 
+def icq(uri):
+    protocol = "prpl-icq"
+    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+    if not match:
+        print "Invalid icq URI: %s" % uri
+        return
+
+    command = urllib.unquote_plus(match.group(1))
+    paramstring = match.group(3)
+    params = {}
+    if paramstring:
+        for param in paramstring.split("&"):
+            key, value = extendlist(param.split("=", 1), 2, "")
+            params[key] = urllib.unquote_plus(value)
+    accountname = params.get("account", "")
+    screenname = params.get("screenname", "")
+
+    account = findaccount(protocol, accountname)
+
+    if command.lower() == "goim":
+        goim(account, screenname, params.get("message"))
+    elif command.lower() == "gochat":
+        gochat(account, params)
+    elif command.lower() == "addbuddy":
+        addbuddy(account, screenname, params.get("group", ""))
+
 def irc(uri):
     protocol = "prpl-irc"
     match = re.match(r"^irc:(//([^/]*)/)?([^?]*)(\?(.*))?", uri)
@@ -131,6 +189,34 @@
                 channel = "#" + channel
             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
 
+def msnim(uri):
+    protocol = "prpl-msn"
+    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+    if not match:
+        print "Invalid msnim URI: %s" % uri
+        return
+
+    command = urllib.unquote_plus(match.group(1))
+    paramstring = match.group(3)
+    params = {}
+    if paramstring:
+        for param in paramstring.split("&"):
+            key, value = extendlist(param.split("=", 1), 2, "")
+            params[key] = urllib.unquote_plus(value)
+    screenname = params.get("contact", "")
+
+    account = findaccount(protocol)
+
+    if command.lower() == "chat":
+        goim(account, screenname)
+    elif command.lower() == "add":
+        addbuddy(account, screenname)
+
+def myim(uri):
+	protocol = "prpl-myspace"
+	print "TODO: send uri: ", uri
+	assert False, "Not implemented"
+
 def sip(uri):
     protocol = "prpl-simple"
     match = re.match(r"^sip:(.*)", uri)
@@ -182,6 +268,32 @@
     else:
         goim(account, screenname)
 
+def ymsgr(uri):
+    protocol = "prpl-yahoo"
+    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+    if not match:
+        print "Invalid ymsgr URI: %s" % uri
+        return
+
+    command = urllib.unquote_plus(match.group(1))
+    screenname = urllib.unquote_plus(match.group(3))
+    paramstring = match.group(5)
+    params = {}
+    if paramstring:
+        for param in paramstring.split("&"):
+            key, value = extendlist(param.split("=", 1), 2, "")
+            params[key] = urllib.unquote_plus(value)
+
+    account = findaccount(protocol)
+
+    if command.lower() == "sendim":
+        goim(account, screenname, params.get("m"))
+    elif command.lower() == "chat":
+        gochat(account, {"room": screenname})
+    elif command.lower() == "addfriend":
+        addbuddy(account, screenname)
+
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         print "Usage: %s URI" % argv[0]
@@ -192,16 +304,26 @@
     type = uri.split(":")[0]
 
     try:
-        if type == "gg":
+        if type == "aim":
+            aim(uri)
+        elif type == "gg":
             gg(uri)
+        elif type == "icq":
+            icq(uri)
         elif type == "irc":
             irc(uri)
+        elif type == "msnim":
+            msnim(uri)
+        elif type == "myim":
+            myim(uri)
         elif type == "sip":
             sip(uri)
         elif type == "xmpp":
             xmpp(uri)
+        elif type == "ymsgr":
+            ymsgr(uri)
         else:
-            cpurple.PurpleGotProtocolHandlerUri(uri)
+            print "Unknown protocol: %s" % type
     except dbus.dbus_bindings.DBusException:
         print "ERROR: Is there a libpurple-powered client (e.g. Pidgin or Finch) running?"
 
diff -ru pidgin-2.1.1/libpurple/request.c pidgin-2.2.0/libpurple/request.c
--- pidgin-2.1.1/libpurple/request.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/request.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
@@ -1172,7 +1172,7 @@
 
 void *
 purple_request_choice(void *handle, const char *title, const char *primary,
-					const char *secondary, unsigned int default_value,
+					const char *secondary, int default_value,
 					const char *ok_text, GCallback ok_cb,
 					const char *cancel_text, GCallback cancel_cb,
 					PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -1197,7 +1197,7 @@
 void *
 purple_request_choice_varg(void *handle, const char *title,
 			 const char *primary, const char *secondary,
-			 unsigned int default_value,
+			 int default_value,
 			 const char *ok_text, GCallback ok_cb,
 			 const char *cancel_text, GCallback cancel_cb,
 			 PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -1233,7 +1233,7 @@
 
 void *
 purple_request_action(void *handle, const char *title, const char *primary,
-					const char *secondary, unsigned int default_action,
+					const char *secondary, int default_action,
 					PurpleAccount *account, const char *who, PurpleConversation *conv,
 					void *user_data, size_t action_count, ...)
 {
@@ -1254,7 +1254,7 @@
 void *
 purple_request_action_varg(void *handle, const char *title,
 						 const char *primary, const char *secondary,
-						 unsigned int default_action,
+						 int default_action,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, va_list actions)
 {
diff -ru pidgin-2.1.1/libpurple/request.h pidgin-2.2.0/libpurple/request.h
--- pidgin-2.1.1/libpurple/request.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/request.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_REQUEST_H_
 #define _PURPLE_REQUEST_H_
@@ -190,13 +190,13 @@
 						   PurpleAccount *account, const char *who, PurpleConversation *conv,
 						   void *user_data);
 	void *(*request_choice)(const char *title, const char *primary,
-							const char *secondary, unsigned int default_value,
+							const char *secondary, int default_value,
 							const char *ok_text, GCallback ok_cb,
 							const char *cancel_text, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
 							void *user_data, va_list choices);
 	void *(*request_action)(const char *title, const char *primary,
-							const char *secondary, unsigned int default_action,
+							const char *secondary, int default_action,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
 							void *user_data, size_t action_count,
 							va_list actions);
@@ -1215,7 +1215,7 @@
  * @param cancel_cb     The callback for the @c Cancel button.
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv			The PurpleConversation associated with this request, or NULL if none is
  * @param user_data     The data to pass to the callback.
  * @param ...           The choices.  This argument list should be
  *                      terminated with a NULL parameter.
@@ -1224,7 +1224,7 @@
  */
 void *purple_request_choice(void *handle, const char *title,
 						  const char *primary, const char *secondary,
-						  unsigned int default_value,
+						  int default_value,
 						  const char *ok_text, GCallback ok_cb,
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -1246,7 +1246,7 @@
  * @param cancel_cb     The callback for the @c Cancel button.
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv			The PurpleConversation associated with this request, or NULL if none is
  * @param user_data     The data to pass to the callback.
  * @param choices       The choices.  This argument list should be
  *                      terminated with a @c NULL parameter.
@@ -1255,7 +1255,7 @@
  */
 void *purple_request_choice_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
-							   unsigned int default_value,
+							   int default_value,
 							   const char *ok_text, GCallback ok_cb,
 							   const char *cancel_text, GCallback cancel_cb,
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -1275,7 +1275,7 @@
  * @param default_action The default value.
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv			 The PurpleConversation associated with this request, or NULL if none is
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param ...            A list of actions.  These are pairs of
@@ -1290,7 +1290,7 @@
  */
 void *purple_request_action(void *handle, const char *title,
 						  const char *primary, const char *secondary,
-						  unsigned int default_action,
+						  int default_action,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, ...);
 
@@ -1308,7 +1308,7 @@
  * @param default_action The default value.
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv			 The PurpleConversation associated with this request, or NULL if none is
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param actions        A list of actions and callbacks.
@@ -1317,7 +1317,7 @@
  */
 void *purple_request_action_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
-							   unsigned int default_action,
+							   int default_action,
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, size_t action_count,
 							   va_list actions);
@@ -1338,7 +1338,7 @@
  * @param cancel_cb   The callback for the @c Cancel button.
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy associated with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1411,7 +1411,7 @@
  * @param cancel_cb   The callback for the @c Cancel button.
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1435,7 +1435,7 @@
  * @param cancel_cb   The callback for the @c Cancel button.
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is 
+ * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
diff -ru pidgin-2.1.1/libpurple/roomlist.c pidgin-2.2.0/libpurple/roomlist.c
--- pidgin-2.1.1/libpurple/roomlist.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/roomlist.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
diff -ru pidgin-2.1.1/libpurple/roomlist.h pidgin-2.2.0/libpurple/roomlist.h
--- pidgin-2.1.1/libpurple/roomlist.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/roomlist.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_ROOMLIST_H_
diff -ru pidgin-2.1.1/libpurple/savedstatuses.c pidgin-2.2.0/libpurple/savedstatuses.c
--- pidgin-2.1.1/libpurple/savedstatuses.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/savedstatuses.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/savedstatuses.h pidgin-2.2.0/libpurple/savedstatuses.h
--- pidgin-2.1.1/libpurple/savedstatuses.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/savedstatuses.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref savedstatus-signals
  */
diff -ru pidgin-2.1.1/libpurple/server.c pidgin-2.2.0/libpurple/server.c
--- pidgin-2.1.1/libpurple/server.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/server.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -242,6 +242,121 @@
 	}
 }
 
+PurpleAttentionType *purple_get_attention_type_from_code(PurpleAccount *account, guint type_code)
+{
+	PurplePlugin *prpl;
+	PurpleAttentionType* attn;
+	GList *(*get_attention_types)(PurpleAccount *);
+
+	g_return_val_if_fail(account != NULL, NULL);
+
+	prpl = purple_find_prpl(purple_account_get_protocol_id(account));
+
+	/* Lookup the attention type in the protocol's attention_types list, if any. */
+	get_attention_types = PURPLE_PLUGIN_PROTOCOL_INFO(prpl)->get_attention_types;
+	if (get_attention_types) {
+		GList *attention_types;
+
+		attention_types = get_attention_types(account);
+		attn = (PurpleAttentionType *)g_list_nth_data(attention_types, type_code);
+	} else {
+		attn = NULL;
+	}
+
+	return attn;
+}
+
+void
+serv_send_attention(PurpleConnection *gc, const char *who, guint type_code)
+{
+	PurpleAttentionType *attn;
+	PurpleMessageFlags flags;
+	PurplePlugin *prpl;
+	PurpleConversation *conv;
+	gboolean (*send_attention)(PurpleConnection *, const char *, guint);
+	PurpleBuddy *buddy;
+	const char *alias;	
+	gchar *description;
+	time_t mtime;
+
+	g_return_if_fail(gc != NULL);
+	g_return_if_fail(who != NULL);
+
+	prpl = purple_find_prpl(purple_account_get_protocol_id(gc->account));
+	send_attention = PURPLE_PLUGIN_PROTOCOL_INFO(prpl)->send_attention;
+	g_return_if_fail(send_attention != NULL);
+
+	mtime = time(NULL);
+
+	attn = purple_get_attention_type_from_code(gc->account, type_code);
+
+	if ((buddy = purple_find_buddy(purple_connection_get_account(gc), who)) != NULL)
+		alias = purple_buddy_get_contact_alias(buddy);
+	else
+		alias = who;
+
+	if (attn && attn->outgoing_description) {
+		description = g_strdup_printf(attn->outgoing_description, alias);
+	} else {
+		description = g_strdup_printf(_("Requesting %s's attention..."), alias);
+	}
+	
+	flags = PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_SYSTEM;
+
+	purple_debug_info("server", "serv_send_attention: sending '%s' to %s\n",
+			description, who);
+
+	if (!send_attention(gc, who, type_code))
+		return;
+
+	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, gc->account, who);
+	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, description, flags, mtime);
+
+	g_free(description);
+}
+
+void
+serv_got_attention(PurpleConnection *gc, const char *who, guint type_code)
+{
+	PurpleMessageFlags flags;
+	PurpleAttentionType *attn;
+	PurpleBuddy *buddy;
+	const char *alias;
+	gchar *description;
+	time_t mtime;
+
+	mtime = time(NULL);
+
+	attn = purple_get_attention_type_from_code(gc->account, type_code);
+
+	/* PURPLE_MESSAGE_NOTIFY is for attention messages. */
+	flags = PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NOTIFY | PURPLE_MESSAGE_RECV;
+
+	/* TODO: if (attn->icon_name) is non-null, use it to lookup an emoticon and display
+	 * it next to the attention command. And if it is null, display a generic icon. */
+
+	if ((buddy = purple_find_buddy(purple_connection_get_account(gc), who)) != NULL)
+		alias = purple_buddy_get_contact_alias(buddy);
+	else
+		alias = who;
+
+	if (attn && attn->incoming_description) {
+		description = g_strdup_printf(attn->incoming_description, alias);
+	} else {
+		description = g_strdup_printf(_("%s has requested your attention!"), alias);
+	}
+
+	purple_debug_info("server", "serv_got_attention: got '%s' from %s\n",
+			description, who);
+
+	serv_got_im(gc, who, description, flags, mtime);
+	
+	/* TODO: sounds (depending on PurpleAttentionType), shaking, etc. */
+
+	g_free(description);
+}
+
+
 /*
  * Move a buddy from one group to another on server.
  *
diff -ru pidgin-2.1.1/libpurple/server.h pidgin-2.2.0/libpurple/server.h
--- pidgin-2.1.1/libpurple/server.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/server.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_SERVER_H_
 #define _PURPLE_SERVER_H_
@@ -53,6 +53,35 @@
 
 void serv_move_buddy(PurpleBuddy *, PurpleGroup *, PurpleGroup *);
 int  serv_send_im(PurpleConnection *, const char *, const char *, PurpleMessageFlags flags);
+
+/** Get information about an account's attention commands, from the prpl. 
+ * 
+ * @return The attention command numbered 'code' from the prpl's attention_types, or NULL.
+ */
+PurpleAttentionType *purple_get_attention_type_from_code(PurpleAccount *account, guint type_code);
+
+/** Send an attention request message.
+ *
+ * @param gc The connection to send the message on.
+ * @param who Whose attention to request.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * 	of the attention request command to send. 0 if prpl only defines one
+ * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
+ *
+ * Note that you can't send arbitrary PurpleAttentionType's, because there is
+ * only a fixed set of attention commands.
+ */
+void serv_send_attention(PurpleConnection *gc, const char *who, guint type_code);
+
+/** Process an incoming attention message. 
+ *
+ * @param gc The connection that received the attention message.
+ * @param who Who requested your attention.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * 	of the attention request command to send. 
+ */
+void serv_got_attention(PurpleConnection *gc, const char *who, guint type_code);
+
 void serv_get_info(PurpleConnection *, const char *);
 void serv_set_info(PurpleConnection *, const char *);
 
@@ -68,6 +97,7 @@
 void serv_alias_buddy(PurpleBuddy *);
 void serv_got_alias(PurpleConnection *gc, const char *who, const char *alias);
 
+
 /**
  * Receive a typing message from a remote user.  Either PURPLE_TYPING
  * or PURPLE_TYPED.  If the user has stopped typing then use
diff -ru pidgin-2.1.1/libpurple/signals.c pidgin-2.2.0/libpurple/signals.c
--- pidgin-2.1.1/libpurple/signals.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/signals.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/signals.h pidgin-2.2.0/libpurple/signals.h
--- pidgin-2.1.1/libpurple/signals.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/signals.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_SIGNALS_H_
 #define _PURPLE_SIGNALS_H_
diff -ru pidgin-2.1.1/libpurple/sound.c pidgin-2.2.0/libpurple/sound.c
--- pidgin-2.1.1/libpurple/sound.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/sound.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/sound.h pidgin-2.2.0/libpurple/sound.h
--- pidgin-2.1.1/libpurple/sound.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/sound.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref sound-signals
  */
diff -ru pidgin-2.1.1/libpurple/sslconn.c pidgin-2.2.0/libpurple/sslconn.c
--- pidgin-2.1.1/libpurple/sslconn.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/sslconn.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,10 +20,11 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
+#include "certificate.h"
 #include "debug.h"
 #include "sslconn.h"
 
@@ -117,6 +118,9 @@
 	gsc->connect_cb      = func;
 	gsc->error_cb        = error_func;
 
+	/* TODO: Move this elsewhere */
+	gsc->verifier = purple_certificate_find_verifier("x509","tls_cached");
+
 	gsc->connect_data = purple_proxy_connect(NULL, account, host, port, purple_ssl_connect_cb, gsc);
 
 	if (gsc->connect_data == NULL)
@@ -151,10 +155,37 @@
 	gsc->inpa = purple_input_add(gsc->fd, PURPLE_INPUT_READ, recv_cb, gsc);
 }
 
+const gchar *
+purple_ssl_strerror(PurpleSslErrorType error)
+{
+	switch(error) {
+		case PURPLE_SSL_CONNECT_FAILED:
+			return _("SSL Connection Failed");
+		case PURPLE_SSL_HANDSHAKE_FAILED:
+			return _("SSL Handshake Failed");
+		case PURPLE_SSL_CERTIFICATE_INVALID:
+			return _("SSL peer presented an invalid certificate");
+		default:
+			purple_debug_warning("sslconn", "Unknown SSL error code %d\n", error);
+			return _("Unknown SSL error");
+	}
+}
+
 PurpleSslConnection *
 purple_ssl_connect_fd(PurpleAccount *account, int fd,
 					PurpleSslInputFunction func,
-					PurpleSslErrorFunction error_func, void *data)
+					PurpleSslErrorFunction error_func,
+                    void *data)
+{
+    return purple_ssl_connect_with_host_fd(account, fd, func, error_func, NULL, data);
+}
+
+PurpleSslConnection *
+purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd,
+                      PurpleSslInputFunction func,
+                      PurpleSslErrorFunction error_func,
+                      const char *host,
+                      void *data)
 {
 	PurpleSslConnection *gsc;
 	PurpleSslOps *ops;
@@ -175,7 +206,13 @@
 	gsc->connect_cb      = func;
 	gsc->error_cb        = error_func;
 	gsc->fd              = fd;
+    if(host)
+        gsc->host            = g_strdup(host);
 
+	/* TODO: Move this elsewhere */
+	gsc->verifier = purple_certificate_find_verifier("x509","tls_cached");
+
+    
 	ops = purple_ssl_get_ops();
 	ops->connectfunc(gsc);
 
@@ -231,6 +268,17 @@
 	return (ops->write)(gsc, data, len);
 }
 
+GList *
+purple_ssl_get_peer_certificates(PurpleSslConnection *gsc)
+{
+	PurpleSslOps *ops;
+
+	g_return_val_if_fail(gsc != NULL, NULL);
+
+	ops = purple_ssl_get_ops();
+	return (ops->get_peer_certificates)(gsc);
+}
+
 void
 purple_ssl_set_ops(PurpleSslOps *ops)
 {
@@ -246,8 +294,12 @@
 void
 purple_ssl_init(void)
 {
-	/* This doesn't do anything at the moment. All the actual init work
-	 * is handled by purple_ssl_is_supported upon demand. */
+	/* Although purple_ssl_is_supported will do the initialization on
+	   command, SSL plugins tend to register CertificateSchemes as well
+	   as providing SSL ops. */
+	if (!ssl_init()) {
+		purple_debug_error("sslconn", "Unable to initialize SSL.\n");
+	}
 }
 
 void
diff -ru pidgin-2.1.1/libpurple/sslconn.h pidgin-2.2.0/libpurple/sslconn.h
--- pidgin-2.1.1/libpurple/sslconn.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/sslconn.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,11 +20,12 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_SSLCONN_H_
 #define _PURPLE_SSLCONN_H_
 
+#include "certificate.h"
 #include "proxy.h"
 
 #define PURPLE_SSL_DEFAULT_PORT 443
@@ -32,7 +33,8 @@
 typedef enum
 {
 	PURPLE_SSL_HANDSHAKE_FAILED = 1,
-	PURPLE_SSL_CONNECT_FAILED = 2
+	PURPLE_SSL_CONNECT_FAILED = 2,
+	PURPLE_SSL_CERTIFICATE_INVALID = 3
 } PurpleSslErrorType;
 
 typedef struct _PurpleSslConnection PurpleSslConnection;
@@ -69,6 +71,9 @@
 
 	/** Internal connection data managed by the SSL backend (GnuTLS/LibNSS/whatever) */
 	void *private_data;
+
+	/** Verifier to use in authenticating the peer */
+	PurpleCertificateVerifier *verifier;
 };
 
 /**
@@ -107,8 +112,17 @@
 	* @return	The number of bytes written (may be less than len) or <0 on error
 	*/
 	size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
-
-	void (*_purple_reserved1)(void);
+	/** Obtains the certificate chain provided by the peer
+	 *
+	 * @param gsc   Connection context
+	 * @return      A newly allocated list containing the certificates
+	 *              the peer provided.
+	 * @see PurpleCertificate
+	 * @todo        Decide whether the ordering of certificates in this
+	 *              list can be guaranteed.
+	 */
+	GList * (* get_peer_certificates)(PurpleSslConnection * gsc);
+	
 	void (*_purple_reserved2)(void);
 	void (*_purple_reserved3)(void);
 	void (*_purple_reserved4)(void);
@@ -131,6 +145,14 @@
 gboolean purple_ssl_is_supported(void);
 
 /**
+ * Returns a human-readable string for an SSL error
+ *
+ * @param error      Error code
+ * @return Human-readable error explanation
+ */
+const gchar * purple_ssl_strerror(PurpleSslErrorType error);
+
+/**
  * Makes a SSL connection to the specified host and port.  The caller
  * should keep track of the returned value and use it to cancel the
  * connection, if needed.
@@ -154,6 +176,7 @@
 
 /**
  * Makes a SSL connection using an already open file descriptor.
+ * DEPRECATED. Use purple_ssl_connect_with_host_fd instead.
  *
  * @param account    The account making the connection.
  * @param fd         The file descriptor.
@@ -166,7 +189,25 @@
 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd,
 									   PurpleSslInputFunction func,
 									   PurpleSslErrorFunction error_func,
-									   void *data);
+ 									   void *data);
+
+/**
+  * Makes a SSL connection using an already open file descriptor.
+  *
+  * @param account    The account making the connection.
+  * @param fd         The file descriptor.
+  * @param func       The SSL input handler function.
+  * @param error_func The SSL error handler function.
+  * @param host       The hostname of the other peer (to verify the CN)
+  * @param data       User-defined data.
+  *
+  * @return The SSL connection handle.
+  */
+PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd,
+                                           PurpleSslInputFunction func,
+                                           PurpleSslErrorFunction error_func,
+                                           const char *host,
+                                           void *data);
 
 /**
  * Adds an input watcher for the specified SSL connection.
@@ -208,6 +249,16 @@
  */
 size_t purple_ssl_write(PurpleSslConnection *gsc, const void *buffer, size_t len);
 
+/**
+ * Obtains the peer's presented certificates
+ *
+ * @param gsc    The SSL connection handle
+ *
+ * @return The peer certificate chain, in the order of certificate, issuer,
+ *         issuer's issuer, etc. NULL if no certificates have been provided,
+ */
+GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
+
 /*@}*/
 
 /**************************************************************************/
diff -ru pidgin-2.1.1/libpurple/status.c pidgin-2.2.0/libpurple/status.c
--- pidgin-2.1.1/libpurple/status.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/status.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/status.h pidgin-2.2.0/libpurple/status.h
--- pidgin-2.1.1/libpurple/status.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/status.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_STATUS_H_
 #define _PURPLE_STATUS_H_
@@ -113,6 +113,16 @@
 #include "conversation.h"
 #include "value.h"
 
+#define PURPLE_TUNE_ARTIST	"tune_artist"
+#define PURPLE_TUNE_TITLE	"tune_title"
+#define PURPLE_TUNE_ALBUM	"tune_album"
+#define PURPLE_TUNE_GENRE	"tune_genre"
+#define PURPLE_TUNE_COMMENT	"tune_comment"
+#define PURPLE_TUNE_TRACK	"tune_track"
+#define PURPLE_TUNE_TIME	"tune_time"
+#define PURPLE_TUNE_YEAR	"tune_year"
+#define PURPLE_TUNE_URL	"tune_url"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -ru pidgin-2.1.1/libpurple/stringref.c pidgin-2.2.0/libpurple/stringref.c
--- pidgin-2.1.1/libpurple/stringref.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/stringref.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/stringref.h pidgin-2.2.0/libpurple/stringref.h
--- pidgin-2.1.1/libpurple/stringref.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/stringref.h	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PURPLE_STRINGREF_H_
diff -ru pidgin-2.1.1/libpurple/stun.c pidgin-2.2.0/libpurple/stun.c
--- pidgin-2.1.1/libpurple/stun.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/stun.c	2007-09-14 00:45:40.000000000 -0400
@@ -22,7 +22,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -252,7 +252,7 @@
 				sinptr = (struct sockaddr_in *) &ifr->ifr_addr;
 				if(sinptr->sin_addr.s_addr == in.s_addr) {
 					/* no NAT */
-					purple_debug_info("stun", "no nat");
+					purple_debug_info("stun", "no nat\n");
 					nattype.type = PURPLE_STUN_NAT_TYPE_PUBLIC_IP;
 				}
 			}
diff -ru pidgin-2.1.1/libpurple/stun.h pidgin-2.2.0/libpurple/stun.h
--- pidgin-2.1.1/libpurple/stun.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/stun.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_STUN_H_
 #define _PURPLE_STUN_H_
diff -ru pidgin-2.1.1/libpurple/tests/Makefile.in pidgin-2.2.0/libpurple/tests/Makefile.in
--- pidgin-2.1.1/libpurple/tests/Makefile.in	2007-08-20 14:14:00.000000000 -0400
+++ pidgin-2.2.0/libpurple/tests/Makefile.in	2007-09-14 03:31:27.000000000 -0400
@@ -126,6 +126,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -154,6 +156,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -209,14 +213,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -228,7 +230,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -289,6 +290,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -309,6 +311,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/libpurple/upnp.c pidgin-2.2.0/libpurple/upnp.c
--- pidgin-2.1.1/libpurple/upnp.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/upnp.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/upnp.h pidgin-2.2.0/libpurple/upnp.h
--- pidgin-2.1.1/libpurple/upnp.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/upnp.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_UPNP_H_
diff -ru pidgin-2.1.1/libpurple/util.c pidgin-2.2.0/libpurple/util.c
--- pidgin-2.1.1/libpurple/util.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/util.c	2007-09-14 00:45:40.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
@@ -673,7 +673,7 @@
 	locale = g_locale_from_utf8(format, -1, NULL, NULL, &err);
 	if (err != NULL)
 	{
-		purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s", err->message);
+		purple_debug_error("util", "Format conversion failed in purple_utf8_strftime(): %s\n", err->message);
 		g_error_free(err);
 		locale = g_strdup(format);
 	}
@@ -693,7 +693,7 @@
 	utf8 = g_locale_to_utf8(buf, len, NULL, NULL, &err);
 	if (err != NULL)
 	{
-		purple_debug_error("util", "Result conversion failed in purple_utf8_strftime(): %s", err->message);
+		purple_debug_error("util", "Result conversion failed in purple_utf8_strftime(): %s\n", err->message);
 		g_error_free(err);
 	}
 	else
@@ -1374,7 +1374,7 @@
 								g_string_free(cdata, TRUE);
 								cdata = NULL;
 							}
-							
+
 						}
 						if(tags == tag)
 							break;
@@ -1425,7 +1425,7 @@
 				ALLOW_TAG("strong");
 				ALLOW_TAG("ul");
 
-				
+
 				/* we skip <HR> because it's not legal in XHTML-IM.  However,
 				 * we still want to send something sensible, so we put a
 				 * linebreak in its place. <BR> also needs special handling
@@ -2539,13 +2539,11 @@
  * people's settings if there is a problem writing the new values.
  */
 gboolean
-purple_util_write_data_to_file(const char *filename, const char *data, size_t size)
+purple_util_write_data_to_file(const char *filename, const char *data, gssize size)
 {
 	const char *user_dir = purple_user_dir();
-	gchar *filename_temp, *filename_full;
-	FILE *file;
-	size_t real_size, byteswritten;
-	struct stat st;
+	gchar *filename_full;
+	gboolean ret = FALSE;
 
 	g_return_val_if_fail(user_dir != NULL, FALSE);
 
@@ -2564,6 +2562,25 @@
 	}
 
 	filename_full = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", user_dir, filename);
+
+	ret = purple_util_write_data_to_file_absolute(filename_full,
+						      data,size);
+
+	g_free(filename_full);
+	return ret;
+}
+
+gboolean
+purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, size_t size)
+{
+	gchar *filename_temp;
+	FILE *file;
+	size_t real_size, byteswritten;
+	struct stat st;
+
+	purple_debug_info("util", "Writing file %s\n",
+					filename_full);
+
 	filename_temp = g_strdup_printf("%s.save", filename_full);
 
 	/* Remove an old temporary file, if one exists */
@@ -2571,8 +2588,9 @@
 	{
 		if (g_unlink(filename_temp) == -1)
 		{
-			purple_debug_error("util", "Error removing old file %s: %s\n",
-							 filename_temp, strerror(errno));
+			purple_debug_error("util", "Error removing old file "
+					   "%s: %s\n",
+					   filename_temp, strerror(errno));
 		}
 	}
 
@@ -2580,9 +2598,9 @@
 	file = g_fopen(filename_temp, "wb");
 	if (file == NULL)
 	{
-		purple_debug_error("util", "Error opening file %s for writing: %s\n",
-						 filename_temp, strerror(errno));
-		g_free(filename_full);
+		purple_debug_error("util", "Error opening file %s for "
+				   "writing: %s\n",
+				   filename_temp, strerror(errno));
 		g_free(filename_temp);
 		return FALSE;
 	}
@@ -2595,8 +2613,7 @@
 	if (fclose(file) != 0)
 	{
 		purple_debug_error("util", "Error closing file %s: %s\n",
-						 filename_temp, strerror(errno));
-		g_free(filename_full);
+				   filename_temp, strerror(errno));
 		g_free(filename_temp);
 		return FALSE;
 	}
@@ -2604,10 +2621,11 @@
 	/* Ensure the file is the correct size */
 	if (byteswritten != real_size)
 	{
-		purple_debug_error("util", "Error writing to file %s: Wrote %" G_GSIZE_FORMAT " bytes "
-						 "but should have written %" G_GSIZE_FORMAT "; is your disk full?\n",
-						 filename_temp, byteswritten, real_size);
-		g_free(filename_full);
+		purple_debug_error("util", "Error writing to file %s: Wrote %"
+				   G_GSIZE_FORMAT " bytes "
+				   "but should have written %" G_GSIZE_FORMAT
+				   "; is your disk full?\n",
+				   filename_temp, byteswritten, real_size);
 		g_free(filename_temp);
 		return FALSE;
 	}
@@ -2615,9 +2633,9 @@
 	if ((g_stat(filename_temp, &st) == -1) || (st.st_size != real_size))
 	{
 		purple_debug_error("util", "Error writing data to file %s: "
-						 "Incomplete file written; is your disk full?\n",
-						 filename_temp);
-		g_free(filename_full);
+				   "Incomplete file written; is your disk "
+				   "full?\n",
+				   filename_temp);
 		g_free(filename_temp);
 		return FALSE;
 	}
@@ -2635,10 +2653,10 @@
 	if (g_rename(filename_temp, filename_full) == -1)
 	{
 		purple_debug_error("util", "Error renaming %s to %s: %s\n",
-						 filename_temp, filename_full, strerror(errno));
+				   filename_temp, filename_full,
+				   strerror(errno));
 	}
 
-	g_free(filename_full);
 	g_free(filename_temp);
 
 	return TRUE;
@@ -4305,7 +4323,7 @@
 	}
 }
 
-gboolean purple_message_meify(char *message, size_t len)
+gboolean purple_message_meify(char *message, gssize len)
 {
 	char *c;
 	gboolean inside_html = FALSE;
@@ -4442,10 +4460,11 @@
 const char *_purple_oscar_convert(const char *act, const char *protocol)
 {
 	if (protocol && act && strcmp(protocol, "prpl-oscar") == 0) {
-		if (isdigit(*act))
-			protocol = "prpl-icq";
-		else
-			protocol = "prpl-aim";
+		int i;
+		for (i = 0; act[i] != '\0'; i++)
+			if (!isdigit(act[i]))
+				return "prpl-aim";
+		return "prpl-icq";
 	}
 	return protocol;
 }
diff -ru pidgin-2.1.1/libpurple/util.h pidgin-2.2.0/libpurple/util.h
--- pidgin-2.1.1/libpurple/util.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/util.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @todo Rename the functions so that they live somewhere in the purple
  *       namespace.
@@ -586,7 +586,27 @@
  * @return TRUE if the file was written successfully.  FALSE otherwise.
  */
 gboolean purple_util_write_data_to_file(const char *filename, const char *data,
-									  size_t size);
+									  gssize size);
+
+/**
+ * Write data to a file using the absolute path.
+ *
+ * This exists for Glib backwards compatibility reasons.
+ *
+ * @param filename_full Filename to write to
+ * @param data          A null-terminated string of data to write.
+ * @param size          The size of the data to save.  If data is
+ *                      null-terminated you can pass in -1.
+ *
+ * @return TRUE if the file was written successfully.  FALSE otherwise.
+ *
+ * @todo Remove this function (use g_file_set_contents instead) when 3.0.0
+ *       rolls around.
+ * @see purple_util_write_data_to_file()
+ *
+ */
+gboolean
+purple_util_write_data_to_file_absolute(const char *filename_full, const char *data, size_t size);
 
 /**
  * Read the contents of a given file and parse the results into an
@@ -1113,7 +1133,7 @@
  * @return TRUE if it starts with "/me ", and it has been removed, otherwise
  *         FALSE
  */
-gboolean purple_message_meify(char *message, size_t len);
+gboolean purple_message_meify(char *message, gssize len);
 
 /**
  * Removes the underscore characters from a string used identify the mnemonic
diff -ru pidgin-2.1.1/libpurple/value.c pidgin-2.2.0/libpurple/value.c
--- pidgin-2.1.1/libpurple/value.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/value.c	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/libpurple/value.h pidgin-2.2.0/libpurple/value.h
--- pidgin-2.1.1/libpurple/value.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/value.h	2007-09-14 00:45:40.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_VALUE_H_
 #define _PURPLE_VALUE_H_
@@ -77,7 +77,8 @@
 	PURPLE_SUBTYPE_SAVEDSTATUS,
 	PURPLE_SUBTYPE_XMLNODE,
 	PURPLE_SUBTYPE_USERINFO,
-	PURPLE_SUBTYPE_STORED_IMAGE
+	PURPLE_SUBTYPE_STORED_IMAGE,
+	PURPLE_SUBTYPE_CERTIFICATEPOOL
 } PurpleSubType;
 
 /**
diff -ru pidgin-2.1.1/libpurple/version.c pidgin-2.2.0/libpurple/version.c
--- pidgin-2.1.1/libpurple/version.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/version.c	2007-09-14 00:45:40.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/libpurple/version.h pidgin-2.2.0/libpurple/version.h
--- pidgin-2.1.1/libpurple/version.h	2007-08-20 14:14:36.000000000 -0400
+++ pidgin-2.2.0/libpurple/version.h	2007-09-14 03:32:02.000000000 -0400
@@ -19,14 +19,14 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_VERSION_H_
 #define _PURPLE_VERSION_H_
 
 #define PURPLE_MAJOR_VERSION (2)
-#define PURPLE_MINOR_VERSION (1)
-#define PURPLE_MICRO_VERSION (1)
+#define PURPLE_MINOR_VERSION (2)
+#define PURPLE_MICRO_VERSION (0)
 
 #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
 									 ((y) < PURPLE_MINOR_VERSION || \
diff -ru pidgin-2.1.1/libpurple/version.h.in pidgin-2.2.0/libpurple/version.h.in
--- pidgin-2.1.1/libpurple/version.h.in	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/version.h.in	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_VERSION_H_
 #define _PURPLE_VERSION_H_
diff -ru pidgin-2.1.1/libpurple/whiteboard.c pidgin-2.2.0/libpurple/whiteboard.c
--- pidgin-2.1.1/libpurple/whiteboard.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/whiteboard.c	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/libpurple/whiteboard.h pidgin-2.2.0/libpurple/whiteboard.h
--- pidgin-2.1.1/libpurple/whiteboard.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/whiteboard.h	2007-09-14 00:45:40.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PURPLE_WHITEBOARD_H_
diff -ru pidgin-2.1.1/libpurple/win32/giowin32.c pidgin-2.2.0/libpurple/win32/giowin32.c
--- pidgin-2.1.1/libpurple/win32/giowin32.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/giowin32.c	2007-09-14 00:45:40.000000000 -0400
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/libpurple/win32/global.mak pidgin-2.2.0/libpurple/win32/global.mak
--- pidgin-2.1.1/libpurple/win32/global.mak	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/global.mak	2007-08-30 00:36:32.000000000 -0400
@@ -11,7 +11,7 @@
 # Locations of our various dependencies
 WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3
-GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.6
+GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.11
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
 GTK_BIN ?= $(GTK_TOP)/bin
 BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
@@ -20,7 +20,7 @@
 NSPR_TOP ?= $(WIN32_DEV_TOP)/nspr-4.6.4
 NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.11.4
 PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl58
-SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.0.2
+SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.2
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 
 # Where we installing this stuff to?
diff -ru pidgin-2.1.1/libpurple/win32/libc_interface.c pidgin-2.2.0/libpurple/win32/libc_interface.c
--- pidgin-2.1.1/libpurple/win32/libc_interface.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/libc_interface.c	2007-09-14 00:45:40.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include <winsock2.h>
diff -ru pidgin-2.1.1/libpurple/win32/libc_interface.h pidgin-2.2.0/libpurple/win32/libc_interface.h
--- pidgin-2.1.1/libpurple/win32/libc_interface.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/libc_interface.h	2007-09-14 00:45:40.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _LIBC_INTERFACE_H_
diff -ru pidgin-2.1.1/libpurple/win32/libc_internal.h pidgin-2.2.0/libpurple/win32/libc_internal.h
--- pidgin-2.1.1/libpurple/win32/libc_internal.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/libc_internal.h	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _LIBC_INTERNAL_
diff -ru pidgin-2.1.1/libpurple/win32/win32dep.c pidgin-2.2.0/libpurple/win32/win32dep.c
--- pidgin-2.1.1/libpurple/win32/win32dep.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/win32dep.c	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #define _WIN32_IE 0x500
diff -ru pidgin-2.1.1/libpurple/win32/win32dep.h pidgin-2.2.0/libpurple/win32/win32dep.h
--- pidgin-2.1.1/libpurple/win32/win32dep.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/win32dep.h	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _WIN32DEP_H_
diff -ru pidgin-2.1.1/libpurple/win32/wpurpleerror.h pidgin-2.2.0/libpurple/win32/wpurpleerror.h
--- pidgin-2.1.1/libpurple/win32/wpurpleerror.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/win32/wpurpleerror.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _WPURPLEERROR_H
diff -ru pidgin-2.1.1/libpurple/xmlnode.c pidgin-2.2.0/libpurple/xmlnode.c
--- pidgin-2.1.1/libpurple/xmlnode.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/xmlnode.c	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 /* A lot of this code at least resembles the code in libxode, but since
@@ -272,6 +272,8 @@
 	if(NULL != node->parent) {
 		if(node->parent->child == node) {
 			node->parent->child = node->next;
+			if (node->parent->lastchild == node)
+				node->parent->lastchild = node->next;
 		} else {
 			xmlnode *prev = node->parent->child;
 			while(prev && prev->next != node) {
@@ -279,6 +281,8 @@
 			}
 			if(prev) {
 				prev->next = node->next;
+				if (node->parent->lastchild == node)
+					node->parent->lastchild = prev;
 			}
 		}
 	}
@@ -545,7 +549,16 @@
 xmlnode_parser_error_libxml(void *user_data, const char *msg, ...)
 {
 	struct _xmlnode_parser_data *xpd = user_data;
+	char errmsg[2048];
+	va_list args;
+
 	xpd->error = TRUE;
+
+	va_start(args, msg);
+	vsnprintf(errmsg, sizeof(errmsg), msg, args);
+	va_end(args);
+
+	purple_debug_error("xmlnode", "Error parsing xml file: %s\n", errmsg);
 }
 
 static xmlSAXHandler xmlnode_parser_libxml = {
@@ -623,6 +636,7 @@
 	g_return_val_if_fail(src != NULL, NULL);
 
 	ret = new_node(src->name, src->type);
+	ret->xmlns = g_strdup(src->xmlns);
 	if(src->data) {
 		if(src->data_sz) {
 			ret->data = g_memdup(src->data, src->data_sz);
diff -ru pidgin-2.1.1/libpurple/xmlnode.h pidgin-2.2.0/libpurple/xmlnode.h
--- pidgin-2.1.1/libpurple/xmlnode.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/libpurple/xmlnode.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PURPLE_XMLNODE_H_
 #define _PURPLE_XMLNODE_H_
@@ -262,7 +262,7 @@
 xmlnode *xmlnode_copy(const xmlnode *src);
 
 /**
- * Frees a node and all of it's children.
+ * Frees a node and all of its children.
  *
  * @param node The node to free.
  */
diff -ru pidgin-2.1.1/ltmain.sh pidgin-2.2.0/ltmain.sh
--- pidgin-2.1.1/ltmain.sh	2006-06-19 14:36:49.000000000 -0400
+++ pidgin-2.2.0/ltmain.sh	2007-08-14 13:43:36.000000000 -0400
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-4"
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs 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
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,12 +113,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +146,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +208,13 @@
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +345,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +482,12 @@
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2007  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +784,10 @@
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1168,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1178,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,7 +1639,7 @@
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1620,10 +1659,11 @@
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1691,9 @@
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1752,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2097,7 +2137,7 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2493,7 +2533,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3189,7 +3231,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3200,9 +3242,10 @@
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  *)
 	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
@@ -3266,7 +3309,8 @@
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3280,8 +3324,11 @@
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3418,11 +3465,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3523,13 +3570,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3568,9 +3614,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3602,7 +3646,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3888,7 +3932,10 @@
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4247,12 +4294,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4700,16 +4749,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4724,13 +4773,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4817,7 +4866,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4854,7 +4903,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5261,6 +5310,20 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs 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
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5403,7 +5466,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5589,7 +5652,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5934,9 +5997,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6145,7 +6208,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6356,8 +6419,10 @@
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6421,12 +6486,12 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6783,9 +6848,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6799,9 +6864,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff -ru pidgin-2.1.1/m4macros/Makefile.in pidgin-2.2.0/m4macros/Makefile.in
--- pidgin-2.1.1/m4macros/Makefile.in	2007-08-20 14:14:00.000000000 -0400
+++ pidgin-2.2.0/m4macros/Makefile.in	2007-09-14 03:31:27.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/Makefile.in pidgin-2.2.0/Makefile.in
--- pidgin-2.1.1/Makefile.in	2007-08-20 14:14:12.000000000 -0400
+++ pidgin-2.2.0/Makefile.in	2007-09-14 03:31:38.000000000 -0400
@@ -141,6 +141,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -169,6 +171,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -224,14 +228,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -243,7 +245,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -304,6 +305,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -324,6 +326,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/Makefile.mingw pidgin-2.2.0/Makefile.mingw
--- pidgin-2.1.1/Makefile.mingw	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -51,6 +51,7 @@
 	silc.dll \
 	silcclient.dll \
 	softokn3.dll \
+	smime3.dll \
 	ssl3.dll
 
 #build an expression for `find` to use to ignore the above files
diff -ru pidgin-2.1.1/NEWS pidgin-2.2.0/NEWS
--- pidgin-2.1.1/NEWS	2007-08-20 14:12:48.000000000 -0400
+++ pidgin-2.2.0/NEWS	2007-09-14 02:42:34.000000000 -0400
@@ -1,5 +1,24 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.2.0 (9/13/2007):
+	Sean: 2.2.0 contains the results of several major Google Summer
+	of Code branches bringing some new, extraordinary features. We
+	have a new protocol, MySpaceIM, a bunch of new features for an
+	existing protocol, XMPP, and nifty new certificate management
+	to make sure your IM server is who it says it is.
+
+	Ka-Hing: A number of you noticed crashes when dragging windows
+	around when certain options are enabled. Well, that was my fault,
+	and Sadrul fixed it. So Props to him and poos to me. I haven't
+	done much for this release, but the next one should contain
+	something that I helped work on. Hint: students are cheap slave
+	coders!
+
+	Kevin: I haven't really been coding much in Pidgin, and this
+	release is no exception, but I will be working on getting our
+	wonderful web site to be a little more functional by next
+	release.  I promise!
+
 2.1.1 (8/20/2007):
 	Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1
 	is out. In it, we've addressed a lot of UI issues from our
diff -ru pidgin-2.1.1/pidgin/eggtrayicon.c pidgin-2.2.0/pidgin/eggtrayicon.c
--- pidgin-2.1.1/pidgin/eggtrayicon.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/eggtrayicon.c	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #include <config.h>
diff -ru pidgin-2.1.1/pidgin/eggtrayicon.h pidgin-2.2.0/pidgin/eggtrayicon.h
--- pidgin-2.1.1/pidgin/eggtrayicon.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/eggtrayicon.h	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef __EGG_TRAY_ICON_H__
diff -ru pidgin-2.1.1/pidgin/gtkaccount.c pidgin-2.2.0/pidgin/gtkaccount.c
--- pidgin-2.1.1/pidgin/gtkaccount.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkaccount.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -136,9 +136,6 @@
 	GtkWidget *proxy_user_entry;
 	GtkWidget *proxy_pass_entry;
 
-	/* Are we registering? */
-	gboolean   registering;
-
 } AccountPrefsDialog;
 
 typedef struct
@@ -272,7 +269,8 @@
 	add_user_options(dialog,     dialog->top_vbox);
 	add_protocol_options(dialog, dialog->bottom_vbox);
 
-	if (!dialog->prpl_info || !dialog->prpl_info->register_user) {
+	if (!dialog->prpl_info || !dialog->prpl_info->register_user || 
+	    g_object_get_data(G_OBJECT(item), "fake")) {
 		gtk_widget_hide(dialog->register_button);
 	} else {
 		if (dialog->prpl_info != NULL &&
@@ -654,8 +652,10 @@
 		if (!(dialog->prpl_info->options & OPT_PROTO_MAIL_CHECK))
 			gtk_widget_hide(dialog->new_mail_check);
 
-		if (dialog->prpl_info->icon_spec.format == NULL)
+		if (dialog->prpl_info->icon_spec.format == NULL) {
+			gtk_widget_hide(dialog->icon_check);
 			gtk_widget_hide(dialog->icon_hbox);
+		}
 	}
 
 	if (dialog->account != NULL) {
@@ -1146,7 +1146,7 @@
 	account_win_destroy_cb(NULL, NULL, dialog);
 }
 
-static PurpleAccount*
+static void
 ok_account_prefs_cb(GtkWidget *w, AccountPrefsDialog *dialog)
 {
 	PurpleProxyInfo *proxy_info = NULL;
@@ -1154,22 +1154,58 @@
 	const char *value;
 	char *username;
 	char *tmp;
-	gboolean new = FALSE, icon_change = FALSE;
+	gboolean new_acct = FALSE, icon_change = FALSE;
 	PurpleAccount *account;
 	PurplePluginProtocolInfo *prpl_info;
 
+	/* Build the username string. */
+	username = g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry)));
+
+	if (dialog->prpl_info != NULL)
+	{
+		for (l = dialog->prpl_info->user_splits,
+			 l2 = dialog->user_split_entries;
+			 l != NULL && l2 != NULL;
+			 l = l->next, l2 = l2->next)
+		{
+			PurpleAccountUserSplit *split = l->data;
+			GtkEntry *entry = l2->data;
+			char sep[2] = " ";
+
+			value = gtk_entry_get_text(entry);
+
+			*sep = purple_account_user_split_get_separator(split);
+
+			tmp = g_strconcat(username, sep,
+					(*value ? value :
+					 purple_account_user_split_get_default_value(split)),
+					NULL);
+
+			g_free(username);
+			username = tmp;
+		}
+	}
+
 	if (dialog->account == NULL)
 	{
-		const char *screenname;
+		if (purple_accounts_find(username, dialog->protocol_id) != NULL) {
+			purple_debug_warning("gtkaccount", "Trying to add a duplicate %s account (%s).\n",
+				dialog->protocol_id, username);
+
+			purple_notify_error(NULL, NULL, _("Unable to save new account"),
+				_("An account already exists with the specified criteria."));
+
+			g_free(username);
+			return;
+		}
 
 		if (purple_accounts_get_all() == NULL) {
 			/* We're adding our first account.  Be polite and show the buddy list */
 			purple_blist_set_visible(TRUE);
 		}
 
-		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));
-		account = purple_account_new(screenname, dialog->protocol_id);
-		new = TRUE;
+		account = purple_account_new(username, dialog->protocol_id);
+		new_acct = TRUE;
 	}
 	else
 	{
@@ -1193,7 +1229,7 @@
 	{
 		const char *filename;
 
-		if (new || purple_account_get_bool(account, "use-global-buddyicon", TRUE) ==
+		if (new_acct || purple_account_get_bool(account, "use-global-buddyicon", TRUE) ==
 			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)))
 		{
 			icon_change = TRUE;
@@ -1246,40 +1282,11 @@
 	 * the account editor (but has not checked the 'save' box), then we
 	 * don't want to prompt them.
 	 */
-	if ((purple_account_get_remember_password(account) || new) && (*value != '\0'))
+	if ((purple_account_get_remember_password(account) || new_acct) && (*value != '\0'))
 		purple_account_set_password(account, value);
 	else
 		purple_account_set_password(account, NULL);
 
-	/* Build the username string. */
-	username =
-		g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry)));
-
-	if (dialog->prpl_info != NULL)
-	{
-		for (l = dialog->prpl_info->user_splits,
-			 l2 = dialog->user_split_entries;
-			 l != NULL && l2 != NULL;
-			 l = l->next, l2 = l2->next)
-		{
-			PurpleAccountUserSplit *split = l->data;
-			GtkEntry *entry = l2->data;
-			char sep[2] = " ";
-
-			value = gtk_entry_get_text(entry);
-
-			*sep = purple_account_user_split_get_separator(split);
-
-			tmp = g_strconcat(username, sep,
-					(*value ? value :
-					 purple_account_user_split_get_default_value(split)),
-					NULL);
-
-			g_free(username);
-			username = tmp;
-		}
-	}
-
 	purple_account_set_username(account, username);
 	g_free(username);
 
@@ -1388,13 +1395,15 @@
 	}
 
 	/* If this is a new account, add it to our list */
-	if (new)
+	if (new_acct)
 		purple_accounts_add(account);
 	else
 		purple_signal_emit(pidgin_account_get_handle(), "account-modified", account);
 
 	/* If this is a new account, then sign on! */
-	if (new && !dialog->registering) {
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->register_button))) {
+		purple_account_register(account);
+	} else if (new_acct) {
 		const PurpleSavedStatus *saved_status;
 
 		saved_status = purple_savedstatus_get_current();
@@ -1407,22 +1416,8 @@
 	/* We no longer need the data from the dialog window */
 	account_win_destroy_cb(NULL, NULL, dialog);
 
-	return account;
-}
-
-static void
-register_account_prefs_cb(GtkWidget *w, AccountPrefsDialog *dialog)
-{
-	PurpleAccount *account;
-
-	dialog->registering = TRUE;
-
-	account = ok_account_prefs_cb(NULL, dialog);
-
-	purple_account_register(account);
 }
 
-
 static const GtkTargetEntry dnd_targets[] = {
 	{"text/plain", 0, 0},
 	{"text/uri-list", 0, 1},
@@ -1501,6 +1496,18 @@
 	add_login_options(dialog, vbox);
 	add_user_options(dialog, vbox);
 
+	button = gtk_check_button_new_with_label(_("Create this new account on the server"));
+	gtk_box_pack_start(GTK_BOX(main_vbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	dialog->register_button = button;
+	if (dialog->account == NULL)
+		gtk_widget_set_sensitive(button, FALSE);
+
+	if (!dialog->prpl_info || !dialog->prpl_info->register_user)
+		gtk_widget_hide(button);
+
+
+
 	/* Setup the page with 'Advanced'. */
 	dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
 	gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER);
@@ -1519,22 +1526,6 @@
 	gtk_box_pack_end(GTK_BOX(main_vbox), bbox, FALSE, TRUE, 0);
 	gtk_widget_show(bbox);
 
-	/* Register button */
-	button = gtk_button_new_with_label(_("Register"));
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
-	g_signal_connect(G_OBJECT(button), "clicked",
-			G_CALLBACK(register_account_prefs_cb), dialog);
-
-	dialog->register_button = button;
-
-	if (dialog->account == NULL)
-		gtk_widget_set_sensitive(button, FALSE);
-
-	if (!dialog->prpl_info || !dialog->prpl_info->register_user)
-		gtk_widget_hide(button);
-
 	/* Cancel button */
 	button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
@@ -2416,13 +2407,6 @@
 
 	g_free(accounts_window);
 	accounts_window = NULL;
-
-	/* See if we're the main window here. */
-	if (PIDGIN_BLIST(purple_get_blist())->window == NULL &&
-		purple_connections_get_all() == NULL) {
-
-		purple_core_quit();
-	}
 }
 
 static void
diff -ru pidgin-2.1.1/pidgin/gtkaccount.h pidgin-2.2.0/pidgin/gtkaccount.h
--- pidgin-2.1.1/pidgin/gtkaccount.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkaccount.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINACCOUNT_H_
 #define _PIDGINACCOUNT_H_
diff -ru pidgin-2.1.1/pidgin/gtkblist.c pidgin-2.2.0/pidgin/gtkblist.c
--- pidgin-2.1.1/pidgin/gtkblist.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkblist.c	2007-09-14 04:33:10.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -42,6 +42,7 @@
 #include "gtkaccount.h"
 #include "gtkblist.h"
 #include "gtkcellrendererexpander.h"
+#include "gtkcertmgr.h"
 #include "gtkconv.h"
 #include "gtkdebug.h"
 #include "gtkdialogs.h"
@@ -123,8 +124,9 @@
 #endif
 static PidginBuddyList *gtkblist = NULL;
 
+static GList *groups_tree(void);
 static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list);
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean statusChange);
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change);
 static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
 static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node);
 static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node);
@@ -331,8 +333,10 @@
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name,
 											   chat->account);
 
-	if (conv != NULL)
+	if (conv != NULL) {
+		pidgin_conv_attach_to_conversation(conv);
 		purple_conversation_present(conv);
+	}
 
 	serv_join_chat(chat->account->gc, chat->components);
 	g_free(chat_name);
@@ -611,6 +615,8 @@
 static void
 pidgin_blist_update_privacy_cb(PurpleBuddy *buddy)
 {
+	if (buddy->node.ui_data == NULL || ((struct _pidgin_blist_node*)buddy->node.ui_data)->row == NULL)
+		return;
 	pidgin_blist_update_buddy(purple_get_blist(), (PurpleBlistNode*)(buddy), TRUE);
 }
 
@@ -1538,6 +1544,12 @@
 	pidgin_clear_cursor(gtkblist->window);
 }
 
+static void pidgin_blist_show_protocol_icons_cb(gpointer data, guint action, GtkWidget *item)
+{
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons",
+			      gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
+}
+
 static void pidgin_blist_show_empty_groups_cb(gpointer data, guint action, GtkWidget *item)
 {
 	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
@@ -2528,7 +2540,8 @@
 	GValue val;
 	struct _pidgin_blist_node *gtknode;
 
-	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
+	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2), 
+		&path, NULL, NULL, NULL))
 		return FALSE;
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
 	val.g_type = 0;
@@ -2585,7 +2598,8 @@
 	PurpleBlistNode *node;
 	GValue val;
 
-	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
+	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y + (gtkblist->tip_rect.height/2), 
+		&path, NULL, NULL, NULL))
 		return FALSE;
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
 	val.g_type = 0;
@@ -2609,6 +2623,7 @@
 	struct _pidgin_blist_node *gtknode;
 	GdkRectangle mon_size;
 	int sig;
+	const char *name;
 	
 	if (node == NULL)
 		return;
@@ -2666,7 +2681,9 @@
 
 	gtknode = node->ui_data;
 
+	name = gtk_window_get_title(GTK_WINDOW(gtk_widget_get_toplevel(widget)));
 	gtk_widget_set_app_paintable(gtkblist->tipwindow, TRUE);
+	gtk_window_set_title(GTK_WINDOW(gtkblist->tipwindow), name ? name : _("Buddy List"));
 	gtk_window_set_resizable(GTK_WINDOW(gtkblist->tipwindow), FALSE);
 	gtk_widget_set_name(gtkblist->tipwindow, "gtk-tooltips");
 	g_signal_connect(G_OBJECT(gtkblist->tipwindow), "expose_event",
@@ -2853,10 +2870,12 @@
 	{ N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
 	{ N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
 	{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show"), NULL, NULL, 0, "<Branch>", NULL},
+	{ N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL },
 	{ "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
@@ -2872,6 +2891,7 @@
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<Item>", NULL },
+	{ N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL },
 	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
@@ -3082,7 +3102,8 @@
 			purple_notify_user_info_add_pair(user_info, _("Status"), _("Offline"));
 		}
 
-		if (prpl_info && prpl_info->tooltip_text)
+		if (purple_account_is_connected(b->account) &&
+				prpl_info && prpl_info->tooltip_text)
 		{
 			/* Additional text from the PRPL */
 			prpl_info->tooltip_text(b, user_info, full);
@@ -3141,10 +3162,11 @@
 			return ret;
 		}
 
-		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded)
+		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded) {
+			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
+				return NULL;
 			return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
-	} else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
-		return pidgin_create_prpl_icon(((PurpleChat*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+		}
 	} else {
 		return NULL;
 	}
@@ -3192,6 +3214,7 @@
 {
 	GdkPixbuf *ret;
 	const char *protoname = NULL;
+	const char *icon = NULL;
 	struct _pidgin_blist_node *gtknode = node->ui_data;
 	struct _pidgin_blist_node *gtkbuddynode = NULL;
 	PurpleBuddy *buddy = NULL;
@@ -3240,62 +3263,54 @@
 									     purple_buddy_get_name(buddy),
 									     purple_buddy_get_account(buddy));
 		PurplePresence *p;
+		gboolean trans;
+
 		if(conv != NULL) {
 			PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
-			if(gtkconv != NULL && pidgin_conv_is_hidden(gtkconv) && size == PIDGIN_STATUS_ICON_SMALL) {
+			if((gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) && size == PIDGIN_STATUS_ICON_SMALL) {
 				return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_MESSAGE,
 							       icon_size, "GtkTreeView");
 			}
 		}
+
 		p = purple_buddy_get_presence(buddy);
+		trans = (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL);
 
 		if (PURPLE_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff)
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGIN,
-					icon_size, "GtkTreeView");
+			icon = PIDGIN_STOCK_STATUS_LOGIN;
 		else if (gtkbuddynode && gtkbuddynode->recent_signonoff)
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGOUT,
-					icon_size, "GtkTreeView");
+			icon = PIDGIN_STOCK_STATUS_LOGOUT;
 		else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
-			if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL)
-				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY_I,
-						icon_size, "GtkTreeView");
+			if (trans)
+				icon = PIDGIN_STOCK_STATUS_BUSY_I;
 			else
-				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY,
-						icon_size, "GtkTreeView");
+				icon = PIDGIN_STOCK_STATUS_BUSY;
 		else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
-		        if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL)
-		                ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY_I,
-		                                icon_size, "GtkTreeView");
+			if (trans)
+				icon = PIDGIN_STOCK_STATUS_AWAY_I;
 		 	else
-				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY,
-						icon_size, "GtkTreeView");
+				icon = PIDGIN_STOCK_STATUS_AWAY;
 		else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY))
-			if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL)
-		        	ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA_I,
-						icon_size, "GtkTreeView");
+			if (trans)
+				icon = PIDGIN_STOCK_STATUS_XA_I;
 			else
-				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA,
-						icon_size, "GtkTreeView");
+				icon = PIDGIN_STOCK_STATUS_XA;
 		else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE,
-					icon_size, "GtkTreeView");
-		else if (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL)
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE_I,
-					icon_size, "GtkTreeView");
+			icon = PIDGIN_STOCK_STATUS_OFFLINE;
+		else if (trans)
+			icon = PIDGIN_STOCK_STATUS_AVAILABLE_I;
 		else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
-			ret = gtk_widget_render_icon(GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_INVISIBLE,
-					icon_size, "GtkTreeView");
+			icon = PIDGIN_STOCK_STATUS_INVISIBLE;
 		else
-			ret = gtk_widget_render_icon(GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE,
-					icon_size, "GtkTreeView");
+			icon = PIDGIN_STOCK_STATUS_AVAILABLE;
 	} else if (chat) {
-		ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_CHAT,
-				icon_size, "GtkTreeView");
+		icon = PIDGIN_STOCK_STATUS_CHAT;
 	} else {
-		ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_PERSON,
-				icon_size, "GtkTreeView");
+		icon = PIDGIN_STOCK_STATUS_PERSON;
 	}
 
+	ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), icon,
+			icon_size, "GtkTreeView");
 	return ret;
 }
 
@@ -3318,7 +3333,7 @@
 
 	if(conv != NULL) {
 		gtkconv = PIDGIN_CONVERSATION(conv);
-		if(gtkconv != NULL && pidgin_conv_is_hidden(gtkconv)) {
+		if(gtkconv == NULL || pidgin_conv_is_hidden(gtkconv)) {
 			hidden_conv = TRUE;
 		}
 	}
@@ -4403,7 +4418,10 @@
 						 G_TYPE_BOOLEAN,  /* Contact expander */
 						 G_TYPE_BOOLEAN,  /* Contact expander visible */
 						 GDK_TYPE_PIXBUF, /* Emblem */
-						 G_TYPE_BOOLEAN); /* Emblem visible */
+						 G_TYPE_BOOLEAN,  /* Emblem visible */
+						 GDK_TYPE_PIXBUF, /* Protocol icon */
+						 G_TYPE_BOOLEAN   /* Protocol visible */
+						);
 
 	gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
 
@@ -4518,6 +4536,17 @@
 							  "visible", EMBLEM_VISIBLE_COLUMN, NULL);
 
 	rend = gtk_cell_renderer_pixbuf_new();
+	gtk_tree_view_column_pack_start(column, rend, FALSE);	
+	gtk_tree_view_column_set_attributes(column, rend,
+					   "pixbuf", PROTOCOL_ICON_COLUMN,
+					   "visible", PROTOCOL_ICON_VISIBLE_COLUMN,
+#if GTK_CHECK_VERSION(2,6,0)
+					   "cell-background-gdk", BGCOLOR_COLUMN,
+#endif
+					  NULL);
+	g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL);
+
+	rend = gtk_cell_renderer_pixbuf_new();
 	g_object_set(rend, "xalign", 1.0, "ypad", 0, NULL);
 	gtk_tree_view_column_pack_start(column, rend, FALSE);
 	gtk_tree_view_column_set_attributes(column, rend, "pixbuf", BUDDY_ICON_COLUMN,
@@ -4563,21 +4592,24 @@
 	/* set the Show Offline Buddies option. must be done
 	 * after the treeview or faceprint gets mad. -Robot101
 	 */
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Offline Buddies"))),
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Offline Buddies"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies"));
 
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Empty Groups"))),
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Empty Groups"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Tools/Mute Sounds"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"));
 
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Buddy Details"))),
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Buddy Details"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"));
 
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Idle Times"))),
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Idle Times"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time"));
 
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Protocol Icons"))),
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"));
+
 	if(!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
 		gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE);
 
@@ -4607,6 +4639,8 @@
 			_prefs_change_redo_list, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_offline_buddies",
 			_prefs_change_redo_list, NULL);
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_protocol_icons",
+			_prefs_change_redo_list, NULL);
 
 	/* sorting */
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/sort_type",
@@ -5038,6 +5072,8 @@
 			   BUDDY_ICON_VISIBLE_COLUMN, biglist,
 			   EMBLEM_COLUMN, emblem,
 			   EMBLEM_VISIBLE_COLUMN, emblem,
+			   PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(buddy->account, PIDGIN_PRPL_ICON_SMALL),
+			   PROTOCOL_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"),
 			   BGCOLOR_COLUMN, NULL,
 			   CONTACT_EXPANDER_COLUMN, NULL,
 			   CONTACT_EXPANDER_VISIBLE_COLUMN, expanded,
@@ -5122,7 +5158,7 @@
 
 
 
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean statusChange)
+static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change)
 {
 	PurpleBuddy *buddy;
 	struct _pidgin_blist_node *gtkparentnode;
@@ -5175,6 +5211,10 @@
 		GdkPixbuf *emblem;
 		char *mark;
 		gboolean showicons = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
+		const char *name = purple_chat_get_name(chat);
+		PurpleConversation *conv =
+				purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, name, chat->account);
+		gboolean hidden = (conv && !PIDGIN_CONVERSATION(conv));
 
 		if(!insert_node(list, node, &iter))
 			return;
@@ -5190,14 +5230,21 @@
 			avatar = NULL;
 
 		mark = g_markup_escape_text(purple_chat_get_name(chat), -1);
+		if (hidden) {
+			char *bold = g_strdup_printf("<b>%s</b>", mark);
+			g_free(mark);
+			mark = bold;
+		}
 
 		gtk_tree_store_set(gtkblist->treemodel, &iter,
 				STATUS_ICON_COLUMN, status,
 				STATUS_ICON_VISIBLE_COLUMN, TRUE,
 				BUDDY_ICON_COLUMN, avatar ? avatar : gtkblist->empty_avatar,
 				BUDDY_ICON_VISIBLE_COLUMN,  purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"),
-			        EMBLEM_COLUMN, emblem,
+				EMBLEM_COLUMN, emblem,
 				EMBLEM_VISIBLE_COLUMN, emblem != NULL,
+				PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(chat->account, PIDGIN_PRPL_ICON_SMALL),
+				PROTOCOL_ICON_VISIBLE_COLUMN, purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"),
 				NAME_COLUMN, mark,
 				GROUP_EXPANDER_VISIBLE_COLUMN, FALSE,
 				-1);
@@ -5311,15 +5358,17 @@
 static GList *
 groups_tree(void)
 {
-	GList *tmp = NULL;
+	static GList *list = NULL;
 	char *tmp2;
 	PurpleGroup *g;
 	PurpleBlistNode *gnode;
 
+	g_list_free(list);
+	list = NULL;
+
 	if (purple_get_blist()->root == NULL)
 	{
-		tmp2 = g_strdup(_("Buddies"));
-		tmp  = g_list_append(tmp, tmp2);
+		list  = g_list_append(list, (gpointer)_("Buddies"));
 	}
 	else
 	{
@@ -5331,12 +5380,12 @@
 			{
 				g    = (PurpleGroup *)gnode;
 				tmp2 = g->name;
-				tmp  = g_list_append(tmp, tmp2);
+				list  = g_list_append(list, tmp2);
 			}
 		}
 	}
 
-	return tmp;
+	return list;
 }
 
 static void
@@ -5365,7 +5414,7 @@
 	if (resp == GTK_RESPONSE_OK)
 	{
 		who = gtk_entry_get_text(GTK_ENTRY(data->entry));
-		grp = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry));
+		grp = pidgin_text_combo_box_entry_get_text(data->combo);
 		whoalias = gtk_entry_get_text(GTK_ENTRY(data->entry_for_alias));
 		if (*whoalias == '\0')
 			whoalias = NULL;
@@ -5531,19 +5580,15 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
 
-	data->combo = gtk_combo_new();
-	gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree());
+	data->combo = pidgin_text_combo_box_entry_new(group, groups_tree());
 	gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 3, 4);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->combo)->entry);
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->combo)->child);
 	pidgin_set_accessible_label (data->combo, label);
 
 	g_signal_connect(G_OBJECT(data->window), "response",
 					 G_CALLBACK(add_buddy_cb), data);
 
 	gtk_widget_show_all(data->window);
-
-	if (group != NULL)
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->combo)->entry), group);
 }
 
 static void
@@ -5582,7 +5627,7 @@
 							   gtk_entry_get_text(GTK_ENTRY(data->alias_entry)),
 							   components);
 
-	group_name = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry));
+	group_name = pidgin_text_combo_box_entry_get_text(data->group_combo);
 
 	if ((group = purple_find_group(group_name)) == NULL)
 	{
@@ -5885,17 +5930,10 @@
 	gtk_size_group_add_widget(data->sg, label);
 	gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
 
-	data->group_combo = gtk_combo_new();
-	gtk_combo_set_popdown_strings(GTK_COMBO(data->group_combo), groups_tree());
-	gtk_box_pack_end(GTK_BOX(rowbox), data->group_combo, TRUE, TRUE, 0);
-
-	if (group)
-	{
-		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry),
-						   group->name);
-	}
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_COMBO(data->group_combo)->entry);
+	data->group_combo = pidgin_text_combo_box_entry_new(group ? group->name : NULL, groups_tree());
+	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_BIN(data->group_combo)->child);
 	pidgin_set_accessible_label (data->group_combo, label);
+	gtk_box_pack_end(GTK_BOX(rowbox), data->group_combo, TRUE, TRUE, 0);
 
 	g_signal_connect(G_OBJECT(data->window), "response",
 					 G_CALLBACK(add_chat_resp_cb), data);
@@ -6091,6 +6129,7 @@
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time", TRUE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE);
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/blist/sort_type", "alphabetical");
diff -ru pidgin-2.1.1/pidgin/gtkblist.h pidgin-2.2.0/pidgin/gtkblist.h
--- pidgin-2.1.1/pidgin/gtkblist.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkblist.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINBLIST_H_
 #define _PIDGINBLIST_H_
@@ -43,6 +43,8 @@
 	CONTACT_EXPANDER_VISIBLE_COLUMN,
 	EMBLEM_COLUMN,
 	EMBLEM_VISIBLE_COLUMN,
+	PROTOCOL_ICON_COLUMN,
+	PROTOCOL_ICON_VISIBLE_COLUMN,
 	BLIST_COLUMNS
 
 };
@@ -376,7 +378,7 @@
  * This tooltip will be destroyed the next time this function is called, or when XXXX
  * is called
  *
- * @param buddy The buddy to show a tooltip for
+ * @param node The buddy list node to show a tooltip for
  * @param widget The widget to draw the tooltip on
  */
 void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget);
diff -ru pidgin-2.1.1/pidgin/gtkcelllayout.c pidgin-2.2.0/pidgin/gtkcelllayout.c
--- pidgin-2.1.1/pidgin/gtkcelllayout.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcelllayout.c	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/gtkcelllayout.h pidgin-2.2.0/pidgin/gtkcelllayout.h
--- pidgin-2.1.1/pidgin/gtkcelllayout.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcelllayout.h	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef __GTK_CELL_LAYOUT_H__
diff -ru pidgin-2.1.1/pidgin/gtkcellrendererexpander.c pidgin-2.2.0/pidgin/gtkcellrendererexpander.c
--- pidgin-2.1.1/pidgin/gtkcellrendererexpander.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellrendererexpander.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  * 
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/gtkcellrendererexpander.h pidgin-2.2.0/pidgin/gtkcellrendererexpander.h
--- pidgin-2.1.1/pidgin/gtkcellrendererexpander.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellrendererexpander.h	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  * 
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PIDGINCELLRENDEREREXPANDER_H_
diff -ru pidgin-2.1.1/pidgin/gtkcellrendererprogress.c pidgin-2.2.0/pidgin/gtkcellrendererprogress.c
--- pidgin-2.1.1/pidgin/gtkcellrendererprogress.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellrendererprogress.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  * 
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/gtkcellrendererprogress.h pidgin-2.2.0/pidgin/gtkcellrendererprogress.h
--- pidgin-2.1.1/pidgin/gtkcellrendererprogress.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellrendererprogress.h	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  * 
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PIDGINCELLRENDERERPROGRESS_H_
diff -ru pidgin-2.1.1/pidgin/gtkcellview.c pidgin-2.2.0/pidgin/gtkcellview.c
--- pidgin-2.1.1/pidgin/gtkcellview.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellview.c	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/gtkcellview.h pidgin-2.2.0/pidgin/gtkcellview.h
--- pidgin-2.1.1/pidgin/gtkcellview.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellview.h	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef __GTK_CELL_VIEW_H__
diff -ru pidgin-2.1.1/pidgin/gtkcellviewmenuitem.c pidgin-2.2.0/pidgin/gtkcellviewmenuitem.c
--- pidgin-2.1.1/pidgin/gtkcellviewmenuitem.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellviewmenuitem.c	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/gtkcellviewmenuitem.h pidgin-2.2.0/pidgin/gtkcellviewmenuitem.h
--- pidgin-2.1.1/pidgin/gtkcellviewmenuitem.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkcellviewmenuitem.h	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef __GTK_CELL_VIEW_MENU_ITEM_H__
Only in pidgin-2.2.0/pidgin: gtkcertmgr.c
Only in pidgin-2.2.0/pidgin: gtkcertmgr.h
diff -ru pidgin-2.1.1/pidgin/gtkconn.c pidgin-2.2.0/pidgin/gtkconn.c
--- pidgin-2.1.1/pidgin/gtkconn.c	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkconn.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkconn.h pidgin-2.2.0/pidgin/gtkconn.h
--- pidgin-2.1.1/pidgin/gtkconn.h	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkconn.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINCONN_H_
 #define _PIDGINCONN_H_
diff -ru pidgin-2.1.1/pidgin/gtkconv.c pidgin-2.2.0/pidgin/gtkconv.c
--- pidgin-2.1.1/pidgin/gtkconv.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkconv.c	2007-09-14 04:33:10.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -86,6 +86,7 @@
 	CONV_ICON_COLUMN,
 	CONV_TEXT_COLUMN,
 	CONV_EMBLEM_COLUMN,
+	CONV_PROTOCOL_ICON_COLUMN,
 	CONV_NUM_COLUMNS
 } PidginInfopaneColumns;
 
@@ -100,36 +101,6 @@
 
 #define LUMINANCE(c) (float)((0.3*(c.red))+(0.59*(c.green))+(0.11*(c.blue)))
 
-#if 0
-/* These colors come from the default GNOME palette */
-static GdkColor nick_colors[] = {
-	{0, 47616, 46336, 43776},       /* Basic 3D Medium */
-	{0, 32768, 32000, 29696},       /* Basic 3D Dark */
-	{0, 22016, 20992, 18432},       /* 3D Shadow */
-	{0, 33536, 42496, 32512},       /* Green Medium */
-	{0, 23808, 29952, 21760},       /* Green Dark */
-	{0, 17408, 22016, 12800},       /* Green Shadow */
-	{0, 57344, 46592, 44800},       /* Red Hilight */
-	{0, 49408, 26112, 23040},       /* Red Medium */
-	{0, 34816, 17920, 12544},       /* Red Dark */
-	{0, 49408, 14336,  8704},       /* Red Shadow */
-	{0, 34816, 32512, 41728},       /* Purple Medium */
-	{0, 25088, 23296, 33024},       /* Purple Dark */
-	{0, 18688, 16384, 26112},       /* Purple Shadow */
-	{0, 40192, 47104, 53760},       /* Blue Hilight */
-	{0, 29952, 36864, 44544},       /* Blue Medium */
-	{0, 57344, 49920, 40448},       /* Face Skin Medium */
-	{0, 45824, 37120, 26880},       /* Face skin Dark */
-	{0, 33280, 26112, 18176},       /* Face Skin Shadow */
-	{0, 57088, 16896,  7680},       /* Accent Red */
-	{0, 39168,     0,     0},       /* Accent Red Dark */
-	{0, 17920, 40960, 17920},       /* Accent Green */
-	{0,  9728, 50944,  9728}        /* Accent Green Dark */
-};
-
-#define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors))
-#endif
-
 /* From http://www.w3.org/TR/AERT#color-contrast */
 #define MIN_BRIGHTNESS_CONTRAST 75
 #define MIN_COLOR_CONTRAST 200
@@ -168,6 +139,7 @@
 static void generate_send_to_items(PidginWindow *win);
 
 /* Prototypes. <-- because Paco-Paco hates this comment. */
+static gboolean infopane_entry_activate(PidginConversation *gtkconv);
 static void got_typing_keypress(PidginConversation *gtkconv, gboolean first);
 static void gray_stuff_out(PidginConversation *gtkconv);
 static GList *generate_invite_user_names(PurpleConnection *gc);
@@ -186,7 +158,8 @@
 static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win);
 static void pidgin_conv_tab_pack(PidginWindow *win, PidginConversation *gtkconv);
 static gboolean infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *conv);
-static gboolean alias_double_click_cb(GtkWidget *widget, GdkEventButton *event, PidginConversation *gtkconv);
+static gboolean pidgin_userlist_motion_cb (GtkWidget *w, GdkEventMotion *event, PidginConversation *gtkconv);
+static void pidgin_conv_leave_cb (GtkWidget *w, GdkEventCrossing *e, PidginConversation *gtkconv);
 
 static void pidgin_conv_set_position_size(PidginWindow *win, int x, int y,
 		int width, int height);
@@ -210,6 +183,25 @@
 	return &col;
 }
 
+static PurpleBlistNode *
+get_conversation_blist_node(PurpleConversation *conv)
+{
+	PurpleBlistNode *node = NULL;
+
+	switch (purple_conversation_get_type(conv)) {
+		case PURPLE_CONV_TYPE_IM:
+			node = (PurpleBlistNode*)purple_find_buddy(conv->account, conv->name);
+			node = node ? node->parent : NULL;
+			break;
+		case PURPLE_CONV_TYPE_CHAT:
+			node = (PurpleBlistNode*)purple_blist_find_chat(conv->account, conv->name);
+			break;
+		default:
+			break;
+	}
+	return node;
+}
+
 /**************************************************************************
  * Callbacks
  **************************************************************************/
@@ -355,6 +347,7 @@
                  const char *cmd, char **args, char **error, void *data)
 {
 	clear_conversation_scrollback(conv);
+	purple_conversation_clear_message_history(conv);
 	return PURPLE_CMD_STATUS_OK;
 }
 
@@ -714,7 +707,7 @@
 	gtkconv = PIDGIN_CONVERSATION(info->conv);
 
 	if (resp == GTK_RESPONSE_OK) {
-		buddy   = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry));
+		buddy   = pidgin_text_combo_box_entry_get_text(info->entry);
 		message = gtk_entry_get_text(GTK_ENTRY(info->message));
 
 		if (!g_ascii_strcasecmp(buddy, ""))
@@ -761,7 +754,7 @@
 								"chat."), NULL);
 		}
 		else
-			gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry), buddy->name);
+			pidgin_text_combo_box_entry_set_text(info->entry, buddy->name);
 
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
@@ -788,7 +781,7 @@
 			}
 			else
 			{
-				gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry), username);
+				pidgin_text_combo_box_entry_set_text(info->entry, username);
 			}
 		}
 
@@ -886,19 +879,10 @@
 		gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 
 		/* Now the Buddy drop-down entry field. */
-		info->entry = gtk_combo_new();
-		gtk_combo_set_case_sensitive(GTK_COMBO(info->entry), FALSE);
-		gtk_entry_set_activates_default(
-				GTK_ENTRY(GTK_COMBO(info->entry)->entry), TRUE);
-
+		info->entry = pidgin_text_combo_box_entry_new(NULL, generate_invite_user_names(gc));
 		gtk_table_attach_defaults(GTK_TABLE(table), info->entry, 1, 2, 0, 1);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry);
 
-		/* Fill in the names. */
-		gtk_combo_set_popdown_strings(GTK_COMBO(info->entry),
-									  generate_invite_user_names(gc));
-
-
 		/* Now the label for "Message" */
 		label = gtk_label_new(NULL);
 		gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:"));
@@ -940,7 +924,7 @@
 	gtk_widget_show_all(invite_dialog);
 
 	if (info != NULL)
-		gtk_widget_grab_focus(GTK_COMBO(info->entry)->entry);
+		gtk_widget_grab_focus(GTK_BIN(info->entry)->child);
 }
 
 static void
@@ -955,6 +939,7 @@
 	PurpleConversation *conv = (PurpleConversation *)user_data;
 	FILE *fp;
 	const char *name;
+	char **lines;
 	gchar *text;
 
 	if ((fp = g_fopen(filename, "w+")) == NULL) {
@@ -966,10 +951,12 @@
 	fprintf(fp, "<html>\n<head><title>%s</title></head>\n<body>", name);
 	fprintf(fp, _("<h1>Conversation with %s</h1>\n"), name);
 
-	text = gtk_imhtml_get_markup(
+	lines = gtk_imhtml_get_markup_lines(
 		GTK_IMHTML(PIDGIN_CONVERSATION(conv)->imhtml));
+	text = g_strjoinv("<br>\n", lines);
 	fprintf(fp, "%s", text);
 	g_free(text);
+	g_strfreev(lines);
 
 	fprintf(fp, "\n</body>\n</html>\n");
 	fclose(fp);
@@ -1327,6 +1314,19 @@
 	add_remove_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
+#if 0
+static void
+menu_hide_conv_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	PidginWindow *win = data;
+	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
+	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+	purple_signal_emit(pidgin_conversations_get_handle(),
+			"conversation-hiding", gtkconv);
+	purple_conversation_set_ui_ops(conv, NULL);
+}
+#endif
+
 static void
 menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)
 {
@@ -1389,6 +1389,7 @@
 	PidginWindow *win = data;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
+	PurpleBlistNode *node;
 
 	conv = pidgin_conv_window_get_active_conversation(win);
 
@@ -1399,6 +1400,9 @@
 
 	gtkconv->make_sound =
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+	node = get_conversation_blist_node(conv);
+	if (node)
+		purple_blist_node_set_bool(node, "gtk-mute-sound", !gtkconv->make_sound);
 }
 
 static void
@@ -1808,17 +1812,108 @@
 }
 
 static gboolean
+conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
+{
+	PidginWindow *win;
+	PurpleConversation *conv;
+	int curconv;
+
+	conv     = gtkconv->active_conv;
+	win      = gtkconv->win;
+	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
+
+	/* If CTRL was held down... */
+	if (event->state & GDK_CONTROL_MASK) {
+		switch (event->keyval) {
+			case GDK_Page_Down:
+			case ']':
+				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv + 1))
+					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
+				else
+					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv + 1);
+				return TRUE;
+				break;
+
+			case GDK_Page_Up:
+			case '[':
+				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv - 1))
+					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), -1);
+				else
+					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv - 1);
+				return TRUE;
+				break;
+
+			case GDK_Tab:
+			case GDK_ISO_Left_Tab:
+				if (event->state & GDK_SHIFT_MASK) {
+					move_to_next_unread_tab(gtkconv, FALSE);
+				} else {
+					move_to_next_unread_tab(gtkconv, TRUE);
+				}
+
+				return TRUE;
+				break;
+
+			case GDK_comma:
+				gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
+						gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
+						curconv - 1);
+				break;
+
+			case GDK_period:
+				gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
+						gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
+#if GTK_CHECK_VERSION(2,2,0)
+						(curconv + 1) % gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook)));
+#else
+						(curconv + 1) % g_list_length(GTK_NOTEBOOK(win->notebook)->children));
+#endif
+				break;
+
+		} /* End of switch */
+	}
+
+	/* If ALT (or whatever) was held down... */
+	else if (event->state & GDK_MOD1_MASK)
+	{
+		if (event->keyval > '0' && event->keyval <= '9')
+		{
+			guint switchto = event->keyval - '1';
+			if (switchto < pidgin_conv_window_get_gtkconv_count(win))
+				gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), switchto);
+
+			return TRUE;
+		}
+	}
+
+	/* If neither CTRL nor ALT were held down... */
+	else
+	{
+		switch (event->keyval) {
+		case GDK_F2:
+			if (gtk_widget_is_focus(GTK_WIDGET(win->notebook))) {
+				infopane_entry_activate(gtkconv);
+				return TRUE;
+			}
+			break;
+		}
+	}
+	return FALSE;
+}
+
+static gboolean
 entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
 {
 	PidginWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
-	int curconv;
 
 	gtkconv  = (PidginConversation *)data;
 	conv     = gtkconv->active_conv;
 	win      = gtkconv->win;
-	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
+	
+	if (conv_keypress_common(gtkconv, event))
+		return TRUE;
 
 	/* If CTRL was held down... */
 	if (event->state & GDK_CONTROL_MASK) {
@@ -1916,88 +2011,32 @@
 
 				return TRUE;
 				break;
-
-			case GDK_Page_Down:
-			case ']':
-				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv + 1))
-					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
-				else
-					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv + 1);
-				return TRUE;
-				break;
-
-			case GDK_Page_Up:
-			case '[':
-				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv - 1))
-					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), -1);
-				else
-					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv - 1);
-				return TRUE;
-				break;
-
-			case GDK_Tab:
-			case GDK_ISO_Left_Tab:
-				if (event->state & GDK_SHIFT_MASK) {
-					move_to_next_unread_tab(gtkconv, FALSE);
-				} else {
-					move_to_next_unread_tab(gtkconv, TRUE);
-				}
-
-				return TRUE;
-				break;
-
-			case GDK_comma:
-				gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
-						gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
-						curconv - 1);
-				break;
-
-			case GDK_period:
-				gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook),
-						gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), curconv),
-#if GTK_CHECK_VERSION(2,2,0)
-						(curconv + 1) % gtk_notebook_get_n_pages(GTK_NOTEBOOK(win->notebook)));
-#else
-						(curconv + 1) % g_list_length(GTK_NOTEBOOK(win->notebook)->children));
-#endif
-				break;
-
 		} /* End of switch */
 	}
 
 	/* If ALT (or whatever) was held down... */
-	else if (event->state & GDK_MOD1_MASK)
-	{
-		if (event->keyval > '0' && event->keyval <= '9')
-		{
-			guint switchto = event->keyval - '1';
-			if (switchto < pidgin_conv_window_get_gtkconv_count(win))
-				gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), switchto);
+	else if (event->state & GDK_MOD1_MASK) 	{
 
-			return TRUE;
-		}
 	}
 
 	/* If neither CTRL nor ALT were held down... */
-	else
-	{
-		switch (event->keyval)
-		{
-			case GDK_Tab:
-				if (gtkconv->entry != entry)
-					break;
-				return tab_complete(conv);
+	else {
+		switch (event->keyval) {
+		case GDK_Tab:
+			if (gtkconv->entry != entry)
 				break;
+			return tab_complete(conv);
+			break;
 
-			case GDK_Page_Up:
-				gtk_imhtml_page_up(GTK_IMHTML(gtkconv->imhtml));
-				return TRUE;
-				break;
+		case GDK_Page_Up:
+			gtk_imhtml_page_up(GTK_IMHTML(gtkconv->imhtml));
+			return TRUE;
+			break;
 
-			case GDK_Page_Down:
-				gtk_imhtml_page_down(GTK_IMHTML(gtkconv->imhtml));
-				return TRUE;
-				break;
+		case GDK_Page_Down:
+			gtk_imhtml_page_down(GTK_IMHTML(gtkconv->imhtml));
+			return TRUE;
+			break;
 
 		}
 	}
@@ -2038,6 +2077,7 @@
 
 	/* If we have a valid key for the conversation display, then exit */
 	if ((event->state & GDK_CONTROL_MASK) ||
+		(event->keyval == GDK_F6) ||
 		(event->keyval == GDK_F10) ||
 		(event->keyval == GDK_Shift_L) ||
 		(event->keyval == GDK_Shift_R) ||
@@ -2048,11 +2088,17 @@
 		(event->keyval == GDK_Down) ||
 		(event->keyval == GDK_Left) ||
 		(event->keyval == GDK_Right) ||
+		(event->keyval == GDK_Page_Up) ||
+		(event->keyval == GDK_Page_Down) ||
 		(event->keyval == GDK_Home) ||
 		(event->keyval == GDK_End) ||
 		(event->keyval == GDK_Tab) ||
 		(event->keyval == GDK_ISO_Left_Tab))
-			return FALSE;
+	{
+		if (event->type == GDK_KEY_PRESS)
+			return conv_keypress_common(gtkconv, event);
+		return FALSE;
+	}
 
 	if (event->type == GDK_KEY_RELEASE)
 		gtk_widget_grab_focus(gtkconv->entry);
@@ -2301,7 +2347,7 @@
         const char *name = NULL;
         GdkPixbuf *status = NULL;
         PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
-	const char *icon_size = small_icon ? "pidgin-icon-size-tango-microscopic" : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL;
+	const char *icon_size = small_icon ? PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC : PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL;
         g_return_val_if_fail(conv != NULL, NULL);
 
         account = purple_conversation_get_account(conv);
@@ -2391,6 +2437,12 @@
 			&(gtkconv->infopane_iter),
 			CONV_EMBLEM_COLUMN, emblem, -1);
 
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")) {
+		gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
+			&(gtkconv->infopane_iter),
+			CONV_PROTOCOL_ICON_COLUMN, pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL), -1);
+	}
+
 	/* XXX seanegan Why do I have to do this? */
 	gtk_widget_queue_draw(gtkconv->infopane);
 
@@ -2527,7 +2579,6 @@
 	gtkconv->u.im->show_icon = FALSE;
 
 	gtkwin = gtkconv->win;
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.show_icon), FALSE);
 }
 
 static void
@@ -2688,31 +2739,6 @@
 	return TRUE;
 }
 
-static void
-menu_buddyicon_cb(gpointer data, guint action, GtkWidget *widget)
-{
-	PidginWindow *win = data;
-	PurpleConversation *conv;
-	PidginConversation *gtkconv;
-	gboolean active;
-
-	conv = pidgin_conv_window_get_active_conversation(win);
-
-	if (!conv)
-		return;
-
-	g_return_if_fail(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM);
-
-	gtkconv = PIDGIN_CONVERSATION(conv);
-
-	active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
-	gtkconv->u.im->show_icon = active;
-	if (active)
-		pidgin_conv_update_buddy_icon(conv);
-	else
-		remove_icon(NULL, gtkconv);
-}
-
 /**************************************************************************
  * End of the bunch of buddy icon functions
  **************************************************************************/
@@ -2720,6 +2746,7 @@
 pidgin_conv_present_conversation(PurpleConversation *conv)
 {
 	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+	GdkModifierType state;
 
 	if(gtkconv->win==hidden_convwin) {
 		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
@@ -2727,7 +2754,10 @@
 	}
 
 	pidgin_conv_switch_active_conversation(conv);
-	pidgin_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
+	/* Switch the tab only if the user initiated the event by pressing
+	 * a button or hitting a key. */
+	if (gtk_get_current_event_state(&state))
+		pidgin_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
 	gtk_window_present(GTK_WINDOW(gtkconv->win->window));
 }
 
@@ -2753,7 +2783,7 @@
 		PurpleConversation *conv = (PurpleConversation*)l->data;
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
-		if(gtkconv->active_conv != conv)
+		if(gtkconv == NULL || gtkconv->active_conv != conv)
 			continue;
 
 		if (gtkconv->unseen_state >= min_state
@@ -2775,6 +2805,18 @@
 	pidgin_conv_present_conversation(conv);
 }
 
+static void
+unseen_all_conv_menu_cb(GtkMenuItem *item, GList *list)
+{
+	g_return_if_fail(list != NULL);
+	/* Do not free the list from here. It will be freed from the
+	 * 'destroy' callback on the menuitem. */
+	while (list) {
+		pidgin_conv_present_conversation(list->data);
+		list = list->next;
+	}
+}
+
 guint
 pidgin_conversations_fill_menu(GtkWidget *menu, GList *convs)
 {
@@ -2806,6 +2848,19 @@
 		ret++;
 	}
 
+	if (convs->next) {
+		/* There are more than one conversation. Add an option to show all conversations. */
+		GtkWidget *item;
+		GList *list = g_list_copy(convs);
+
+		pidgin_separator(menu);
+
+		item = gtk_menu_item_new_with_label(_("Show All"));
+		g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(unseen_all_conv_menu_cb), list);
+		g_signal_connect_swapped(G_OBJECT(item), "destroy", G_CALLBACK(g_list_free), list);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	}
+
 	return ret;
 }
 
@@ -2874,7 +2929,6 @@
 	{ N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL },
 	{ N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL },
-	{ N_("/Options/Show Buddy _Icon"), NULL, menu_buddyicon_cb, 0, "<CheckItem>", NULL },
 	{ "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL },
 	{ N_("/Options/Show Ti_mestamps"), "F2", menu_timestamps_cb, 0, "<CheckItem>", NULL },
@@ -2908,37 +2962,12 @@
 
 		if (gtkconv != NULL)
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
-			                               TRUE);
+			                               gtkconv->make_sound);
 		gtk_widget_set_sensitive(win->menu.sounds, TRUE);
 
 	}
 }
 
-static void
-show_buddy_icons_pref_changed_cb(const char *name, PurplePrefType type,
-								 gconstpointer value, gpointer data)
-{
-	PidginWindow *win = data;
-	gboolean show_icons = GPOINTER_TO_INT(value);
-
-	if (!show_icons)
-	{
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
-		                               FALSE);
-		gtk_widget_set_sensitive(win->menu.show_icon, FALSE);
-	}
-	else
-	{
-		PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-
-		if (gtkconv != NULL)
-			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
-			                               TRUE);
-		gtk_widget_set_sensitive(win->menu.show_icon, TRUE);
-
-	}
-}
-
 /* Returns TRUE if some items were added to the menu, FALSE otherwise */
 static gboolean
 populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolean all)
@@ -2997,8 +3026,12 @@
 		node = (PurpleBlistNode *)buddy;
 
 	/* Now add the stuff */
-	if (all && buddy) {
-		pidgin_blist_make_buddy_menu(menu, buddy, TRUE);
+	if (all) {
+		if (buddy)
+			pidgin_blist_make_buddy_menu(menu, buddy, TRUE);
+		else if (chat) {
+			/* XXX: */
+		}
 	} else if (node) {
 		if (purple_account_is_connected(conv->account))
 			pidgin_append_blist_node_proto_menu(menu, conv->account->gc, node);
@@ -3231,17 +3264,7 @@
 	win->menu.show_timestamps =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Options/Show Timestamps"));
-	win->menu.show_icon =
-		gtk_item_factory_get_widget(win->menu.item_factory,
-		                            N_("/Options/Show Buddy Icon"));
-	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
-	{
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
-		                               FALSE);
-		gtk_widget_set_sensitive(win->menu.show_icon, FALSE);
-	}
-	purple_prefs_connect_callback(win, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons",
-				    show_buddy_icons_pref_changed_cb, win);
+	win->menu.show_icon = NULL;
 
 	win->menu.tray = pidgin_menu_tray_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar),
@@ -3621,8 +3644,7 @@
 	static GList *tmp = NULL;
 
 	g_list_free(tmp);
-
-	tmp = g_list_append(NULL, "");
+	tmp = NULL;
 
 	if (gc != NULL) {
 		for(gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
@@ -4398,6 +4420,10 @@
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
+	g_signal_connect(G_OBJECT(list), "motion-notify-event",
+					 G_CALLBACK(pidgin_userlist_motion_cb), gtkconv);
+	g_signal_connect(G_OBJECT(list), "leave-notify-event",
+					 G_CALLBACK(pidgin_userlist_motion_cb), gtkconv);
 	g_signal_connect(G_OBJECT(list), "popup-menu",
 			 G_CALLBACK(gtkconv_chat_popup_menu_cb), gtkconv);
 	g_signal_connect(G_OBJECT(lbox), "size-allocate", G_CALLBACK(lbox_size_allocate_cb), gtkconv);
@@ -4442,6 +4468,8 @@
 	int timeout;
 	PidginConversation *gtkconv;   /* This is the Pidgin conversation that
 	                                  triggered the tooltip */
+	int userlistx;
+	int userlisty;
 } tooltip;
 
 static void
@@ -4485,12 +4513,12 @@
 pidgin_conv_motion_cb (GtkWidget *infopane, GdkEventMotion *event, PidginConversation *gtkconv)
 {
 	int delay = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/tooltip_delay");
-	
+
 	pidgin_blist_tooltip_destroy();
 	if (delay == 0)
 		return FALSE;
 
-	if (tooltip.timeout != 0) 
+	if (tooltip.timeout != 0)
 		g_source_remove(tooltip.timeout);
 
 	tooltip.timeout = g_timeout_add(delay, (GSourceFunc)pidgin_conv_tooltip_timeout, gtkconv);
@@ -4498,6 +4526,80 @@
 	return FALSE;
 }
 
+static gboolean
+pidgin_userlist_tooltip_timeout(PidginConversation *gtkconv)
+{
+	PurplePluginProtocolInfo *prpl_info;
+	PurpleConversation *conv = gtkconv->active_conv;
+	PidginChatPane *gtkchat;
+	PurpleBlistNode *node = NULL;
+	PurpleAccount *account;
+	GtkTreePath *path;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	GtkTreeViewColumn *column;
+	gchar *who;
+	int x, y;
+
+	gtkchat = gtkconv->u.chat;
+	account = purple_conversation_get_account(conv);
+
+	if (account->gc == NULL)
+		return FALSE;
+
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
+
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
+
+	gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(gtkchat->list),
+								  tooltip.userlistx, tooltip.userlisty, &path, &column, &x, &y);
+
+	if (path == NULL)
+		return FALSE;
+
+	gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
+	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);
+
+	node = (PurpleBlistNode*)(purple_find_buddy(conv->account, who));
+	if (node && prpl_info && (prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME))
+		pidgin_blist_draw_tooltip(node, gtkconv->infopane);
+
+	g_free(who);
+	gtk_tree_path_free(path);
+
+
+	return FALSE;
+}
+
+static gboolean
+pidgin_userlist_motion_cb (GtkWidget *w, GdkEventMotion *event, PidginConversation *gtkconv)
+{
+	PurpleConversation *conv;
+	PurpleAccount *account;
+	int delay = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/tooltip_delay");
+	
+	pidgin_blist_tooltip_destroy();
+	if (delay == 0)
+		return FALSE;
+
+	if (tooltip.timeout != 0)
+		g_source_remove(tooltip.timeout);
+	tooltip.timeout = 0;
+
+	conv = gtkconv->active_conv;
+	account = purple_conversation_get_account(conv);
+
+	if (account->gc == NULL)
+		return FALSE;
+
+	tooltip.timeout = g_timeout_add(delay, (GSourceFunc)pidgin_userlist_tooltip_timeout, gtkconv);
+	tooltip.gtkconv = gtkconv;
+	tooltip.userlistx = event->x;
+	tooltip.userlisty = event->y;
+
+	return FALSE;
+}
+ 
 static GtkWidget *
 setup_common_pane(PidginConversation *gtkconv)
 {
@@ -4528,7 +4630,7 @@
 	gtk_widget_show(gtkconv->infopane_hbox);
 	gtk_widget_add_events(event_box,
 	                      GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
-	g_signal_connect(G_OBJECT(event_box), "button_press_event",
+	g_signal_connect(G_OBJECT(event_box), "button-press-event",
 	                 G_CALLBACK(infopane_press_cb), gtkconv);
 
 	g_signal_connect(G_OBJECT(event_box), "motion-notify-event", 
@@ -4537,7 +4639,7 @@
 			G_CALLBACK(pidgin_conv_leave_cb), gtkconv);
 
 	gtkconv->infopane = gtk_cell_view_new();
-	gtkconv->infopane_model = gtk_list_store_new(CONV_NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, GDK_TYPE_PIXBUF);
+	gtkconv->infopane_model = gtk_list_store_new(CONV_NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF);
 	gtk_cell_view_set_model(GTK_CELL_VIEW(gtkconv->infopane), 
 				GTK_TREE_MODEL(gtkconv->infopane_model));
 	gtk_list_store_append(gtkconv->infopane_model, &(gtkconv->infopane_iter));
@@ -4562,6 +4664,12 @@
 	g_object_set(rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 #endif
 
+
+	rend = gtk_cell_renderer_pixbuf_new();
+	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
+	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_PROTOCOL_ICON_COLUMN, NULL);
+	g_object_set(rend, "xalign", 0.0, "xpad", 3, "ypad", 0, NULL);
+
 	rend = gtk_cell_renderer_pixbuf_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(gtkconv->infopane), rend, FALSE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(gtkconv->infopane), rend, "pixbuf", CONV_EMBLEM_COLUMN, NULL);
@@ -4832,6 +4940,7 @@
 	PurpleConversationType conv_type = purple_conversation_get_type(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
+	PurpleBlistNode *convnode;
 
 	if (conv_type == PURPLE_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
@@ -4909,7 +5018,9 @@
 	gtk_container_add(GTK_CONTAINER(tab_cont), pane);
 	gtk_widget_show(pane);
 
-	gtkconv->make_sound = TRUE;
+	convnode = get_conversation_blist_node(conv);
+	if (convnode == NULL || !purple_blist_node_get_bool(convnode, "gtk-mute-sound"))
+		gtkconv->make_sound = TRUE;
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar"))
 		gtk_widget_show(gtkconv->toolbar);
@@ -5028,6 +5139,10 @@
 	g_list_foreach(gtkconv->send_history, (GFunc)g_free, NULL);
 	g_list_free(gtkconv->send_history);
 
+	if (gtkconv->attach.timer) {
+		g_source_remove(gtkconv->attach.timer);
+	}
+
 	if (tooltip.gtkconv == gtkconv)
 		reset_tooltip();
 
@@ -5244,6 +5359,15 @@
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	g_return_if_fail(gtkconv != NULL);
 
+	if (gtkconv->attach.timer) {
+		/* We are currently in the process of filling up the buffer with the message
+		 * history of the conversation. So we do not need to add the message here.
+		 * Instead, this message will be added to the message-list, which in turn will
+		 * be processed and displayed by the attach-callback.
+		 */
+		return;
+	}
+
 	if (conv != gtkconv->active_conv)
 	{
 		if (flags & PURPLE_MESSAGE_ACTIVE_ONLY)
@@ -5611,6 +5735,7 @@
 		account, name, displaying, conv, flags);
 	g_free(displaying);
 }
+
 static void
 pidgin_conv_chat_add_users(PurpleConversation *conv, GList *cbuddies, gboolean new_arrivals)
 {
@@ -6107,7 +6232,6 @@
 
 		gtk_widget_show(win->menu.insert_link);
 		gtk_widget_show(win->menu.insert_image);
-		gtk_widget_show(win->menu.show_icon);
 	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		/* Show stuff that applies to Chats, hide stuff that applies to IMs */
 
@@ -6120,7 +6244,6 @@
 		gtk_widget_show(win->menu.alias);
 		gtk_widget_hide(win->menu.block);
 		gtk_widget_hide(win->menu.unblock);
-		gtk_widget_hide(win->menu.show_icon);
 
 		if ((account == NULL) || purple_blist_find_chat(account, purple_conversation_get_name(conv)) == NULL) {
 			/* If the chat is NOT in the buddy list */
@@ -6887,7 +7010,8 @@
 	for (l = purple_get_ims(); l != NULL; l = l->next) {
 		conv = (PurpleConversation *)l->data;
 		gtkconv = PIDGIN_CONVERSATION(conv);
-		gtkconv->u.im->animate = GPOINTER_TO_INT(value);
+		if (gtkconv)
+			gtkconv->u.im->animate = GPOINTER_TO_INT(value);
 	}
 
 	/* Now either stop or start animation for the active conversation in each window */
@@ -6906,6 +7030,8 @@
 
 	for (l = purple_get_conversations(); l != NULL; l = l->next) {
 		PurpleConversation *conv = l->data;
+		if (!PIDGIN_CONVERSATION(conv))
+			continue;
 		if (GPOINTER_TO_INT(value)) 
 			gtk_widget_show(PIDGIN_CONVERSATION(conv)->infopane_hbox);
 		else
@@ -6918,6 +7044,18 @@
 }
 
 static void
+show_protocol_icons_pref_cb(const char *name, PurplePrefType type,
+						gconstpointer value, gpointer data)
+{
+	GList *l;
+	for (l = purple_get_conversations(); l != NULL; l = l->next) {
+		PurpleConversation *conv = l->data;
+		if (PIDGIN_CONVERSATION(conv))
+			update_tab_icon(conv);
+	}
+}
+
+static void
 conv_placement_usetabs_cb(const char *name, PurplePrefType type,
 						  gconstpointer value, gpointer data)
 {
@@ -7167,6 +7305,60 @@
 	pidgin_conv_update_fields(conv, PIDGIN_CONV_TOPIC);
 }
 
+static gboolean
+add_message_history_to_gtkconv(gpointer data)
+{
+	PidginConversation *gtkconv = data;
+	int count = 0;
+	int timer = gtkconv->attach.timer;
+	gtkconv->attach.timer = 0;
+	while (gtkconv->attach.current && count < 100) {  /* XXX: 100 is a random value here */
+		PurpleConvMessage *msg = gtkconv->attach.current->data;
+		pidgin_conv_write_conv(gtkconv->active_conv, msg->who, msg->who, msg->what, msg->flags, msg->when);
+		gtkconv->attach.current = gtkconv->attach.current->prev;
+		count++;
+	}
+	gtkconv->attach.timer = timer;
+	if (gtkconv->attach.current)
+		return TRUE;
+
+	purple_signal_emit(pidgin_conversations_get_handle(),
+			"conversation-displayed", gtkconv);
+	g_source_remove(gtkconv->attach.timer);
+	gtkconv->attach.timer = 0;
+	return FALSE;
+}
+
+gboolean pidgin_conv_attach_to_conversation(PurpleConversation *conv)
+{
+	GList *list;
+	PidginConversation *gtkconv;
+
+	if (PIDGIN_IS_PIDGIN_CONVERSATION(conv))
+		return FALSE;
+
+	purple_conversation_set_ui_ops(conv, pidgin_conversations_get_conv_ui_ops());
+	private_gtkconv_new(conv, FALSE);
+	gtkconv = PIDGIN_CONVERSATION(conv);
+
+	list = purple_conversation_get_message_history(conv);
+	if (list) {
+		list = g_list_last(list);
+		gtkconv->attach.current = list;
+		gtkconv->attach.timer = g_idle_add(add_message_history_to_gtkconv, gtkconv);
+	} else {
+		purple_signal_emit(pidgin_conversations_get_handle(),
+				"conversation-displayed", gtkconv);
+	}
+
+	if (conv->type == PURPLE_CONV_TYPE_CHAT) {
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TOPIC);
+		pidgin_conv_chat_add_users(conv, PURPLE_CONV_CHAT(conv)->in_room, TRUE);
+	}
+
+	return TRUE;
+}
+
 void *
 pidgin_conversations_get_handle(void)
 {
@@ -7258,6 +7450,8 @@
 								animate_buddy_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons",
 								show_buddy_icons_pref_cb, NULL);
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/show_protocol_icons",
+								show_protocol_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
                                 hide_new_pref_cb, NULL);
 
@@ -7342,6 +7536,16 @@
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_CONVERSATION));
 
+	purple_signal_register(handle, "conversation-hiding",
+						 purple_marshal_VOID__POINTER_POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_BOXED,
+										"PidginConversation *"));
+
+	purple_signal_register(handle, "conversation-displayed",
+						 purple_marshal_VOID__POINTER_POINTER, NULL, 1,
+						 purple_value_new(PURPLE_TYPE_BOXED,
+										"PidginConversation *"));
+
 	/**********************************************************************
 	 * Register commands
 	 **********************************************************************/
@@ -7470,7 +7674,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -7772,7 +7976,7 @@
 infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkconv)
 {
 	if (e->type == GDK_2BUTTON_PRESS && e->button == 1) {
-		if (alias_double_click_cb(widget, e, gtkconv))
+		if (infopane_entry_activate(gtkconv))
 			return TRUE;
 	}
 
@@ -8013,10 +8217,11 @@
 
 			gtk_window_get_size(GTK_WINDOW(dest_win->window),
 			                    &win_width, &win_height);
-
+#ifdef WIN32  /* only override window manager placement on Windows */
 			gtk_window_move(GTK_WINDOW(dest_win->window),
 			                e->x_root - (win_width  / 2),
 			                e->y_root - (win_height / 2));
+#endif
 
 			pidgin_conv_window_show(dest_win);
 		}
@@ -8229,16 +8434,12 @@
 }
 
 static gboolean
-alias_double_click_cb(GtkWidget *widget, GdkEventButton *event, PidginConversation *gtkconv)
+infopane_entry_activate(PidginConversation *gtkconv)
 {
 	GtkWidget *entry = NULL;
         PurpleConversation *conv = gtkconv->active_conv;
 	const char *text = NULL;
 
-	if (event->button != 1 || event->type != GDK_2BUTTON_PRESS) {
-		return FALSE;
-	}
-
 	if (!GTK_WIDGET_VISIBLE(gtkconv->tab_label)) {
 		/* There's already an entry for alias. Let's not create another one. */
 		return FALSE;
@@ -8281,7 +8482,15 @@
 	gtk_widget_hide(gtkconv->infopane);
 	gtk_widget_grab_focus(entry);
 
-	return FALSE;
+	return TRUE;
+}
+
+static gboolean
+window_keypress_cb(GtkWidget *widget, GdkEventKey *event, PidginWindow *win)
+{
+	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
+
+	return conv_keypress_common(gtkconv, event);
 }
 
 static void
@@ -8326,13 +8535,6 @@
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_timestamps),
 	                               purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps"));
 
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM &&
-	    purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
-	{
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
-		                               gtkconv->u.im->show_icon);
-	}
-
 	/*
 	 * We pause icons when they are not visible.  If this icon should
 	 * be animated then start it back up again.
@@ -8479,6 +8681,11 @@
 	g_signal_connect(G_OBJECT(win->window), "focus_in_event",
 	                 G_CALLBACK(focus_win_cb), win);
 
+	/* Intercept keystrokes from the menu items */
+	g_signal_connect(G_OBJECT(win->window), "key_press_event",
+					 G_CALLBACK(window_keypress_cb), win);
+	
+
 	/* Create the notebook. */
 	win->notebook = gtk_notebook_new();
 
@@ -8736,7 +8943,7 @@
 		angle = 270;
 
 #if GTK_CHECK_VERSION(2,6,0)
-	if (!angle && pidgin_conv_window_get_gtkconv_count(win) > 1) {
+	if (!angle) {
 		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END,  NULL);
 		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 4);
 	} else {
@@ -8801,14 +9008,14 @@
 	}
 
 	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, 
-					   !tabs_side && !angle && pidgin_conv_window_get_gtkconv_count(win) > 1, 
+					   !tabs_side && !angle, 
 					   TRUE, GTK_PACK_START);
 
 	if (pidgin_conv_window_get_gtkconv_count(win) == 1) 
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
-                                           !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||  
-                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
-                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT);
+					   purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") &&
+                                           (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") ||
+                                           purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") != GTK_POS_TOP));
 
 	/* show the widgets */
 /*	gtk_widget_show(gtkconv->icon); */
@@ -8835,6 +9042,9 @@
 
 	win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
 
+	g_signal_handlers_disconnect_matched(win->window, G_SIGNAL_MATCH_DATA,
+			0, 0, NULL, NULL, gtkconv);
+
 	if (win->gtkconvs && win->gtkconvs->next == NULL)
 		pidgin_conv_tab_pack(win, win->gtkconvs->data);
 
diff -ru pidgin-2.1.1/pidgin/gtkconv.h pidgin-2.2.0/pidgin/gtkconv.h
--- pidgin-2.1.1/pidgin/gtkconv.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkconv.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGIN_CONVERSATION_H_
 #define _PIDGIN_CONVERSATION_H_
@@ -162,6 +162,13 @@
 	GtkWidget *infopane;
 	GtkListStore *infopane_model;
 	GtkTreeIter infopane_iter;
+
+	/* Used when attaching a PidginConversation to a PurpleConversation
+	 * with message history */
+	struct {
+		int timer;
+		GList *current;
+	} attach;
 };
 
 /*@}*/
@@ -238,6 +245,15 @@
  */
 void pidgin_conv_present_conversation(PurpleConversation *conv);
 
+/**
+ * Reattach Pidgin UI to a conversation.
+ *
+ * @param conv  The conversation.
+ *
+ * @return  Wheter Pidgin UI was successfully attached.
+ */
+gboolean pidgin_conv_attach_to_conversation(PurpleConversation *conv);
+
 PidginWindow *pidgin_conv_get_window(PidginConversation *gtkconv);
 GdkPixbuf *pidgin_conv_get_tab_icon(PurpleConversation *conv, gboolean small_icon);
 void pidgin_conv_new(PurpleConversation *conv);
diff -ru pidgin-2.1.1/pidgin/gtkconvwin.h pidgin-2.2.0/pidgin/gtkconvwin.h
--- pidgin-2.1.1/pidgin/gtkconvwin.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkconvwin.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGIN_CONVERSATION_WINDOW_H_
 #define _PIDGIN_CONVERSATION_WINDOW_H_
diff -ru pidgin-2.1.1/pidgin/gtkdebug.c pidgin-2.2.0/pidgin/gtkdebug.c
--- pidgin-2.1.1/pidgin/gtkdebug.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdebug.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkdebug.h pidgin-2.2.0/pidgin/gtkdebug.h
--- pidgin-2.1.1/pidgin/gtkdebug.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdebug.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINDEBUG_H_
 #define _PIDGINDEBUG_H_
diff -ru pidgin-2.1.1/pidgin/gtkdialogs.c pidgin-2.2.0/pidgin/gtkdialogs.c
--- pidgin-2.1.1/pidgin/gtkdialogs.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdialogs.c	2007-09-14 04:39:55.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
@@ -86,6 +86,7 @@
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lschiere@users.sf.net"},
 	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
 	{"Evan Schoenberg",		N_("developer"), NULL},
+	{"Kevin 'SimGuy' Stange",	N_("developer & webmaster"),	NULL},
 	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
 	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},
 	{NULL, NULL, NULL}
@@ -94,8 +95,10 @@
 /* Order: Alphabetical by Last Name */
 static struct developer patch_writers[] = {
 	{"John 'rekkanoryo' Bailey",	NULL,	NULL},
-	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
-	{"Kevin 'SimGuy' Stange",		NULL,	NULL},
+	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
+	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
+	{"Gabriel 'Nix' Schulhof", 	NULL, 	NULL},
+	{"Will 'resiak' Thompson",	NULL,	NULL},
 	{NULL, NULL, NULL}
 };
 
@@ -118,6 +121,7 @@
 static struct developer retired_patch_writers[] = {
 	{"Felipe 'shx' Contreras",		NULL,	NULL},
 	{"Decklin Foster",				NULL,	NULL},
+	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
 	{"Robert 'Robot101' McQueen",	NULL,	NULL},
 	{"Benjamin Miller",				NULL,	NULL},
 	{NULL, NULL, NULL}
@@ -127,6 +131,7 @@
 static struct translator current_translators[] = {
 	{N_("Afrikaans"),           "af", "Friedel Wolff", "friedel@translate.org.za"},
 	{N_("Arabic"),              "ar", "Mohamed Magdy", "alnokta@yahoo.com"},
+	{N_("Belarusian Latin"),    "be@latin", "Ihar Hrachyshka", "ihar.hrachyshka@gmail.com"},
 	{N_("Bulgarian"),           "bg", "Vladimira Girginova", "missing@here.is"},
 	{N_("Bulgarian"),           "bg", "Vladimir (Kaladan) Petkov", "vpetkov@i-space.org"},
 	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg@l2c2.org"},
@@ -166,7 +171,7 @@
 	{N_("Gujarati"),            "gu", N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
-	{N_("Hungarian"),           "hu", "Zoltan Sutto", "sutto.zoltan@rutinsoft.hu"},
+	{N_("Hungarian"),           "hu", "Kelemen Gábor", "kelemeng@gnome.hu"},
 	{N_("Indonesian"),          "id", "Rai S. Regawa", "raireg@yahoo.com"},
 	{N_("Italian"),             "it", "Claudio Satriano", "satriano@na.infn.it"},
 	{N_("Japanese"),            "ja", "Takashi Aihana", "aihana@gnome.gr.jp"},
@@ -223,7 +228,7 @@
 	{N_("Spanish"),             "es", "JM Pérez Cáncer", NULL},
 	{N_("Spanish"),             "es", "Nicolás Lichtmaier", NULL},
 	{N_("Spanish"),             "es", "Amaya Rodrigo", NULL},
-	{N_("Spanish"),				"es", "Alejandro G Villar", NULL},
+	{N_("Spanish"),             "es", "Alejandro G Villar", NULL},
 	{N_("Finnish"),             "fi", "Arto Alakulju", NULL},
 	{N_("Finnish"),             "fi", "Tero Kuusela", NULL},
 	{N_("French"),              "fr", "Sébastien François", NULL},
@@ -232,7 +237,8 @@
 	{N_("French"),              "fr", "Loïc Jeannin", NULL},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", NULL},
 	{N_("Hebrew"),              "he", "Pavel Bibergal", NULL},
-	{N_("Italian"),				"it", "Salvatore di Maggio", NULL},
+	{N_("Hungarian"),           "hu", "Zoltan Sutto", NULL},
+	{N_("Italian"),             "it", "Salvatore di Maggio", NULL},
 	{N_("Japanese"),            "ja", "Ryosuke Kutsuna", NULL},
 	{N_("Japanese"),            "ja", "Taku Yasui", NULL},
 	{N_("Japanese"),            "ja", "Junichi Uekawa", NULL},
@@ -301,14 +307,14 @@
 	context = gtk_widget_get_pango_context(widget);
 	layout = pango_layout_new(context);
 
-	markup = g_strdup_printf("<span foreground=\"#FFFFFF\">%s</span>", VERSION);
+	markup = g_strdup_printf("<span foreground=\"#000000\">%s</span>", VERSION);
 	pango_layout_set_font_description(layout, style->font_desc);
 	pango_layout_set_markup(layout, markup, strlen(markup));
 	g_free(markup);
 
 	pango_layout_get_pixel_size(layout, &lwidth, &lheight);
 	gdk_draw_layout(GDK_DRAWABLE(pixmap), style->bg_gc[GTK_STATE_NORMAL],
-					width - (lwidth + 3), height - (lheight + 1), layout);
+					width - (lwidth + 3), 1, layout);
 	g_object_unref(G_OBJECT(layout));
 
 	*original = gdk_pixbuf_get_from_drawable(NULL, pixmap, NULL,
@@ -359,7 +365,9 @@
 	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
+#if 0  /* Don't versionize the logo when the logo has the version in it */
 	pidgin_logo_versionize(&pixbuf, logo);
+#endif
 	gtk_widget_destroy(logo);
 	logo = gtk_image_new_from_pixbuf(pixbuf);
 	gdk_pixbuf_unref(pixbuf);
@@ -381,7 +389,7 @@
 		  "libpurple which is capable of connecting to "
 		  "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-		  "Gadu-Gadu, and QQ all at once.  "
+		  "MySpaceIM, Gadu-Gadu, and QQ all at once.  "
 		  "It is written using GTK+.<BR><BR>"
 		  "You may modify and redistribute the program under "
 		  "the terms of the GPL (version 2 or later).  A copy of the GPL is "
@@ -392,6 +400,9 @@
 
 	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
 					PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
+	g_string_append(str, "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\""
+			"http://developer.pidgin.im/wiki/FAQ\">"
+			"http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>");
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
 						   "#pidgin on irc.freenode.net<BR><BR>"));
 
@@ -447,7 +458,7 @@
 		if (retired_patch_writers[i].email != NULL) {
 			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
 					retired_patch_writers[i].name,
-					retired_patch_writers[i].email, patch_writers[i].email);
+					retired_patch_writers[i].email, retired_patch_writers[i].email);
 		} else {
 			g_string_append_printf(str, "  %s<br/>",
 					retired_patch_writers[i].name);
@@ -765,6 +776,7 @@
 	if (conv == NULL)
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
 
+	pidgin_conv_attach_to_conversation(conv);
 	purple_conversation_present(conv);
 }
 
diff -ru pidgin-2.1.1/pidgin/gtkdialogs.h pidgin-2.2.0/pidgin/gtkdialogs.h
--- pidgin-2.1.1/pidgin/gtkdialogs.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdialogs.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINDIALOGS_H_
 #define _PIDGINDIALOGS_H_
diff -ru pidgin-2.1.1/pidgin/gtkdnd-hints.c pidgin-2.2.0/pidgin/gtkdnd-hints.c
--- pidgin-2.1.1/pidgin/gtkdnd-hints.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdnd-hints.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "gtkdnd-hints.h"
diff -ru pidgin-2.1.1/pidgin/gtkdnd-hints.h pidgin-2.2.0/pidgin/gtkdnd-hints.h
--- pidgin-2.1.1/pidgin/gtkdnd-hints.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdnd-hints.h	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 #ifndef _PIDGIN_DND_HINTS_H_
 #define _PIDGIN_DND_HINTS_H_
diff -ru pidgin-2.1.1/pidgin/gtkdocklet.c pidgin-2.2.0/pidgin/gtkdocklet.c
--- pidgin-2.1.1/pidgin/gtkdocklet.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdocklet.c	2007-09-14 00:45:41.000000000 -0400
@@ -18,8 +18,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkdocklet.h pidgin-2.2.0/pidgin/gtkdocklet.h
--- pidgin-2.1.1/pidgin/gtkdocklet.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdocklet.h	2007-09-14 00:45:41.000000000 -0400
@@ -18,8 +18,8 @@
  * 
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifndef _GTKDOCKLET_H_
diff -ru pidgin-2.1.1/pidgin/gtkdocklet-x11.c pidgin-2.2.0/pidgin/gtkdocklet-x11.c
--- pidgin-2.1.1/pidgin/gtkdocklet-x11.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkdocklet-x11.c	2007-09-14 00:45:41.000000000 -0400
@@ -18,8 +18,8 @@
  * 
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/gtkeventloop.c pidgin-2.2.0/pidgin/gtkeventloop.c
--- pidgin-2.1.1/pidgin/gtkeventloop.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkeventloop.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <glib.h>
diff -ru pidgin-2.1.1/pidgin/gtkeventloop.h pidgin-2.2.0/pidgin/gtkeventloop.h
--- pidgin-2.1.1/pidgin/gtkeventloop.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkeventloop.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINEVENTLOOP_H_
 #define _PIDGINEVENTLOOP_H_
diff -ru pidgin-2.1.1/pidgin/gtkexpander.c pidgin-2.2.0/pidgin/gtkexpander.c
--- pidgin-2.1.1/pidgin/gtkexpander.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkexpander.c	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  *
  * Authors:
  *	Mark McLoughlin <mark@skynet.ie>
diff -ru pidgin-2.1.1/pidgin/gtkexpander.h pidgin-2.2.0/pidgin/gtkexpander.h
--- pidgin-2.1.1/pidgin/gtkexpander.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkexpander.h	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  *
  * Authors:
  *	Mark McLoughlin <mark@skynet.ie>
diff -ru pidgin-2.1.1/pidgin/gtkft.c pidgin-2.2.0/pidgin/gtkft.c
--- pidgin-2.1.1/pidgin/gtkft.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkft.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkft.h pidgin-2.2.0/pidgin/gtkft.h
--- pidgin-2.1.1/pidgin/gtkft.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkft.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINFT_H_
 #define _PIDGINFT_H_
diff -ru pidgin-2.1.1/pidgin/gtkgaim-compat.h pidgin-2.2.0/pidgin/gtkgaim-compat.h
--- pidgin-2.1.1/pidgin/gtkgaim-compat.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkgaim-compat.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _GTKGAIM_COMPAT_H_
diff -ru pidgin-2.1.1/pidgin/gtkidle.c pidgin-2.2.0/pidgin/gtkidle.c
--- pidgin-2.1.1/pidgin/gtkidle.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkidle.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/gtkidle.h pidgin-2.2.0/pidgin/gtkidle.h
--- pidgin-2.1.1/pidgin/gtkidle.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkidle.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGIN_IDLE_H_
 #define _PIDGIN_IDLE_H_
diff -ru pidgin-2.1.1/pidgin/gtkimhtml.c pidgin-2.2.0/pidgin/gtkimhtml.c
--- pidgin-2.1.1/pidgin/gtkimhtml.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkimhtml.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/gtkimhtml.h pidgin-2.2.0/pidgin/gtkimhtml.h
--- pidgin-2.1.1/pidgin/gtkimhtml.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkimhtml.h	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINIMHTML_H_
 #define _PIDGINIMHTML_H_
diff -ru pidgin-2.1.1/pidgin/gtkimhtmltoolbar.c pidgin-2.2.0/pidgin/gtkimhtmltoolbar.c
--- pidgin-2.1.1/pidgin/gtkimhtmltoolbar.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkimhtmltoolbar.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -28,6 +28,7 @@
 
 #include "imgstore.h"
 #include "notify.h"
+#include "prefs.h"
 #include "request.h"
 #include "pidginstock.h"
 #include "util.h"
@@ -70,6 +71,14 @@
 }
 
 static void
+do_strikethrough(GtkWidget *strikethrough, GtkIMHtmlToolbar *toolbar)
+{
+	g_return_if_fail(toolbar != NULL);
+	gtk_imhtml_toggle_strike(GTK_IMHTML(toolbar->imhtml));
+	gtk_widget_grab_focus(toolbar->imhtml);
+}
+
+static void
 do_small(GtkWidget *smalltb, GtkIMHtmlToolbar *toolbar)
 {
 	g_return_if_fail(toolbar != NULL);
@@ -433,6 +442,17 @@
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
+static void insert_hr_cb(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
+{
+        GtkTextIter iter;
+        GtkTextMark *ins;
+	GtkIMHtmlScalable *hr;
+
+        ins = gtk_text_buffer_get_insert(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)));
+        gtk_text_buffer_get_iter_at_mark(gtk_text_view_get_buffer(GTK_TEXT_VIEW(toolbar->imhtml)), &iter, ins);
+	hr = gtk_imhtml_hr_new();
+	gtk_imhtml_hr_add_to(hr, GTK_IMHTML(toolbar->imhtml), &iter);
+}
 
 static void
 do_insert_image_cb(GtkWidget *widget, int response, GtkIMHtmlToolbar *toolbar)
@@ -767,6 +787,7 @@
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->bold), buttons & GTK_IMHTML_BOLD);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->italic), buttons & GTK_IMHTML_ITALIC);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->underline), buttons & GTK_IMHTML_UNDERLINE);
+	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->strikethrough), buttons & GTK_IMHTML_STRIKE);
 
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->larger_size), buttons & GTK_IMHTML_GROW);
 	gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smaller_size), buttons & GTK_IMHTML_SHRINK);
@@ -779,6 +800,7 @@
 							 (buttons & GTK_IMHTML_BOLD ||
 							  buttons & GTK_IMHTML_ITALIC ||
 							  buttons & GTK_IMHTML_UNDERLINE ||
+							  buttons & GTK_IMHTML_STRIKE ||
 							  buttons & GTK_IMHTML_GROW ||
 							  buttons & GTK_IMHTML_SHRINK ||
 							  buttons & GTK_IMHTML_FACE ||
@@ -812,7 +834,7 @@
 
 static void update_buttons(GtkIMHtmlToolbar *toolbar)
 {
-	gboolean bold, italic, underline;
+	gboolean bold, italic, underline, strike;
 	char *tmp;
 	char *tmp2;
 	GtkLabel *label = g_object_get_data(G_OBJECT(toolbar), "font_label");
@@ -821,6 +843,7 @@
 
 	gtk_imhtml_get_current_format(GTK_IMHTML(toolbar->imhtml),
 								  &bold, &italic, &underline);
+	strike = GTK_IMHTML(toolbar->imhtml)->edit.strike;
 
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)) != bold)
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold,
@@ -828,10 +851,12 @@
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)) != italic)
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic,
 									   toolbar);
-
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)) != underline)
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
 									   underline, toolbar);
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->strikethrough)) != strike)
+		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->strikethrough),
+									   strike, toolbar);
 
 	/* These buttons aren't ever "active". */
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smaller_size), FALSE);
@@ -855,6 +880,12 @@
 		gtk_label_set_markup_with_mnemonic(label, markup);
 		g_free(markup);
 	}
+	if (strike) {
+		gchar *markup = g_strdup_printf("<s>%s</s>",
+				gtk_label_get_label(label));
+		gtk_label_set_markup_with_mnemonic(label, markup);
+		g_free(markup);
+	}
 
 	tmp = gtk_imhtml_get_current_fontface(GTK_IMHTML(toolbar->imhtml));
 	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->font),
@@ -991,9 +1022,41 @@
 	if (menu)
 		gtk_widget_destroy(menu);
 
+	purple_prefs_disconnect_by_handle(object);
+
 	G_OBJECT_CLASS(parent_class)->finalize (object);
 }
 
+static void
+switch_toolbar_view(GtkWidget *item, GtkIMHtmlToolbar *toolbar)
+{
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/toolbar/wide",
+			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/toolbar/wide"));
+}
+
+static gboolean
+gtk_imhtmltoolbar_popup_menu(GtkWidget *widget, GdkEventButton *event, GtkIMHtmlToolbar *toolbar)
+{
+	GtkWidget *menu;
+	GtkWidget *item;
+	gboolean wide;
+
+	if (event->button != 3)
+		return FALSE;
+
+	wide = GTK_WIDGET_VISIBLE(toolbar->bold);
+
+	menu = gtk_menu_new();
+	item = gtk_menu_item_new_with_mnemonic(wide ? _("Group Items") : _("Ungroup Items"));
+	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(switch_toolbar_view), toolbar);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	gtk_widget_show(item);
+
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, pidgin_menu_position_func_helper,
+				widget, event->button, event->time);
+	return TRUE;
+}
+
 /* Boring GTK+ stuff */
 static void gtk_imhtmltoolbar_class_init (GtkIMHtmlToolbarClass *class)
 {
@@ -1003,83 +1066,58 @@
 	gobject_class = (GObjectClass*) class;
 	parent_class = gtk_type_class(GTK_TYPE_HBOX);
 	gobject_class->finalize = gtk_imhtmltoolbar_finalize;
+
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/toolbar");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/toolbar/wide", FALSE);
 }
 
 static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 {
+	GtkWidget *hbox;
 	GtkWidget *button;
-	/* Bold */
-	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_BOLD);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(do_bold), toolbar);
-	toolbar->bold = button;
-
-
-	/* Italic */
-	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_ITALIC);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(do_italic), toolbar);
-	toolbar->italic = button;
-
-	/* Underline */
-	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_UNDERLINE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(do_underline), toolbar);
-	toolbar->underline = button;
-
-	/* Increase font size */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_TEXT_LARGER);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(do_big), toolbar);
-	toolbar->larger_size = button;
-
-	/* Decrease font size */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(do_small), toolbar);
-	toolbar->smaller_size = button;
-
-	/* Font Face */
-
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FONT_FACE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(toggle_font), toolbar);
-	toolbar->font = button;
-
-	/* Foreground Color */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FGCOLOR);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(toggle_fg_color), toolbar);
-	toolbar->fgcolor = button;
-
-	/* Background Color */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_BGCOLOR);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(toggle_bg_color), toolbar);
-	toolbar->bgcolor = button;
-
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT_LINK);
-	g_signal_connect(G_OBJECT(button), "clicked",
-				 G_CALLBACK(insert_link_cb), toolbar);
-	toolbar->link = button;
-
-	/* Insert IM Image */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(insert_image_cb), toolbar);
-	toolbar->image = button;
-
-	/* Insert Smiley */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(insert_smiley_cb), toolbar);
-	toolbar->smiley = button;
-
-	/* Reset formatting */
-	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY);
-	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(clear_formatting_cb), toolbar);
-	toolbar->clear = button;
+	struct {
+		char *stock;
+		gpointer callback;
+		GtkWidget **button;
+		const char *tooltip;
+	} buttons[] = {
+		{GTK_STOCK_BOLD, G_CALLBACK(do_bold), &toolbar->bold, _("Bold")},
+		{GTK_STOCK_ITALIC, do_italic, &toolbar->italic, _("Italic")},
+		{GTK_STOCK_UNDERLINE, do_underline, &toolbar->underline, _("Underline")},
+		{GTK_STOCK_STRIKETHROUGH, do_strikethrough, &toolbar->strikethrough, _("Strikethrough")},
+		{"", NULL, NULL, NULL},
+		{PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, do_big, &toolbar->larger_size, _("Increase Font Size")},
+		{PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, do_small, &toolbar->smaller_size, _("Decrease Font Size")},
+		{"", NULL, NULL, NULL},
+		{PIDGIN_STOCK_TOOLBAR_FONT_FACE, toggle_font, &toolbar->font, _("Font Face")},
+		{PIDGIN_STOCK_TOOLBAR_FGCOLOR, toggle_bg_color, &toolbar->bgcolor, _("Background Color")},
+		{PIDGIN_STOCK_TOOLBAR_BGCOLOR, toggle_fg_color, &toolbar->fgcolor, _("Foreground Color")},
+		{"", NULL, NULL, NULL},
+		{PIDGIN_STOCK_CLEAR, clear_formatting_cb, &toolbar->clear, _("Reset Formatting")},
+		{"", NULL, NULL, NULL},
+		{PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
+		{PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")},
+		{PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
+		{NULL, NULL, NULL, NULL}
+	};
+	int iter;
+
+	hbox = gtk_hbox_new(FALSE, 0);
+
+	for (iter = 0; buttons[iter].stock; iter++) {
+		if (buttons[iter].stock[0]) {
+			button = pidgin_pixbuf_toolbar_button_from_stock(buttons[iter].stock);
+			g_signal_connect(G_OBJECT(button), "clicked",
+					 G_CALLBACK(buttons[iter].callback), toolbar);
+			*(buttons[iter].button) = button;
+			gtk_tooltips_set_tip(toolbar->tooltips, button, buttons[iter].tooltip, NULL);
+		} else
+			button = gtk_vseparator_new();
+		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	}
+
+	gtk_box_pack_start(GTK_BOX(toolbar), hbox, FALSE, FALSE, 0);
+	g_object_set_data(G_OBJECT(toolbar), "wide-view", hbox);
 }
 
 static void
@@ -1103,10 +1141,23 @@
 		g_object_set(G_OBJECT(widget), "use-markup", TRUE, NULL);
 }
 
+static void
+imhtmltoolbar_view_pref_changed(const char *name, PurplePrefType type,
+		gconstpointer value, gpointer toolbar)
+{
+	if (value) {
+		gtk_widget_hide_all(g_object_get_data(G_OBJECT(toolbar), "lean-view"));
+		gtk_widget_show_all(g_object_get_data(G_OBJECT(toolbar), "wide-view"));
+	} else {
+		gtk_widget_hide_all(g_object_get_data(G_OBJECT(toolbar), "wide-view"));
+		gtk_widget_show_all(g_object_get_data(G_OBJECT(toolbar), "lean-view"));
+	}
+}
+
 static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 {
-	GtkWidget *hbox = GTK_WIDGET(toolbar);
-	GtkWidget *bbox;
+	GtkWidget *hbox = GTK_WIDGET(toolbar), *event = gtk_event_box_new();
+	GtkWidget *bbox, *box = gtk_hbox_new(FALSE, 0);
 	GtkWidget *image;
 	GtkWidget *label;
 	GtkWidget *insert_button;
@@ -1124,6 +1175,7 @@
 		{_("<b>_Bold</b>"), &toolbar->bold, TRUE},
 		{_("<i>_Italic</i>"), &toolbar->italic, TRUE},
 		{_("<u>_Underline</u>"), &toolbar->underline, TRUE},
+		{_("<span strikethrough='true'>Strikethrough</span>"), &toolbar->strikethrough, TRUE},
 		{_("<span size='larger'>_Larger</span>"), &toolbar->larger_size, TRUE},
 #if 0
 		{_("_Normal"), &toolbar->normal_size, TRUE},
@@ -1139,7 +1191,6 @@
 		{NULL, NULL, FALSE}
 	};
 
-
 	toolbar->imhtml = NULL;
 	toolbar->font_dialog = NULL;
 	toolbar->fgcolor_dialog = NULL;
@@ -1165,7 +1216,7 @@
 	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
 	g_object_set_data(G_OBJECT(hbox), "font_label", label);
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), font_button, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), font_button, FALSE, FALSE, 0);
 	gtk_widget_show_all(font_button);
 
 	font_menu = gtk_menu_new();
@@ -1194,7 +1245,7 @@
 
 	/* Sep */
 	sep = gtk_vseparator_new();
-	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
 	gtk_widget_show_all(sep);
 
 	/* Insert */
@@ -1206,7 +1257,7 @@
 	gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0);
 	label = gtk_label_new_with_mnemonic(_("_Insert"));
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), insert_button, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), insert_button, FALSE, FALSE, 0);
 	gtk_widget_show_all(insert_button);
 
 	insert_menu = gtk_menu_new();
@@ -1230,10 +1281,31 @@
 	g_signal_connect(G_OBJECT(toolbar->link), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
 
+	menuitem = gtk_menu_item_new_with_mnemonic(_("_Horizontal rule"));
+	g_signal_connect(G_OBJECT(menuitem), "activate"	, G_CALLBACK(insert_hr_cb), toolbar);
+	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
+	toolbar->insert_hr = menuitem;	
+
 	g_signal_connect_swapped(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(gtk_widget_activate), insert_button);
 	g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
 	toolbar->sml = NULL;
+
+	gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
+	g_object_set_data(G_OBJECT(hbox), "lean-view", box);
+
+	purple_prefs_connect_callback(toolbar, PIDGIN_PREFS_ROOT "/conversations/toolbar/wide",
+			imhtmltoolbar_view_pref_changed, toolbar);
+	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/toolbar/wide");
+
+#if GTK_CHECK_VERSION(2,4,0)
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
+#endif
+
+	gtk_widget_add_events(event, GDK_BUTTON_PRESS_MASK);
+	gtk_box_pack_start(GTK_BOX(hbox), event, TRUE, TRUE, 0);
+	g_signal_connect(G_OBJECT(event), "button-press-event", G_CALLBACK(gtk_imhtmltoolbar_popup_menu), toolbar);
+	gtk_widget_show(event);
 }
 
 GtkWidget *gtk_imhtmltoolbar_new()
diff -ru pidgin-2.1.1/pidgin/gtkimhtmltoolbar.h pidgin-2.2.0/pidgin/gtkimhtmltoolbar.h
--- pidgin-2.1.1/pidgin/gtkimhtmltoolbar.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkimhtmltoolbar.h	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PIDGINIMHTMLTOOLBAR_H_
@@ -74,6 +74,8 @@
 	GtkWidget *image_dialog;
 
 	char *sml;
+	GtkWidget *strikethrough;
+	GtkWidget *insert_hr;
 };
 
 struct _GtkIMHtmlToolbarClass {
diff -ru pidgin-2.1.1/pidgin/gtklog.c pidgin-2.2.0/pidgin/gtklog.c
--- pidgin-2.1.1/pidgin/gtklog.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtklog.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtklog.h pidgin-2.2.0/pidgin/gtklog.h
--- pidgin-2.1.1/pidgin/gtklog.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtklog.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINLOG_H_
 #define _PIDGINLOG_H_
diff -ru pidgin-2.1.1/pidgin/gtkmain.c pidgin-2.2.0/pidgin/gtkmain.c
--- pidgin-2.1.1/pidgin/gtkmain.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkmain.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -768,37 +768,12 @@
 	purple_set_blist(purple_blist_new());
 	purple_blist_load();
 
-	/* TODO: Move prefs loading into purple_prefs_init() */
-	purple_prefs_load();
-	purple_prefs_update_old();
-	pidgin_prefs_update_old();
-
 	/* load plugins we had when we quit */
 	purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded");
 
 	/* TODO: Move pounces loading into purple_pounces_init() */
 	purple_pounces_load();
 
-	/* Call this early on to try to auto-detect our IP address and
-	 * hopefully save some time later.
-	 * TODO: move this (back) into purple_core_init() when purple_prefs_load() is in purple_prefs_init() */
-	 purple_network_get_my_ip(-1);
-
-	/* HACK BY SEANEGAN:
-	 * We've renamed prpl-oscar to prpl-aim and prpl-icq, accordingly.
-	 * Let's do that change right here... after everything's loaded, but
-	 * before anything has happened
-	 */
-	for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
-		PurpleAccount *account = accounts->data;
-		if (!strcmp(purple_account_get_protocol_id(account), "prpl-oscar")) {
-			if (isdigit(*purple_account_get_username(account)))
-				purple_account_set_protocol_id(account, "prpl-icq");
-			else
-				purple_account_set_protocol_id(account, "prpl-aim");
-		}
-	}
-
 	ui_main();
 
 #ifdef USE_SM
@@ -837,10 +812,7 @@
 			g_free(opt_login_arg);
 			opt_login_arg = NULL;
 		}
-	}
-
-	if (opt_nologin && !opt_login)
-	{
+	} else if (opt_nologin)	{
 		/* Set all accounts to "offline" */
 		PurpleSavedStatus *saved_status;
 
@@ -854,9 +826,7 @@
 
 		/* Set the status for each account */
 		purple_savedstatus_activate(saved_status);
-	}
-	else if (!opt_login)
-	{
+	} else {
 		/* Everything is good to go--sign on already */
 		if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
 			purple_savedstatus_activate(purple_savedstatus_get_startup());
diff -ru pidgin-2.1.1/pidgin/gtkmenutray.c pidgin-2.2.0/pidgin/gtkmenutray.c
--- pidgin-2.1.1/pidgin/gtkmenutray.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkmenutray.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "debug.h"
 
diff -ru pidgin-2.1.1/pidgin/gtkmenutray.h pidgin-2.2.0/pidgin/gtkmenutray.h
--- pidgin-2.1.1/pidgin/gtkmenutray.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkmenutray.h	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef PIDGIN_MENU_TRAY_H
 #define PIDGIN_MENU_TRAY_H
diff -ru pidgin-2.1.1/pidgin/gtknickcolors.h pidgin-2.2.0/pidgin/gtknickcolors.h
--- pidgin-2.1.1/pidgin/gtknickcolors.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtknickcolors.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINNICKCOLORS_H_
 #define _PIDGINNICKCOLORS_H_
diff -ru pidgin-2.1.1/pidgin/gtknotify.c pidgin-2.2.0/pidgin/gtknotify.c
--- pidgin-2.1.1/pidgin/gtknotify.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtknotify.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
@@ -589,16 +589,16 @@
 	char label_text[2048];
 	char *linked_text, *primary_esc, *secondary_esc;
 
-	window = pidgin_create_window(title, PIDGIN_HIG_BORDER, NULL, TRUE);
-	gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+	window = gtk_dialog_new();
+	gtk_window_set_title(GTK_WINDOW(window), title);
+	gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
+	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(formatted_close_cb), NULL);
 
 	/* Setup the main vbox */
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	gtk_widget_show(vbox);
+	vbox = GTK_DIALOG(window)->vbox;
 
 	/* Setup the descriptive label */
 	primary_esc = g_markup_escape_text(primary, -1);
@@ -630,9 +630,7 @@
 	gtk_widget_show(frame);
 
 	/* Add the Close button. */
-	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
+	button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 	gtk_widget_grab_focus(button);
 
 	g_signal_connect_swapped(G_OBJECT(button), "clicked",
@@ -708,7 +706,6 @@
 	guint i;
 
 	GtkWidget *vbox;
-	GtkWidget *button_area;
 	GtkWidget *label;
 	GtkWidget *sw;
 	PidginNotifySearchResultsData *data;
@@ -723,16 +720,16 @@
 	data->results = results;
 
 	/* Create the window */
-	window = pidgin_create_window(title ? title :_("Search Results"), PIDGIN_HIG_BORDER, NULL, TRUE);
-	gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+	window = gtk_dialog_new();
+	gtk_window_set_title(GTK_WINDOW(window), title ? title :_("Search Results"));
+	gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);
+	gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
 	g_signal_connect_swapped(G_OBJECT(window), "delete_event",
 							 G_CALLBACK(searchresults_close_cb), data);
 
 	/* Setup the main vbox */
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
-	gtk_widget_show(vbox);
+	vbox = GTK_DIALOG(window)->vbox;
 
 	/* Setup the descriptive label */
 	primary_esc = (primary != NULL) ? g_markup_escape_text(primary, -1) : NULL;
@@ -796,13 +793,6 @@
 				renderer, "text", i, NULL);
 	}
 
-	/* Setup the button area */
-	button_area = gtk_hbutton_box_new();
-	gtk_box_pack_start(GTK_BOX(vbox), button_area, FALSE, FALSE, 0);
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(button_area), GTK_BUTTONBOX_END);
-	gtk_box_set_spacing(GTK_BOX(button_area), PIDGIN_HIG_BORDER);
-	gtk_widget_show(button_area);
-
 	for (i = 0; i < g_list_length(results->buttons); i++) {
 		PurpleNotifySearchButton *b = g_list_nth_data(results->buttons, i);
 		GtkWidget *button = NULL;
@@ -811,26 +801,26 @@
 				if(b->label) {
 					button = gtk_button_new_with_label(b->label);
 				} else {
-					purple_debug_warning("gtknotify", "Missing button label");
+					purple_debug_warning("gtknotify", "Missing button label\n");
 				}
 				break;
 			case PURPLE_NOTIFY_BUTTON_CONTINUE:
-				button = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_GO_FORWARD, GTK_RESPONSE_NONE);
 				break;
 			case PURPLE_NOTIFY_BUTTON_ADD:
-				button = gtk_button_new_from_stock(GTK_STOCK_ADD);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_ADD, GTK_RESPONSE_NONE);
 				break;
 			case PURPLE_NOTIFY_BUTTON_INFO:
-				button = gtk_button_new_from_stock(PIDGIN_STOCK_TOOLBAR_USER_INFO);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), PIDGIN_STOCK_TOOLBAR_USER_INFO, GTK_RESPONSE_NONE);
 				break;
 			case PURPLE_NOTIFY_BUTTON_IM:
-				button = gtk_button_new_from_stock(PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, GTK_RESPONSE_NONE);
 				break;
 			case PURPLE_NOTIFY_BUTTON_JOIN:
-				button = gtk_button_new_from_stock(PIDGIN_STOCK_CHAT);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), PIDGIN_STOCK_CHAT, GTK_RESPONSE_NONE);
 				break;
 			case PURPLE_NOTIFY_BUTTON_INVITE:
-				button = gtk_button_new_from_stock(PIDGIN_STOCK_INVITE);
+				button = gtk_dialog_add_button(GTK_DIALOG(window), PIDGIN_STOCK_INVITE, GTK_RESPONSE_NONE);
 				break;
 			default:
 				purple_debug_warning("gtknotify", "Incorrect button type: %d\n", b->type);
@@ -838,9 +828,6 @@
 		if (button != NULL) {
 			PidginNotifySearchResultsButtonData *bd;
 
-			gtk_box_pack_start(GTK_BOX(button_area), button, FALSE, FALSE, 0);
-			gtk_widget_show(button);
-
 			bd = g_new0(PidginNotifySearchResultsButtonData, 1);
 			bd->button = b;
 			bd->data = data;
@@ -852,9 +839,7 @@
 	}
 
 	/* Add the Close button */
-	close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	gtk_box_pack_start(GTK_BOX(button_area), close_button, FALSE, FALSE, 0);
-	gtk_widget_show(close_button);
+	close_button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 
 	g_signal_connect_swapped(G_OBJECT(close_button), "clicked",
 	                         G_CALLBACK(searchresults_close_cb), data);
diff -ru pidgin-2.1.1/pidgin/gtknotify.h pidgin-2.2.0/pidgin/gtknotify.h
--- pidgin-2.1.1/pidgin/gtknotify.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtknotify.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINNOTIFY_H_
 #define _PIDGINNOTIFY_H_
diff -ru pidgin-2.1.1/pidgin/gtkplugin.c pidgin-2.2.0/pidgin/gtkplugin.c
--- pidgin-2.1.1/pidgin/gtkplugin.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkplugin.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkplugin.h pidgin-2.2.0/pidgin/gtkplugin.h
--- pidgin-2.1.1/pidgin/gtkplugin.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkplugin.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINPLUGIN_H_
 #define _PIDGINPLUGIN_H_
diff -ru pidgin-2.1.1/pidgin/gtkpluginpref.c pidgin-2.2.0/pidgin/gtkpluginpref.c
--- pidgin-2.1.1/pidgin/gtkpluginpref.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkpluginpref.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff -ru pidgin-2.1.1/pidgin/gtkpluginpref.h pidgin-2.2.0/pidgin/gtkpluginpref.h
--- pidgin-2.1.1/pidgin/gtkpluginpref.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkpluginpref.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PIDGINPLUGINPREF_H_
diff -ru pidgin-2.1.1/pidgin/gtkpounce.c pidgin-2.2.0/pidgin/gtkpounce.c
--- pidgin-2.1.1/pidgin/gtkpounce.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkpounce.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -467,7 +467,6 @@
 	PidginPounceDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *label;
-	GtkWidget *bbox;
 	GtkWidget *vbox1, *vbox2;
 	GtkWidget *hbox;
 	GtkWidget *button;
@@ -513,17 +512,16 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	/* Create the window. */
-	dialog->window = window = pidgin_create_window((cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce")),
-		PIDGIN_HIG_BORDER, "buddy_pounce", FALSE) ;
-	gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+	dialog->window = window = gtk_dialog_new();
+	gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce")));
+	gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce");
+	gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(delete_win_cb), dialog);
 
 	/* Create the parent vbox for everything. */
-	vbox1 = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(window), vbox1);
-	gtk_widget_show(vbox1);
+	vbox1 = GTK_DIALOG(window)->vbox;
 
 	/* Create the vbox that will contain all the prefs stuff. */
 	vbox2 = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -808,26 +806,13 @@
 	gtk_widget_show(dialog->on_away);
 	gtk_widget_show(dialog->save_pounce);
 
-	/* Now the button box! */
-	bbox = gtk_hbutton_box_new();
-	gtk_box_set_spacing(GTK_BOX(bbox), PIDGIN_HIG_BOX_SPACE);
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-	gtk_box_pack_end(GTK_BOX(vbox1), bbox, FALSE, FALSE, 0);
-	gtk_widget_show(bbox);
-
 	/* Cancel button */
-	button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
+	button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(cancel_cb), dialog);
 
 	/* Save button */
-	dialog->save_button = button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
+	dialog->save_button = button = gtk_dialog_add_button(GTK_DIALOG(window), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(save_pounce_cb), dialog);
 
@@ -990,7 +975,7 @@
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/play-sound"));
 	}
 
-	gtk_widget_show_all(vbox2);
+	gtk_widget_show(vbox2);
 	gtk_widget_show(window);
 }
 
diff -ru pidgin-2.1.1/pidgin/gtkpounce.h pidgin-2.2.0/pidgin/gtkpounce.h
--- pidgin-2.1.1/pidgin/gtkpounce.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkpounce.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINPOUNCE_H_
 #define _PIDGINPOUNCE_H_
diff -ru pidgin-2.1.1/pidgin/gtkprefs.c pidgin-2.2.0/pidgin/gtkprefs.c
--- pidgin-2.1.1/pidgin/gtkprefs.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkprefs.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -240,7 +240,7 @@
 
 	if (label != NULL) {
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), dropdown);
-		pidgin_set_accessible_label (dropdown, label);
+		pidgin_set_accessible_relations (dropdown, label);
 	}
 
 	if (type == PURPLE_PREF_INT)
@@ -887,7 +887,7 @@
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
-	
+
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	vbox = pidgin_make_frame(ret, _("System Tray Icon"));
@@ -899,7 +899,7 @@
 					NULL);
 	gtk_size_group_add_widget(sg, label);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	
+
 	vbox = pidgin_make_frame(ret, _("Conversation Window Hiding"));
 	label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
 					PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
@@ -909,11 +909,11 @@
 					NULL);
 	gtk_size_group_add_widget(sg, label);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-			
+
 
 	/* All the tab options! */
 	vbox = pidgin_make_frame(ret, _("Tabs"));
-	
+
 	pidgin_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
 							PIDGIN_PREFS_ROOT "/conversations/tabs", vbox);
 
@@ -944,12 +944,12 @@
 					NULL);
 	gtk_size_group_add_widget(sg, label);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-		
+
 	names = pidgin_conv_placement_get_options();
 	label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
 				PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/placement", names);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-			
+
 	gtk_size_group_add_widget(sg, label);
 
 	g_list_free(names);
@@ -1036,12 +1036,14 @@
 		gtk_widget_set_sensitive(hbox, FALSE);
 	g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox);
 	g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL);
+	gtk_widget_show_all(hbox);
 #endif
 
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
 	gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START);
 
 	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
+	gtk_widget_show(frame);
 	gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml");
 	gtk_widget_set_size_request(frame, 300, -1);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
@@ -1068,7 +1070,7 @@
 					 G_CALLBACK(formatting_clear_cb), NULL);
 
 
-	gtk_widget_show_all(ret);
+	gtk_widget_show(ret);
 
 	return ret;
 }
@@ -1508,6 +1510,7 @@
 
 	gtk_widget_set_sensitive(vbox, strcmp(method, "none"));
 }
+#endif /* !_WIN32 */
 
 #ifdef USE_GSTREAMER
 static void
@@ -1522,7 +1525,6 @@
 			!strcmp(method, "esd"));
 }
 #endif /* USE_GSTREAMER */
-#endif /* !_WIN32 */
 
 
 static void
@@ -1620,7 +1622,7 @@
 		filename = NULL;
 
 	purple_request_file(prefs, _("Sound Selection"), filename, FALSE,
-					  G_CALLBACK(sound_chosen_cb), NULL, 
+					  G_CALLBACK(sound_chosen_cb), NULL,
 					  NULL, NULL, NULL,
 					  GINT_TO_POINTER(sound_row_sel));
 }
@@ -1691,9 +1693,11 @@
 	int j;
 	const char *file;
 	char *pref;
+#if !defined _WIN32 || defined USE_GSTREAMER
+	GtkWidget *label;
+#endif
 #ifndef _WIN32
 	GtkWidget *dd;
-	GtkWidget *label;
 	GtkWidget *entry;
 	const char *cmd;
 #endif
@@ -2010,7 +2014,7 @@
 	return ret;
 }
 
-static int 
+static int
 prefs_notebook_add_page(const char *text,
   		        GtkWidget *page,
 			int ind) {
@@ -2164,6 +2168,8 @@
 	/* Smiley Callbacks */
 	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
 								smiley_theme_pref_cb, NULL);
+
+	pidgin_prefs_update_old();
 }
 
 void pidgin_prefs_update_old()
diff -ru pidgin-2.1.1/pidgin/gtkprefs.h pidgin-2.2.0/pidgin/gtkprefs.h
--- pidgin-2.1.1/pidgin/gtkprefs.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkprefs.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _PIDGINPREFS_H_
diff -ru pidgin-2.1.1/pidgin/gtkprivacy.c pidgin-2.2.0/pidgin/gtkprivacy.c
--- pidgin-2.1.1/pidgin/gtkprivacy.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkprivacy.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/gtkprivacy.h pidgin-2.2.0/pidgin/gtkprivacy.h
--- pidgin-2.1.1/pidgin/gtkprivacy.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkprivacy.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINPRIVACY_H_
 #define _PIDGINPRIVACY_H_
diff -ru pidgin-2.1.1/pidgin/gtkrequest.c pidgin-2.2.0/pidgin/gtkrequest.c
--- pidgin-2.1.1/pidgin/gtkrequest.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkrequest.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
@@ -368,6 +368,8 @@
 	data->u.input.multiline = multiline;
 	data->u.input.hint = g_strdup(hint);
 
+	gtk_widget_show_all(hbox);
+
 	if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) {
 		GtkWidget *frame;
 
@@ -429,20 +431,21 @@
 					gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR);
 			}
 		}
+		gtk_widget_show_all(vbox);
 	}
 
 	pidgin_set_accessible_label (entry, label);
 	data->u.input.entry = entry;
 
 	/* Show everything. */
-	gtk_widget_show_all(dialog);
+	gtk_widget_show(dialog);
 
 	return data;
 }
 
 static void *
 pidgin_request_choice(const char *title, const char *primary,
-			const char *secondary, unsigned int default_value,
+			const char *secondary, int default_value,
 			const char *ok_text, GCallback ok_cb,
 			const char *cancel_text, GCallback cancel_cb,
 			PurpleAccount *account, const char *who, PurpleConversation *conv,
@@ -548,7 +551,7 @@
 
 static void *
 pidgin_request_action(const char *title, const char *primary,
-						const char *secondary, unsigned int default_action,
+						const char *secondary, int default_action,
 					    PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data, size_t action_count, va_list actions)
 {
@@ -1083,7 +1086,7 @@
 	data->cbs[0] = ok_cb;
 	data->cbs[1] = cancel_cb;
 
-	
+
 #ifdef _WIN32
 	data->dialog = win = pidgin_create_window(PIDGIN_ALERT_TITLE, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
 #else /* !_WIN32 */
diff -ru pidgin-2.1.1/pidgin/gtkrequest.h pidgin-2.2.0/pidgin/gtkrequest.h
--- pidgin-2.1.1/pidgin/gtkrequest.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkrequest.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINREQUEST_H_
 #define _PIDGINREQUEST_H_
diff -ru pidgin-2.1.1/pidgin/gtkroomlist.c pidgin-2.2.0/pidgin/gtkroomlist.c
--- pidgin-2.1.1/pidgin/gtkroomlist.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkroomlist.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/gtkroomlist.h pidgin-2.2.0/pidgin/gtkroomlist.h
--- pidgin-2.1.1/pidgin/gtkroomlist.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkroomlist.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINROOMLIST_H_
 #define _PIDGINROOMLIST_H_
diff -ru pidgin-2.1.1/pidgin/gtksavedstatuses.c pidgin-2.2.0/pidgin/gtksavedstatuses.c
--- pidgin-2.1.1/pidgin/gtksavedstatuses.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksavedstatuses.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
@@ -1450,7 +1450,9 @@
 	GtkWidget *win;
 	GtkTreeIter iter;
 	GtkCellRenderer *rend;
-	const char *status_id = NULL;
+	char *status_id = NULL;
+	char *message = NULL;
+	gboolean parent_dialog_has_substatus = FALSE;
 	GList *list;
 	gboolean select = FALSE;
 
@@ -1553,25 +1555,29 @@
 					 G_CALLBACK(substatus_editor_ok_cb), dialog);
 
 	/* Seed the input widgets with the current values */
-	/* TODO: Get the current values from our parent's list store, not the saved_status! */
-	if (status_editor->original_title != NULL)
-	{
+
+	/* Only look at the saved status if we can't find it in the parent status dialog's substatuses model */
+	gtk_tree_model_get(GTK_TREE_MODEL(status_editor->model), &iter, 
+		STATUS_EDITOR_COLUMN_ENABLE_SUBSTATUS, &parent_dialog_has_substatus, -1);
+	if (parent_dialog_has_substatus) {
+		gtk_tree_model_get(GTK_TREE_MODEL(status_editor->model), &iter,
+			STATUS_EDITOR_COLUMN_STATUS_ID, &status_id,
+			STATUS_EDITOR_COLUMN_STATUS_MESSAGE, &message, -1);
+	} else if (status_editor->original_title != NULL) {
 		PurpleSavedStatus *saved_status = NULL;
 		PurpleSavedStatusSub *substatus = NULL;
 
-		saved_status = purple_savedstatus_find(status_editor->original_title);
-		if (saved_status != NULL)
-			substatus = purple_savedstatus_get_substatus(saved_status, account);
-
-		if (substatus != NULL)
-		{
-			gtk_imhtml_append_text(dialog->message,
-								   purple_savedstatus_substatus_get_message(substatus),
-								   0);
-			status_id = purple_status_type_get_id(purple_savedstatus_substatus_get_type(substatus));
+		if ((saved_status = purple_savedstatus_find(status_editor->original_title)) != NULL) {
+			if ((substatus = purple_savedstatus_get_substatus(saved_status, account)) != NULL) {
+				message = (char *)purple_savedstatus_substatus_get_message(substatus);
+				status_id = (char *)purple_status_type_get_id(purple_savedstatus_substatus_get_type(substatus));
+			}
 		}
-		/* TODO: Else get the generic status type from our parent */
 	}
+	/* TODO: Else get the generic status type from our parent */
+
+	if (message)
+		gtk_imhtml_append_text(dialog->message, message, 0);
 
 	for (list = purple_account_get_status_types(account); list; list = list->next)
 	{
@@ -1607,6 +1613,12 @@
 	if (!select)
 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 
+	if (parent_dialog_has_substatus) {
+		/* These two were gotten from the parent tree model, so they need to be freed */
+		g_free(status_id);
+		g_free(message);
+	}
+
 	gtk_widget_show_all(win);
 }
 
diff -ru pidgin-2.1.1/pidgin/gtksavedstatuses.h pidgin-2.2.0/pidgin/gtksavedstatuses.h
--- pidgin-2.1.1/pidgin/gtksavedstatuses.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksavedstatuses.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINSAVEDSTATUSES_H_
 #define _PIDGINSAVEDSTATUSES_H_
diff -ru pidgin-2.1.1/pidgin/gtkscrollbook.c pidgin-2.2.0/pidgin/gtkscrollbook.c
--- pidgin-2.1.1/pidgin/gtkscrollbook.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkscrollbook.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "gtkscrollbook.h"
diff -ru pidgin-2.1.1/pidgin/gtkscrollbook.h pidgin-2.2.0/pidgin/gtkscrollbook.h
--- pidgin-2.1.1/pidgin/gtkscrollbook.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkscrollbook.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef __PIDGIN_SCROLL_BOOK_H__
diff -ru pidgin-2.1.1/pidgin/gtksession.c pidgin-2.2.0/pidgin/gtksession.c
--- pidgin-2.1.1/pidgin/gtksession.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksession.c	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/gtksession.h pidgin-2.2.0/pidgin/gtksession.h
--- pidgin-2.1.1/pidgin/gtksession.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksession.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINSESSION_H_
 #define _PIDGINSESSION_H_
diff -ru pidgin-2.1.1/pidgin/gtksound.c pidgin-2.2.0/pidgin/gtksound.c
--- pidgin-2.1.1/pidgin/gtksound.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksound.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -114,7 +114,7 @@
 play_conv_event(PurpleConversation *conv, PurpleSoundEventID event)
 {
 	/* If we should not play the sound for some reason, then exit early */
-	if (conv != NULL)
+	if (conv != NULL && PIDGIN_IS_PIDGIN_CONVERSATION(conv))
 	{
 		PidginConversation *gtkconv;
 		PidginWindow *win;
@@ -364,14 +364,14 @@
 	GError *err = NULL;
 
 	switch (GST_MESSAGE_TYPE (msg)) {
-	case GST_MESSAGE_EOS:
-		gst_element_set_state(play, GST_STATE_NULL);
-		gst_object_unref(GST_OBJECT(play));
-		break;
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error(msg, &err, NULL);
 		purple_debug_error("gstreamer", "%s\n", err->message);
 		g_error_free(err);
+		/* fall-through and clean up */
+	case GST_MESSAGE_EOS:
+		gst_element_set_state(play, GST_STATE_NULL);
+		gst_object_unref(GST_OBJECT(play));
 		break;
 	case GST_MESSAGE_WARNING:
 		gst_message_parse_warning(msg, &err, NULL);
@@ -446,6 +446,8 @@
 		g_free(command);
 		return;
 	}
+#endif /* _WIN32 */
+
 #ifdef USE_GSTREAMER
 	if (gst_init_failed)  /* Perhaps do gdk_beep instead? */
 		return;
@@ -460,7 +462,9 @@
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else if (!strcmp(method, "esd")) {
+	}
+#ifndef _WIN32
+	else if (!strcmp(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
 		if (!sink) {
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
@@ -472,7 +476,9 @@
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else {
+	}
+#endif
+	else {
 		purple_debug_error("sound", "Unknown sound method '%s'\n", method);
 		return;
 	}
@@ -498,9 +504,9 @@
 	g_free(uri);
 
 #else /* USE_GSTREAMER */
+
+#ifndef _WIN32
 	gdk_beep();
-	return;
-#endif /* USE_GSTREAMER */
 #else /* _WIN32 */
 	purple_debug_info("sound", "Playing %s\n", filename);
 
@@ -518,6 +524,8 @@
 		g_free(l_filename);
 	}
 #endif /* _WIN32 */
+
+#endif /* USE_GSTREAMER */
 }
 
 static void
diff -ru pidgin-2.1.1/pidgin/gtksound.h pidgin-2.2.0/pidgin/gtksound.h
--- pidgin-2.1.1/pidgin/gtksound.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksound.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINSOUND_H_
 #define _PIDGINSOUND_H_
diff -ru pidgin-2.1.1/pidgin/gtksourceiter.c pidgin-2.2.0/pidgin/gtksourceiter.c
--- pidgin-2.1.1/pidgin/gtksourceiter.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksourceiter.c	2007-09-14 00:45:41.000000000 -0400
@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/gtksourceiter.h pidgin-2.2.0/pidgin/gtksourceiter.h
--- pidgin-2.1.1/pidgin/gtksourceiter.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksourceiter.h	2007-09-14 00:45:41.000000000 -0400
@@ -22,7 +22,7 @@
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #ifndef _PIDGINSOURCEITER_H_
diff -ru pidgin-2.1.1/pidgin/gtksourceundomanager.c pidgin-2.2.0/pidgin/gtksourceundomanager.c
--- pidgin-2.1.1/pidgin/gtksourceundomanager.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksourceundomanager.c	2007-09-14 00:45:41.000000000 -0400
@@ -19,8 +19,8 @@
  *
  * 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., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -677,8 +677,6 @@
 	if (um->priv->running_not_undoable_actions > 0)
 		return;
 
-	g_return_if_fail (strlen (text) >= (guint)length);
-	
 	undo_action.action_type = GTK_SOURCE_UNDO_ACTION_INSERT;
 
 	undo_action.action.insert.pos    = gtk_text_iter_get_offset (pos);
@@ -774,7 +772,7 @@
 		*action = *undo_action;
 
 		if (action->action_type == GTK_SOURCE_UNDO_ACTION_INSERT)
-			action->action.insert.text = g_strdup (undo_action->action.insert.text);
+			action->action.insert.text = g_strndup (undo_action->action.insert.text, undo_action->action.insert.length);
 		else if (action->action_type == GTK_SOURCE_UNDO_ACTION_DELETE)
 			action->action.delete.text = g_strdup (undo_action->action.delete.text); 
 		else
diff -ru pidgin-2.1.1/pidgin/gtksourceundomanager.h pidgin-2.2.0/pidgin/gtksourceundomanager.h
--- pidgin-2.1.1/pidgin/gtksourceundomanager.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtksourceundomanager.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,8 +19,8 @@
  *
  * 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., 59 Temple Place, Suite 330, 
- * Boston, MA 02111-1307, USA. * *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Boston, MA 02111-1301, USA. * *
  */
  
 #ifndef __GTK_SOURCE_UNDO_MANAGER_H__
diff -ru pidgin-2.1.1/pidgin/gtkstatusbox.c pidgin-2.2.0/pidgin/gtkstatusbox.c
--- pidgin-2.1.1/pidgin/gtkstatusbox.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkstatusbox.c	2007-09-14 04:00:10.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 /*
@@ -1394,7 +1394,7 @@
 		return;
 	}
 	gtk_grab_add (box->popup_window);
-	box->popup_in_progress = TRUE;
+//	box->popup_in_progress = TRUE;
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button),
 				      TRUE);
 
@@ -1415,15 +1415,15 @@
 }
 
 
-static void
-toggled_cb(GtkWidget *widget, PidginStatusBox *box)
+static 
+gboolean
+toggled_cb(GtkWidget *widget, GdkEventButton *event, PidginStatusBox *box)
 {
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))  {
 		if (!box->popup_in_progress)
 			pidgin_status_box_popup (box);
-	}  else {
-		pidgin_status_box_popdown(box);
-	}
+		else
+			pidgin_status_box_popdown(box);
+return TRUE;
 }
 
 static void
@@ -1590,14 +1590,15 @@
 		    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) {
 			pidgin_status_box_popdown (status_box);
 			return TRUE;
+		} else if (ewidget == status_box->toggle_button) {
+			status_box->popup_in_progress = TRUE;		
 		}
 
 		/* released outside treeview */
-		if (ewidget != status_box->toggle_button)
-			{
+		if (ewidget != status_box->toggle_button) {
 				pidgin_status_box_popdown (status_box);
 				return TRUE;
-			}
+		}
 
 		return FALSE;
 	}
@@ -1773,7 +1774,7 @@
 	g_signal_connect(G_OBJECT(status_box->toggle_button), "button-release-event",
 			 G_CALLBACK(button_released_cb), status_box);
 #endif
-	g_signal_connect(G_OBJECT(status_box->toggle_button), "toggled",
+	g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event",
 	                 G_CALLBACK(toggled_cb), status_box);
 	g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK(imhtml_changed_cb), status_box);
 	g_signal_connect(G_OBJECT(status_box->imhtml), "format_function_toggle",
diff -ru pidgin-2.1.1/pidgin/gtkstatusbox.h pidgin-2.2.0/pidgin/gtkstatusbox.h
--- pidgin-2.1.1/pidgin/gtkstatusbox.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkstatusbox.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 
diff -ru pidgin-2.1.1/pidgin/gtkthemes.c pidgin-2.2.0/pidgin/gtkthemes.c
--- pidgin-2.1.1/pidgin/gtkthemes.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkthemes.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/gtkthemes.h pidgin-2.2.0/pidgin/gtkthemes.h
--- pidgin-2.1.1/pidgin/gtkthemes.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkthemes.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINTHEMES_H_
 #define _PIDGINTHEMES_H_
diff -ru pidgin-2.1.1/pidgin/gtkutils.c pidgin-2.2.0/pidgin/gtkutils.c
--- pidgin-2.1.1/pidgin/gtkutils.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkutils.c	2007-09-14 04:33:10.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
@@ -1147,19 +1147,12 @@
 void
 pidgin_set_accessible_label (GtkWidget *w, GtkWidget *l)
 {
-	AtkObject *acc, *label;
-	AtkObject *rel_obj[1];
-	AtkRelationSet *set;
-	AtkRelation *relation;
+	AtkObject *acc;
 	const gchar *label_text;
 	const gchar *existing_name;
 
 	acc = gtk_widget_get_accessible (w);
-	label = gtk_widget_get_accessible (l);
 
-	/* Make sure mnemonics work */
-        gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
-	
 	/* If this object has no name, set it's name with the label text */
 	existing_name = atk_object_get_name (acc);
 	if (!existing_name) {
@@ -1168,6 +1161,23 @@
 			atk_object_set_name (acc, label_text);
 	}
 
+	pidgin_set_accessible_relations(w, l);
+}
+
+void
+pidgin_set_accessible_relations (GtkWidget *w, GtkWidget *l)
+{
+	AtkObject *acc, *label;
+	AtkObject *rel_obj[1];
+	AtkRelationSet *set;
+	AtkRelation *relation;
+
+	acc = gtk_widget_get_accessible (w);
+	label = gtk_widget_get_accessible (l);
+
+	/* Make sure mnemonics work */
+        gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
+	
 	/* Create the labeled-by relation */
 	set = atk_object_ref_relation_set (acc);
 	rel_obj[0] = label;
@@ -3205,3 +3215,56 @@
 }
 #endif
 
+static void
+combo_box_changed_cb(GtkComboBox *combo_box, GtkEntry *entry)
+{
+	char *text = gtk_combo_box_get_active_text(combo_box);
+	gtk_entry_set_text(entry, text ? text : "");
+	g_free(text);
+}
+
+static gboolean
+entry_key_pressed_cb(GtkWidget *entry, GdkEventKey *key, GtkComboBox *combo)
+{
+	if (key->keyval == GDK_Down || key->keyval == GDK_Up) {
+		gtk_combo_box_popup(combo);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+GtkWidget *
+pidgin_text_combo_box_entry_new(const char *default_item, GList *items)
+{
+	GtkComboBox *ret = NULL;
+	GtkWidget *the_entry = NULL;
+
+	ret = GTK_COMBO_BOX(gtk_combo_box_new_text());
+	the_entry = gtk_entry_new();
+	gtk_container_add(GTK_CONTAINER(ret), the_entry);
+
+	if (default_item)
+		gtk_entry_set_text(GTK_ENTRY(the_entry), default_item);
+
+	for (; items != NULL ; items = items->next) {
+		char *text = items->data;
+		if (text && *text)
+			gtk_combo_box_append_text(ret, text);
+	}
+
+	g_signal_connect(G_OBJECT(ret), "changed", (GCallback)combo_box_changed_cb, the_entry);
+	g_signal_connect_after(G_OBJECT(the_entry), "key-press-event", G_CALLBACK(entry_key_pressed_cb), ret);
+
+	return GTK_WIDGET(ret);
+}
+
+const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget)
+{
+	return gtk_entry_get_text(GTK_ENTRY(GTK_BIN((widget))->child));
+}
+
+void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text)
+{
+	gtk_entry_set_text(GTK_ENTRY(GTK_BIN((widget))->child), (text));
+}
+
diff -ru pidgin-2.1.1/pidgin/gtkutils.h pidgin-2.2.0/pidgin/gtkutils.h
--- pidgin-2.1.1/pidgin/gtkutils.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkutils.h	2007-09-14 04:33:10.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _PIDGINUTILS_H_
 #define _PIDGINUTILS_H_
@@ -311,7 +311,7 @@
  * The default filter function for screenname autocomplete.
  *
  * @param completion_entry The completion entry to filter.
- * @param online_accounts  If this is @c FALSE, only the autocompletion entries
+ * @param all_accounts  If this is @c FALSE, only the autocompletion entries
  *                         which belong to an online account will be filtered.
  * @return Returns @c TRUE if the autocompletion entry is filtered.
  */
@@ -418,6 +418,14 @@
 void pidgin_set_accessible_label(GtkWidget *w, GtkWidget *l);
 
 /**
+ * Sets the labelled-by and label-for ATK relationships.
+ *
+ * @param w The widget that we want to label.
+ * @param l A GtkLabel that we want to use as the label for the widget.
+ */
+void pidgin_set_accessible_relations(GtkWidget *w, GtkWidget *l);
+
+/**
  * A helper function for GtkMenuPositionFuncs. This ensures the menu will
  * be kept on screen if possible.
  *
@@ -427,7 +435,7 @@
  * @param y Address of the gint representing the vertical position
  *        where the menu shall be drawn. This is an output parameter.
  * @param push_in This is an output parameter?
- * @param user_data Not used by this particular position function.
+ * @param data Not used by this particular position function.
  */
 void pidgin_menu_position_func_helper(GtkMenu *menu, gint *x, gint *y,
 										gboolean *push_in, gpointer data);
@@ -650,10 +658,37 @@
  * @param ...            list of integers terminated by -1
  *
  * @return               A newly created GtkTreePath.
- *
  */
 GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, ...);
 #endif
 
+/**
+ * Create a simple text GtkComboBoxEntry equivalent
+ *
+ * @param default_item   Initial contents of GtkEntry
+ * @param items          GList containing strings to add to GtkComboBox
+ *
+ * @return               A newly created text GtkComboBox containing a GtkEntry
+ *                       child.
+ */
+GtkWidget *pidgin_text_combo_box_entry_new(const char *default_item, GList *items);
+
+/**
+ * Retrieve the text from the entry of the simple text GtkComboBoxEntry equivalent
+ *
+ * @param widget         The simple text GtkComboBoxEntry equivalent widget
+ *
+ * @return               The text in the widget's entry. It must not be freed
+ */
+const char *pidgin_text_combo_box_entry_get_text(GtkWidget *widget);
+
+/**
+ * Set the text in the entry of the simple text GtkComboBoxEntry equivalent
+ *
+ * @param widget         The simple text GtkComboBoxEntry equivalent widget
+ * @param text           The text to set
+ */
+void pidgin_text_combo_box_entry_set_text(GtkWidget *widget, const char *text);
+
 #endif /* _PIDGINUTILS_H_ */
 
diff -ru pidgin-2.1.1/pidgin/gtkwhiteboard.c pidgin-2.2.0/pidgin/gtkwhiteboard.c
--- pidgin-2.1.1/pidgin/gtkwhiteboard.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkwhiteboard.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/gtkwhiteboard.h pidgin-2.2.0/pidgin/gtkwhiteboard.h
--- pidgin-2.1.1/pidgin/gtkwhiteboard.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/gtkwhiteboard.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef _PIDGINWHITEBOARD_H_
diff -ru pidgin-2.1.1/pidgin/Makefile.am pidgin-2.2.0/pidgin/Makefile.am
--- pidgin-2.1.1/pidgin/Makefile.am	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/Makefile.am	2007-09-14 00:45:41.000000000 -0400
@@ -29,6 +29,7 @@
 		win32/nsis/langmacros.nsh \
 		win32/nsis/translations/afrikaans.nsh \
 		win32/nsis/translations/albanian.nsh \
+		win32/nsis/translations/basque.nsh \
 		win32/nsis/translations/bulgarian.nsh \
 		win32/nsis/translations/catalan.nsh \
 		win32/nsis/translations/czech.nsh \
@@ -81,6 +82,7 @@
 	gtkcellrendererprogress.c \
 	gtkcellview.c \
 	gtkcellviewmenuitem.c \
+	gtkcertmgr.c \
 	gtkconn.c \
 	gtkconv.c \
 	gtkdebug.c \
@@ -128,6 +130,7 @@
 	gtkcellviewmenuitem.h \
 	gtkcellview.h \
 	gtkcellviewmenuitem.h \
+	gtkcertmgr.h \
 	pidgincombobox.h \
 	gtkconn.h \
 	gtkconv.h \
diff -ru pidgin-2.1.1/pidgin/Makefile.in pidgin-2.2.0/pidgin/Makefile.in
--- pidgin-2.1.1/pidgin/Makefile.in	2007-08-20 14:14:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/Makefile.in	2007-09-14 03:31:27.000000000 -0400
@@ -59,8 +59,8 @@
 am__pidgin_SOURCES_DIST = eggtrayicon.c pidgincombobox.c pidginstock.c \
 	gtkaccount.c gtkblist.c gtkcelllayout.c \
 	gtkcellrendererexpander.c gtkcellrendererprogress.c \
-	gtkcellview.c gtkcellviewmenuitem.c gtkconn.c gtkconv.c \
-	gtkdebug.c gtkdialogs.c gtkdnd-hints.c gtkdocklet.c \
+	gtkcellview.c gtkcellviewmenuitem.c gtkcertmgr.c gtkconn.c \
+	gtkconv.c gtkdebug.c gtkdialogs.c gtkdnd-hints.c gtkdocklet.c \
 	gtkdocklet-x11.c gtkeventloop.c gtkexpander.c gtkft.c \
 	gtkidle.c gtkimhtml.c gtkimhtmltoolbar.c gtklog.c gtkmain.c \
 	gtkmenutray.c gtknotify.c gtkplugin.c gtkpluginpref.c \
@@ -76,10 +76,10 @@
 @ENABLE_GTK_TRUE@	gtkcellrendererprogress.$(OBJEXT) \
 @ENABLE_GTK_TRUE@	gtkcellview.$(OBJEXT) \
 @ENABLE_GTK_TRUE@	gtkcellviewmenuitem.$(OBJEXT) \
-@ENABLE_GTK_TRUE@	gtkconn.$(OBJEXT) gtkconv.$(OBJEXT) \
-@ENABLE_GTK_TRUE@	gtkdebug.$(OBJEXT) gtkdialogs.$(OBJEXT) \
-@ENABLE_GTK_TRUE@	gtkdnd-hints.$(OBJEXT) gtkdocklet.$(OBJEXT) \
-@ENABLE_GTK_TRUE@	gtkdocklet-x11.$(OBJEXT) \
+@ENABLE_GTK_TRUE@	gtkcertmgr.$(OBJEXT) gtkconn.$(OBJEXT) \
+@ENABLE_GTK_TRUE@	gtkconv.$(OBJEXT) gtkdebug.$(OBJEXT) \
+@ENABLE_GTK_TRUE@	gtkdialogs.$(OBJEXT) gtkdnd-hints.$(OBJEXT) \
+@ENABLE_GTK_TRUE@	gtkdocklet.$(OBJEXT) gtkdocklet-x11.$(OBJEXT) \
 @ENABLE_GTK_TRUE@	gtkeventloop.$(OBJEXT) gtkexpander.$(OBJEXT) \
 @ENABLE_GTK_TRUE@	gtkft.$(OBJEXT) gtkidle.$(OBJEXT) \
 @ENABLE_GTK_TRUE@	gtkimhtml.$(OBJEXT) \
@@ -128,16 +128,16 @@
 am__pidgininclude_HEADERS_DIST = eggtrayicon.h gtkaccount.h gtkblist.h \
 	gtkcelllayout.h gtkcellrendererexpander.h \
 	gtkcellrendererprogress.h gtkcellview.h gtkcellviewmenuitem.h \
-	pidgincombobox.h gtkconn.h gtkconv.h gtkconvwin.h gtkdebug.h \
-	gtkdialogs.h gtkdnd-hints.h gtkdocklet.h gtkeventloop.h \
-	gtkexpander.h gtkft.h gtkidle.h gtkgaim-compat.h gtkimhtml.h \
-	gtkimhtmltoolbar.h gtklog.h gtkmenutray.h gtknickcolors.h \
-	gtknotify.h gtkplugin.h gtkpluginpref.h gtkprefs.h \
-	gtkprivacy.h gtkpounce.h gtkrequest.h gtkroomlist.h \
-	gtksavedstatuses.h gtkscrollbook.h gtksession.h gtksound.h \
-	gtksourceiter.h gtksourceundomanager.h gtksourceview-marshal.h \
-	gtkstatusbox.h pidginstock.h gtkthemes.h gtkutils.h \
-	gtkwhiteboard.h pidgin.h
+	gtkcertmgr.h pidgincombobox.h gtkconn.h gtkconv.h gtkconvwin.h \
+	gtkdebug.h gtkdialogs.h gtkdnd-hints.h gtkdocklet.h \
+	gtkeventloop.h gtkexpander.h gtkft.h gtkidle.h \
+	gtkgaim-compat.h gtkimhtml.h gtkimhtmltoolbar.h gtklog.h \
+	gtkmenutray.h gtknickcolors.h gtknotify.h gtkplugin.h \
+	gtkpluginpref.h gtkprefs.h gtkprivacy.h gtkpounce.h \
+	gtkrequest.h gtkroomlist.h gtksavedstatuses.h gtkscrollbook.h \
+	gtksession.h gtksound.h gtksourceiter.h gtksourceundomanager.h \
+	gtksourceview-marshal.h gtkstatusbox.h pidginstock.h \
+	gtkthemes.h gtkutils.h gtkwhiteboard.h pidgin.h
 pidginincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(pidgininclude_HEADERS)
 ETAGS = etags
@@ -194,6 +194,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -222,6 +224,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -277,14 +281,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -296,7 +298,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -357,6 +358,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -377,6 +379,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -520,6 +524,7 @@
 		win32/nsis/langmacros.nsh \
 		win32/nsis/translations/afrikaans.nsh \
 		win32/nsis/translations/albanian.nsh \
+		win32/nsis/translations/basque.nsh \
 		win32/nsis/translations/bulgarian.nsh \
 		win32/nsis/translations/catalan.nsh \
 		win32/nsis/translations/czech.nsh \
@@ -566,6 +571,7 @@
 @ENABLE_GTK_TRUE@	gtkcellrendererprogress.c \
 @ENABLE_GTK_TRUE@	gtkcellview.c \
 @ENABLE_GTK_TRUE@	gtkcellviewmenuitem.c \
+@ENABLE_GTK_TRUE@	gtkcertmgr.c \
 @ENABLE_GTK_TRUE@	gtkconn.c \
 @ENABLE_GTK_TRUE@	gtkconv.c \
 @ENABLE_GTK_TRUE@	gtkdebug.c \
@@ -613,6 +619,7 @@
 @ENABLE_GTK_TRUE@	gtkcellviewmenuitem.h \
 @ENABLE_GTK_TRUE@	gtkcellview.h \
 @ENABLE_GTK_TRUE@	gtkcellviewmenuitem.h \
+@ENABLE_GTK_TRUE@	gtkcertmgr.h \
 @ENABLE_GTK_TRUE@	pidgincombobox.h \
 @ENABLE_GTK_TRUE@	gtkconn.h \
 @ENABLE_GTK_TRUE@	gtkconv.h \
@@ -776,6 +783,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcellrendererprogress.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcellview.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcellviewmenuitem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkcertmgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkconn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtkdebug.Po@am__quote@
diff -ru pidgin-2.1.1/pidgin/Makefile.mingw pidgin-2.2.0/pidgin/Makefile.mingw
--- pidgin-2.1.1/pidgin/Makefile.mingw	2007-08-20 14:12:53.000000000 -0400
+++ pidgin-2.2.0/pidgin/Makefile.mingw	2007-08-30 00:36:32.000000000 -0400
@@ -56,10 +56,11 @@
 PIDGIN_C_SRC =	\
 			gtkaccount.c \
 			gtkblist.c \
-			gtkconn.c \
-			gtkconv.c \
+			gtkcertmgr.c \
 			gtkcellrendererexpander.c \
 			gtkcellrendererprogress.c \
+			gtkconn.c \
+			gtkconv.c \
 			gtkdebug.c \
 			gtkdialogs.c \
 			gtkdnd-hints.c \
diff -ru pidgin-2.1.1/pidgin/pidgincombobox.c pidgin-2.2.0/pidgin/pidgincombobox.c
--- pidgin-2.1.1/pidgin/pidgincombobox.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/pidgincombobox.c	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/pidgincombobox.h pidgin-2.2.0/pidgin/pidgincombobox.h
--- pidgin-2.1.1/pidgin/pidgincombobox.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/pidgincombobox.h	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 #ifndef __PIDGIN_COMBO_BOX_H__
diff -ru pidgin-2.1.1/pidgin/pidgin.h pidgin-2.2.0/pidgin/pidgin.h
--- pidgin-2.1.1/pidgin/pidgin.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/pidgin.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,13 +20,13 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 /* #warning ***pidgin*** */
 #ifndef _PIDGIN_H_
 #define _PIDGIN_H_
 
-#ifndef _WIN32
+#ifdef GDK_WINDOWING_X11
 # include <gdk/gdkx.h>
 #endif
 
diff -ru pidgin-2.1.1/pidgin/pidginstock.c pidgin-2.2.0/pidgin/pidginstock.c
--- pidgin-2.1.1/pidgin/pidginstock.c	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/pidginstock.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include "internal.h"
@@ -74,6 +74,11 @@
 	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
 	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
 	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
+#if GTK_CHECK_VERSION(2,8,0)
+	{ PIDGIN_STOCK_INFO,            NULL,      GTK_STOCK_INFO             },
+#else
+	{ PIDGIN_STOCK_INFO,            "buttons", "info.png"                 },
+#endif
 };
 
 static const GtkStockItem stock_items[] =
@@ -105,7 +110,7 @@
 	{ PIDGIN_STOCK_STATUS_AVAILABLE,   "status", "available.png", 	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },
 	{ PIDGIN_STOCK_STATUS_AWAY, 	   "status", "away.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },
 	{ PIDGIN_STOCK_STATUS_BUSY, 	"status", "busy.png", 		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },
-	{ PIDGIN_STOCK_STATUS_CHAT, 	"status", "chat.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
+	{ PIDGIN_STOCK_STATUS_CHAT, 	"status", "chat.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
 	{ PIDGIN_STOCK_STATUS_XA, 	"status", "extended-away.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },
 	{ PIDGIN_STOCK_STATUS_LOGIN, 	"status", "log-in.png",		FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },
@@ -396,7 +401,7 @@
 
 	/* register custom icon sizes */
 	
-	microscopic =  gtk_icon_size_register("pidgin-icon-size-tango-microscopic", 11, 11);
+	microscopic =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC, 11, 11);
 	extra_small =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16);
 	small =        gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22);
 	medium =       gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32);
diff -ru pidgin-2.1.1/pidgin/pidginstock.h pidgin-2.2.0/pidgin/pidginstock.h
--- pidgin-2.1.1/pidgin/pidginstock.h	2007-08-20 14:12:54.000000000 -0400
+++ pidgin-2.2.0/pidgin/pidginstock.h	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include <gtk/gtkstock.h>
 
@@ -45,6 +45,7 @@
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
+#define PIDGIN_STOCK_INFO            "pidgin-info"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
 #define PIDGIN_STOCK_OPEN_MAIL       "pidgin-stock-open-mail"
@@ -145,6 +146,7 @@
 /**
  * For using icons that aren't one of the default GTK_ICON_SIZEs
  */
+#define PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC    "pidgin-icon-size-tango-microscopic"
 #define PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL    "pidgin-icon-size-tango-extra-small"
 #define PIDGIN_ICON_SIZE_TANGO_SMALL          "pidgin-icon-size-tango-small"
 #define PIDGIN_ICON_SIZE_TANGO_MEDIUM         "pidgin-icon-size-tango-medium"
diff -ru pidgin-2.1.1/pidgin/pixmaps/animations/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/animations/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/animations/16/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/animations/16/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/animations/Makefile.in pidgin-2.2.0/pidgin/pixmaps/animations/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/animations/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/animations/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/buddy_icons/Makefile.in pidgin-2.2.0/pidgin/pixmaps/buddy_icons/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/buddy_icons/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/buddy_icons/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/buddy_icons/qq/Makefile.in pidgin-2.2.0/pidgin/pixmaps/buddy_icons/qq/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/buddy_icons/qq/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/buddy_icons/qq/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/dialogs/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/dialogs/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/dialogs/16/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/dialogs/16/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/dialogs/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/dialogs/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/dialogs/16/scalable/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/dialogs/16/scalable/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/dialogs/64/Makefile.in pidgin-2.2.0/pidgin/pixmaps/dialogs/64/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/dialogs/64/Makefile.in	2007-08-20 14:14:01.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/dialogs/64/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/dialogs/64/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/dialogs/64/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/dialogs/64/scalable/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/dialogs/64/scalable/Makefile.in	2007-09-14 03:31:28.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/dialogs/Makefile.in pidgin-2.2.0/pidgin/pixmaps/dialogs/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/dialogs/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/dialogs/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emblems/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emblems/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emblems/16/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emblems/16/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emblems/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emblems/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emblems/16/scalable/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emblems/16/scalable/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emblems/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emblems/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emblems/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emblems/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
Only in pidgin-2.2.0/pidgin/pixmaps/emotes/default/24: mad-tongue.png
Only in pidgin-2.1.1/pidgin/pixmaps/emotes/default/24: madtongue.png
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/Makefile.am pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/Makefile.am	2007-08-20 14:12:55.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/Makefile.am	2007-08-21 03:33:13.000000000 -0400
@@ -95,7 +95,7 @@
     love-over.png \
     love.png \
     lying.png \
-    madtongue.png \
+    mad-tongue.png \
     mail.png \
     male-fighter1.png \
     male-fighter2.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -509,7 +513,7 @@
     love-over.png \
     love.png \
     lying.png \
-    madtongue.png \
+    mad-tongue.png \
     mail.png \
     male-fighter1.png \
     male-fighter2.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emotes/default/24/scalable/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/default/24/scalable/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/default/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emotes/default/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emotes/default/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/default/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emotes/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emotes/Makefile.in	2007-08-20 14:14:02.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/Makefile.in	2007-09-14 03:31:29.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/emotes/none/Makefile.in pidgin-2.2.0/pidgin/pixmaps/emotes/none/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/emotes/none/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/emotes/none/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/16/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/16/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/16/scalable/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/16/scalable/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/22/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/22/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/22/Makefile.in	2007-08-20 14:14:03.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/22/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/22/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/22/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/22/scalable/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/22/scalable/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/24/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/24/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/24/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/24/Makefile.in	2007-09-14 03:31:30.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/24/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/24/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/24/scalable/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/24/scalable/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/32/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/32/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/32/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/32/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/32/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/32/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/32/scalable/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/32/scalable/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/48/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/48/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/48/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/48/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/48/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/48/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/48/scalable/Makefile.in	2007-08-20 14:14:04.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/48/scalable/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/icons/Makefile.in pidgin-2.2.0/pidgin/pixmaps/icons/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/icons/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/icons/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
Only in pidgin-2.2.0/pidgin/pixmaps: info.png
Binary files pidgin-2.1.1/pidgin/pixmaps/logo.png and pidgin-2.2.0/pidgin/pixmaps/logo.png differ
diff -ru pidgin-2.1.1/pidgin/pixmaps/Makefile.am pidgin-2.2.0/pidgin/pixmaps/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/Makefile.am	2007-08-20 14:12:55.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/Makefile.am	2007-08-30 00:36:32.000000000 -0400
@@ -2,6 +2,7 @@
 
 EXTRA_DIST = \
 		edit.png			\
+		info.png			\
 		logo.png			\
 		pause.png			\
 		arrow-down.xpm		\
@@ -12,7 +13,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = edit.png pause.png 
+pidginbuttonpix_DATA = edit.png pause.png info.png
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
diff -ru pidgin-2.1.1/pidgin/pixmaps/Makefile.in pidgin-2.2.0/pidgin/pixmaps/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/Makefile.in	2007-08-20 14:14:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/Makefile.in	2007-09-14 03:31:27.000000000 -0400
@@ -120,6 +120,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -148,6 +150,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -203,14 +207,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -222,7 +224,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -283,6 +284,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -303,6 +305,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -418,6 +422,7 @@
 SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray
 EXTRA_DIST = \
 		edit.png			\
+		info.png			\
 		logo.png			\
 		pause.png			\
 		arrow-down.xpm		\
@@ -428,7 +433,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = edit.png pause.png 
+pidginbuttonpix_DATA = edit.png pause.png info.png
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
 all: all-recursive
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/16/Makefile.am pidgin-2.2.0/pidgin/pixmaps/protocols/16/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/protocols/16/Makefile.am	2007-08-20 14:12:58.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/16/Makefile.am	2007-08-21 03:33:13.000000000 -0400
@@ -10,6 +10,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/16/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/16/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -424,6 +428,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
Only in pidgin-2.2.0/pidgin/pixmaps/protocols/16: myspace.png
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/16/scalable/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/16/scalable/Makefile.in	2007-09-14 03:31:31.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/22/Makefile.am pidgin-2.2.0/pidgin/pixmaps/protocols/22/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/protocols/22/Makefile.am	2007-08-20 14:12:58.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/22/Makefile.am	2007-08-21 03:33:13.000000000 -0400
@@ -10,6 +10,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/22/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/22/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/22/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/22/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -424,6 +428,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
Only in pidgin-2.2.0/pidgin/pixmaps/protocols/22: myspace.png
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/22/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/22/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/22/scalable/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/22/scalable/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/48/Makefile.am pidgin-2.2.0/pidgin/pixmaps/protocols/48/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/protocols/48/Makefile.am	2007-08-20 14:12:58.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/48/Makefile.am	2007-08-21 03:33:13.000000000 -0400
@@ -9,6 +9,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/48/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/48/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/48/Makefile.in	2007-08-20 14:14:05.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/48/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -423,6 +427,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
Only in pidgin-2.2.0/pidgin/pixmaps/protocols/48: myspace.png
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/48/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/48/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/48/scalable/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/48/scalable/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/protocols/Makefile.in pidgin-2.2.0/pidgin/pixmaps/protocols/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/protocols/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/protocols/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.am pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.am	2007-08-20 14:12:58.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.am	2007-08-27 22:35:01.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = scalable
+SUBDIRS = scalable rtl
 
 EXTRA_DIST = 	available.png \
 		away.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.in	2007-09-14 03:31:32.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -413,7 +417,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = scalable
+SUBDIRS = scalable rtl
 EXTRA_DIST = available.png \
 		away.png \
 		busy.png \
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.mingw pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.mingw
--- pidgin-2.1.1/pidgin/pixmaps/status/11/Makefile.mingw	2007-08-20 14:12:58.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/11/Makefile.mingw	2007-08-27 22:35:01.000000000 -0400
@@ -18,3 +18,5 @@
 	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
 
+	$(MAKE) -C rtl -f Makefile.mingw install || exit 1; \
+
Only in pidgin-2.2.0/pidgin/pixmaps/status/11: rtl
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/11/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/11/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/11/scalable/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/11/scalable/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/16/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/16/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/16/rtl/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/16/rtl/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/16/rtl/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/16/rtl/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/16/scalable/Makefile.in	2007-08-20 14:14:06.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/16/scalable/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/22/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/22/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/22/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/22/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/22/rtl/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/22/rtl/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/22/rtl/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/22/rtl/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/22/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/22/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/22/scalable/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/22/scalable/Makefile.in	2007-09-14 03:31:33.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/32/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/32/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/32/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/32/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/32/rtl/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/32/rtl/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/32/rtl/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/32/rtl/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/32/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/32/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/32/scalable/Makefile.in	2007-08-20 14:14:07.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/32/scalable/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/48/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/48/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/48/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/48/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/48/rtl/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/48/rtl/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/48/rtl/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/48/rtl/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/Makefile.am pidgin-2.2.0/pidgin/pixmaps/status/Makefile.am
--- pidgin-2.1.1/pidgin/pixmaps/status/Makefile.am	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/Makefile.am	2007-09-14 02:21:41.000000000 -0400
@@ -3,6 +3,7 @@
 EXTRA_DIST = \
 	Makefile.mingw \
 	11/Makefile.mingw \
+	11/rtl/Makefile.mingw \
 	16/Makefile.mingw \
 	16/rtl/Makefile.mingw \
 	22/Makefile.mingw \
diff -ru pidgin-2.1.1/pidgin/pixmaps/status/Makefile.in pidgin-2.2.0/pidgin/pixmaps/status/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/status/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/status/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -407,6 +411,7 @@
 EXTRA_DIST = \
 	Makefile.mingw \
 	11/Makefile.mingw \
+	11/rtl/Makefile.mingw \
 	16/Makefile.mingw \
 	16/rtl/Makefile.mingw \
 	22/Makefile.mingw \
@@ -592,7 +597,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/11 $(distdir)/16 $(distdir)/16/rtl $(distdir)/22 $(distdir)/22/rtl $(distdir)/32 $(distdir)/32/rtl $(distdir)/48 $(distdir)/48/rtl
+	$(mkdir_p) $(distdir)/11 $(distdir)/11/rtl $(distdir)/16 $(distdir)/16/rtl $(distdir)/22 $(distdir)/22/rtl $(distdir)/32 $(distdir)/32/rtl $(distdir)/48 $(distdir)/48/rtl
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff -ru pidgin-2.1.1/pidgin/pixmaps/toolbar/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/toolbar/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/toolbar/16/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/toolbar/16/Makefile.in	2007-09-14 03:31:34.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/toolbar/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/toolbar/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/toolbar/16/scalable/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/toolbar/16/scalable/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/toolbar/22/Makefile.in pidgin-2.2.0/pidgin/pixmaps/toolbar/22/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/toolbar/22/Makefile.in	2007-08-20 14:14:08.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/toolbar/22/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/toolbar/22/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/toolbar/22/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/toolbar/22/scalable/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/toolbar/22/scalable/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/toolbar/Makefile.in pidgin-2.2.0/pidgin/pixmaps/toolbar/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/toolbar/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/toolbar/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/16/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/16/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/16/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/16/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/16/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/16/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/16/scalable/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/16/scalable/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/22/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/22/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/22/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/22/Makefile.in	2007-09-14 03:31:35.000000000 -0400
@@ -118,6 +118,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -146,6 +148,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -201,14 +205,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -220,7 +222,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -281,6 +282,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -301,6 +303,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/22/scalable/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/22/scalable/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/22/scalable/Makefile.in	2007-08-20 14:14:09.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/22/scalable/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/32/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/32/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/32/Makefile.in	2007-08-20 14:14:10.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/32/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/48/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/48/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/48/Makefile.in	2007-08-20 14:14:10.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/48/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/pixmaps/tray/Makefile.in pidgin-2.2.0/pidgin/pixmaps/tray/Makefile.in
--- pidgin-2.1.1/pidgin/pixmaps/tray/Makefile.in	2007-08-20 14:14:10.000000000 -0400
+++ pidgin-2.2.0/pidgin/pixmaps/tray/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/cap/cap.c pidgin-2.2.0/pidgin/plugins/cap/cap.c
--- pidgin-2.1.1/pidgin/plugins/cap/cap.c	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/cap/cap.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #include "cap.h"
diff -ru pidgin-2.1.1/pidgin/plugins/cap/cap.h pidgin-2.2.0/pidgin/plugins/cap/cap.h
--- pidgin-2.1.1/pidgin/plugins/cap/cap.h	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/cap/cap.h	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifndef _CAP_H_
diff -ru pidgin-2.1.1/pidgin/plugins/cap/cap_statistics.h pidgin-2.2.0/pidgin/plugins/cap/cap_statistics.h
--- pidgin-2.1.1/pidgin/plugins/cap/cap_statistics.h	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/cap/cap_statistics.h	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifndef _CAP_STATISTICS_H_
diff -ru pidgin-2.1.1/pidgin/plugins/cap/Makefile.in pidgin-2.2.0/pidgin/plugins/cap/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/cap/Makefile.in	2007-08-20 14:14:11.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/cap/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -128,6 +128,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -156,6 +158,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -211,14 +215,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -230,7 +232,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -291,6 +292,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -311,6 +313,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/contact_priority.c pidgin-2.2.0/pidgin/plugins/contact_priority.c
--- pidgin-2.1.1/pidgin/plugins/contact_priority.c	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/contact_priority.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/plugins/convcolors.c pidgin-2.2.0/pidgin/plugins/convcolors.c
--- pidgin-2.1.1/pidgin/plugins/convcolors.c	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/convcolors.c	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/pidgin/plugins/extplacement.c pidgin-2.2.0/pidgin/plugins/extplacement.c
--- pidgin-2.1.1/pidgin/plugins/extplacement.c	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/extplacement.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/plugins/gestures/gestures.c pidgin-2.2.0/pidgin/plugins/gestures/gestures.c
--- pidgin-2.1.1/pidgin/plugins/gestures/gestures.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gestures/gestures.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/plugins/gestures/Makefile.in pidgin-2.2.0/pidgin/plugins/gestures/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/gestures/Makefile.in	2007-08-20 14:14:11.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gestures/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -130,6 +130,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -158,6 +160,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -213,14 +217,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -232,7 +234,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -293,6 +294,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -313,6 +315,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.2.0/pidgin/plugins/gevolution/add_buddy_dialog.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/add_buddy_dialog.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/add_buddy_dialog.c	2007-09-14 04:33:10.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "gtkblist.h"
@@ -68,7 +68,7 @@
 	const char *group_name;
 
 	group_name =
-		gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(dialog->group_combo)->entry));
+		pidgin_text_combo_box_entry_get_text(dialog->group_combo);
 
 	gevo_new_person_dialog_show(dialog->book, NULL, dialog->account, dialog->username,
 								(*group_name ? group_name : NULL),
@@ -105,7 +105,7 @@
 					   -1);
 
 	group_name =
-		gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(dialog->group_combo)->entry));
+		pidgin_text_combo_box_entry_get_text(dialog->group_combo);
 
 	if (username == NULL || *username == '\0')
 	{
@@ -553,9 +553,8 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
-	dialog->group_combo = gtk_combo_new();
-	gtk_combo_set_popdown_strings(GTK_COMBO(dialog->group_combo),
-								  gevo_get_groups());
+	dialog->group_combo =
+		pidgin_text_combo_box_entry_new(NULL, gevo_get_groups());
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->group_combo, TRUE, TRUE, 0);
 	gtk_widget_show(dialog->group_combo);
 
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/assoc-buddy.c pidgin-2.2.0/pidgin/plugins/gevolution/assoc-buddy.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/assoc-buddy.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/assoc-buddy.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "gtkblist.h"
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/eds-utils.c pidgin-2.2.0/pidgin/plugins/gevolution/eds-utils.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/eds-utils.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/eds-utils.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/gevolution.c pidgin-2.2.0/pidgin/plugins/gevolution/gevolution.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/gevolution.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/gevolution.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/gevolution.h pidgin-2.2.0/pidgin/plugins/gevolution/gevolution.h
--- pidgin-2.1.1/pidgin/plugins/gevolution/gevolution.h	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/gevolution.h	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #ifndef _GEVOLUTION_H_
 #define _GEVOLUTION_H_
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/gevo-util.c pidgin-2.2.0/pidgin/plugins/gevolution/gevo-util.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/gevo-util.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/gevo-util.c	2007-09-14 04:33:10.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "gtkblist.h"
@@ -55,10 +55,13 @@
 GList *
 gevo_get_groups(void)
 {
-	GList *list = NULL;
+	static GList *list = NULL;
 	PurpleGroup *g;
 	PurpleBlistNode *gnode;
 
+	g_list_free(list);
+	list = NULL;
+
 	if (purple_get_blist()->root == NULL)
 	{
 		list  = g_list_append(list, (gpointer)_("Buddies"));
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/Makefile.in pidgin-2.2.0/pidgin/plugins/gevolution/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/gevolution/Makefile.in	2007-08-20 14:14:11.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -133,6 +133,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -161,6 +163,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -216,14 +220,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -235,7 +237,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -296,6 +297,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -316,6 +318,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.2.0/pidgin/plugins/gevolution/new_person_dialog.c
--- pidgin-2.1.1/pidgin/plugins/gevolution/new_person_dialog.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gevolution/new_person_dialog.c	2007-09-14 04:33:10.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 #include "pidgin.h"
@@ -195,10 +195,9 @@
 
 	if (!dialog->person_only)
 	{
-		GtkWidget *entry = GTK_COMBO(dialog->group_combo)->entry;
 		const char *group_name;
 
-		group_name = gtk_entry_get_text(GTK_ENTRY(entry));
+		group_name = pidgin_text_combo_box_entry_get_text(dialog->group_combo);
 
 		gevo_add_buddy(dialog->account, group_name, screenname, full_name);
 	}
@@ -297,9 +296,8 @@
 						 G_CALLBACK(screenname_changed_cb), dialog);
 
 		/* Group */
-		dialog->group_combo = gtk_combo_new();
-		gtk_combo_set_popdown_strings(GTK_COMBO(dialog->group_combo),
-									  gevo_get_groups());
+		dialog->group_combo = pidgin_text_combo_box_entry_new(NULL,
+			gevo_get_groups());
 		add_pref_box(sg, vbox, _("Group:"), dialog->group_combo);
 
 		/* Separator */
diff -ru pidgin-2.1.1/pidgin/plugins/gtkbuddynote.c pidgin-2.2.0/pidgin/plugins/gtkbuddynote.c
--- pidgin-2.1.1/pidgin/plugins/gtkbuddynote.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gtkbuddynote.c	2007-09-14 00:45:41.000000000 -0400
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/pidgin/plugins/gtk-signals-test.c pidgin-2.2.0/pidgin/plugins/gtk-signals-test.c
--- pidgin-2.1.1/pidgin/plugins/gtk-signals-test.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/gtk-signals-test.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
 
diff -ru pidgin-2.1.1/pidgin/plugins/iconaway.c pidgin-2.2.0/pidgin/plugins/iconaway.c
--- pidgin-2.1.1/pidgin/plugins/iconaway.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/iconaway.c	2007-09-14 00:45:41.000000000 -0400
@@ -16,7 +16,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
 #include "pidgin.h"
diff -ru pidgin-2.1.1/pidgin/plugins/mailchk.c pidgin-2.2.0/pidgin/plugins/mailchk.c
--- pidgin-2.1.1/pidgin/plugins/mailchk.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/mailchk.c	2007-09-06 00:09:41.000000000 -0400
@@ -118,7 +118,7 @@
 	void *conn_handle = purple_connections_get_handle();
 
 	if (!check_timeout(NULL)) {
-		purple_debug_warning("mailchk", "Could not read $MAIL or /var/spool/mail/$USER");
+		purple_debug_warning("mailchk", "Could not read $MAIL or /var/spool/mail/$USER\n");
 		return FALSE;
 	}
 
diff -ru pidgin-2.1.1/pidgin/plugins/Makefile.am pidgin-2.2.0/pidgin/plugins/Makefile.am
--- pidgin-2.1.1/pidgin/plugins/Makefile.am	2007-08-20 14:12:59.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/Makefile.am	2007-08-27 22:35:01.000000000 -0400
@@ -16,9 +16,13 @@
 PERL_DIR = perl
 endif
 
+if ENABLE_GESTURES
+GESTURE_DIR = gestures
+endif
+
 SUBDIRS = \
 	$(CAP_DIR) \
-	gestures \
+	$(GESTURE_DIR) \
 	$(GEVOLUTION_DIR) \
 	$(MUSICMESSAGING_DIR) \
 	$(PERL_DIR) \
diff -ru pidgin-2.1.1/pidgin/plugins/Makefile.in pidgin-2.2.0/pidgin/plugins/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/Makefile.in	2007-08-20 14:14:10.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/Makefile.in	2007-09-14 03:31:36.000000000 -0400
@@ -225,6 +225,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -253,6 +255,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -308,14 +312,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -327,7 +329,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -388,6 +389,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -408,6 +410,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -525,9 +529,10 @@
 @ENABLE_DBUS_TRUE@MUSICMESSAGING_DIR = musicmessaging
 @ENABLE_CAP_TRUE@CAP_DIR = cap
 @USE_PERL_TRUE@PERL_DIR = perl
+@ENABLE_GESTURES_TRUE@GESTURE_DIR = gestures
 SUBDIRS = \
 	$(CAP_DIR) \
-	gestures \
+	$(GESTURE_DIR) \
 	$(GEVOLUTION_DIR) \
 	$(MUSICMESSAGING_DIR) \
 	$(PERL_DIR) \
diff -ru pidgin-2.1.1/pidgin/plugins/markerline.c pidgin-2.2.0/pidgin/plugins/markerline.c
--- pidgin-2.1.1/pidgin/plugins/markerline.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/markerline.c	2007-09-14 00:45:41.000000000 -0400
@@ -14,8 +14,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 #include "internal.h"
 
diff -ru pidgin-2.1.1/pidgin/plugins/musicmessaging/Makefile.in pidgin-2.2.0/pidgin/plugins/musicmessaging/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/musicmessaging/Makefile.in	2007-08-20 14:14:11.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/musicmessaging/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -136,6 +136,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -164,6 +166,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -219,14 +223,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -238,7 +240,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -299,6 +300,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -319,6 +321,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/musicmessaging/musicmessaging.c pidgin-2.2.0/pidgin/plugins/musicmessaging/musicmessaging.c
--- pidgin-2.1.1/pidgin/plugins/musicmessaging/musicmessaging.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/musicmessaging/musicmessaging.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #include "internal.h"
@@ -71,10 +71,10 @@
 
 /* Globals */
 /* List of sessions */
-GList *conversations;
+static GList *conversations;
 
 /* Pointer to this plugin */
-PurplePlugin *plugin_pointer;
+static PurplePlugin *plugin_pointer;
 
 /* Define types needed for DBus */
 DBusGConnection *connection;
@@ -113,7 +113,7 @@
 			
 			purple_conv_im_send(PURPLE_CONV_IM(mmconv->conv), to_send->str);
 			
-			purple_debug_misc("Sent request: %s\n", to_send->str);
+			purple_debug_misc("musicmessaging", "Sent request: %s\n", to_send->str);
 		}
 	}
 			
@@ -311,7 +311,9 @@
 static gboolean
 intercept_sent(PurpleAccount *account, const char *who, char **message, void* pData)
 {
-	
+	if (message == NULL || *message == NULL || **message == '\0')
+		return FALSE;
+
 	if (0 == strncmp(*message, MUSICMESSAGING_PREFIX, strlen(MUSICMESSAGING_PREFIX)))
 	{
 		purple_debug_misc("purple-musicmessaging", "Sent MM Message: %s\n", *message);
@@ -350,7 +352,16 @@
 static gboolean
 intercept_received(PurpleAccount *account, char **sender, char **message, PurpleConversation *conv, int *flags)
 {
-	MMConversation *mmconv = mmconv_from_conv(conv);
+	MMConversation *mmconv;
+	
+	if (conv == NULL) {
+		/* XXX: This is just to avoid a crash (#2726).
+		 *      We may want to create the conversation instead of returning from here
+		 */
+		return FALSE;
+	}
+
+	mmconv = mmconv_from_conv(conv);
 	
 	purple_debug_misc("purple-musicmessaging", "Intercepted: %s\n", *message);
 	if (strstr(*message, MUSICMESSAGING_PREFIX))
diff -ru pidgin-2.1.1/pidgin/plugins/notify.c pidgin-2.2.0/pidgin/plugins/notify.c
--- pidgin-2.1.1/pidgin/plugins/notify.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/notify.c	2007-09-14 00:45:41.000000000 -0400
@@ -20,7 +20,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -167,7 +167,7 @@
 	gboolean has_focus;
 	PidginWindow *purplewin = NULL;
 
-	if (conv == NULL)
+	if (conv == NULL || PIDGIN_CONVERSATION(conv) == NULL)
 		return 0;
 
 	/* We want to remove the notifications, but not reset the counter */
@@ -224,6 +224,8 @@
 	PidginWindow *purplewin = NULL;
 
 	g_return_if_fail(conv != NULL);
+	if (PIDGIN_CONVERSATION(conv) == NULL)
+		return;
 
 	purplewin = PIDGIN_CONVERSATION(conv)->win;
 	active_conv = pidgin_conv_window_get_active_conversation(purplewin);
@@ -417,10 +419,14 @@
 deleting_conv(PurpleConversation *conv)
 {
 	PidginWindow *purplewin = NULL;
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+
+	if (gtkconv == NULL)
+		return;
 
 	detach_signals(conv);
 
-	purplewin = PIDGIN_CONVERSATION(conv)->win;
+	purplewin = gtkconv->win;
 
 	handle_urgent(purplewin, FALSE);
 	purple_conversation_set_data(conv, "notify-message-count", GINT_TO_POINTER(0));
diff -ru pidgin-2.1.1/pidgin/plugins/perl/Makefile.in pidgin-2.2.0/pidgin/plugins/perl/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/perl/Makefile.in	2007-08-20 14:14:11.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/perl/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -99,6 +99,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -127,6 +129,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -182,14 +186,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -201,7 +203,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -262,6 +263,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -282,6 +284,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/pidginrc.c pidgin-2.2.0/pidgin/plugins/pidginrc.c
--- pidgin-2.1.1/pidgin/plugins/pidginrc.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/pidginrc.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
diff -ru pidgin-2.1.1/pidgin/plugins/raw.c pidgin-2.2.0/pidgin/plugins/raw.c
--- pidgin-2.1.1/pidgin/plugins/raw.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/raw.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/plugins/relnot.c pidgin-2.2.0/pidgin/plugins/relnot.c
--- pidgin-2.1.1/pidgin/plugins/relnot.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/relnot.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,8 +15,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff -ru pidgin-2.1.1/pidgin/plugins/spellchk.c pidgin-2.2.0/pidgin/plugins/spellchk.c
--- pidgin-2.1.1/pidgin/plugins/spellchk.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/spellchk.c	2007-09-14 00:45:41.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
@@ -667,7 +667,7 @@
 	return;
 }
 
-static int buf_get_line(char *ibuf, char **buf, int *position, int len)
+static int buf_get_line(char *ibuf, char **buf, int *position, gsize len)
 {
 	int pos = *position;
 	int spos = pos;
diff -ru pidgin-2.1.1/pidgin/plugins/ticker/gtkticker.c pidgin-2.2.0/pidgin/plugins/ticker/gtkticker.c
--- pidgin-2.1.1/pidgin/plugins/ticker/gtkticker.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/ticker/gtkticker.c	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/plugins/ticker/gtkticker.h pidgin-2.2.0/pidgin/plugins/ticker/gtkticker.h
--- pidgin-2.1.1/pidgin/plugins/ticker/gtkticker.h	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/ticker/gtkticker.h	2007-09-14 00:45:41.000000000 -0400
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/plugins/ticker/Makefile.in pidgin-2.2.0/pidgin/plugins/ticker/Makefile.in
--- pidgin-2.1.1/pidgin/plugins/ticker/Makefile.in	2007-08-20 14:14:12.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/ticker/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -128,6 +128,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -156,6 +158,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -211,14 +215,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -230,7 +232,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -291,6 +292,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -311,6 +313,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
diff -ru pidgin-2.1.1/pidgin/plugins/ticker/ticker.c pidgin-2.2.0/pidgin/plugins/ticker/ticker.c
--- pidgin-2.1.1/pidgin/plugins/ticker/ticker.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/ticker/ticker.c	2007-09-14 00:45:41.000000000 -0400
@@ -16,8 +16,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02111-1301, USA.
  */
 
 /*
diff -ru pidgin-2.1.1/pidgin/plugins/timestamp.c pidgin-2.2.0/pidgin/plugins/timestamp.c
--- pidgin-2.1.1/pidgin/plugins/timestamp.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/timestamp.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/plugins/win32/transparency/win2ktrans.c pidgin-2.2.0/pidgin/plugins/win32/transparency/win2ktrans.c
--- pidgin-2.1.1/pidgin/plugins/win32/transparency/win2ktrans.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/win32/transparency/win2ktrans.c	2007-09-14 00:45:41.000000000 -0400
@@ -1,23 +1,24 @@
 /*
- * purple - Transparency plugin
+ * Pidgin - Transparency plugin
  *
- * copyright (c) 1998-2002, rob flynn <rob@marko.net>
- * copyright (c) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
- * copyright (c) 2005,      Daniel Atallah <daniel_atallah@yahoo.com>
+ * Copyright (C) 1998-2002, Rob Flynn <rob@marko.net>
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
+ * Copyright (C) 2005,      Daniel Atallah <daniel_atallah@yahoo.com>
  *
- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu general public license as published by
- * the free software foundation; either version 2 of the license, or
- * (at your option) any later version.
+ * 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.
  *
- * 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.
+ * 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., 59 temple place, suite 330, boston, ma  02111-1307  usa
+ * 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
+ * 02111-1301, USA.
  *
  */
 #ifndef _WIN32_WINNT
@@ -396,8 +397,12 @@
 			&& pconv->unseen_state == PIDGIN_UNSEEN_NONE
 			&& pidgin_conv_window_get_gtkconv_count(win) == 1) {
 		GtkWidget *window = win->window;
+		gboolean has_focus;
 
-		set_conv_window_trans(NULL, win);
+		g_object_get(G_OBJECT(window), "has-toplevel-focus", &has_focus, NULL);
+
+		if (!has_focus || !purple_prefs_get_bool(OPT_WINTRANS_IM_ONFOCUS))
+			set_conv_window_trans(NULL, win);
 
 		if (g_signal_handler_find(G_OBJECT(window), G_SIGNAL_MATCH_FUNC,
 				0, 0, NULL, G_CALLBACK(focus_conv_win_cb), NULL) == 0) {
diff -ru pidgin-2.1.1/pidgin/plugins/win32/winprefs/gtkappbar.c pidgin-2.2.0/pidgin/plugins/win32/winprefs/gtkappbar.c
--- pidgin-2.1.1/pidgin/plugins/win32/winprefs/gtkappbar.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/win32/winprefs/gtkappbar.c	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 /*
diff -ru pidgin-2.1.1/pidgin/plugins/win32/winprefs/gtkappbar.h pidgin-2.2.0/pidgin/plugins/win32/winprefs/gtkappbar.h
--- pidgin-2.1.1/pidgin/plugins/win32/winprefs/gtkappbar.h	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/win32/winprefs/gtkappbar.h	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _GTKAPPBAR_H_
diff -ru pidgin-2.1.1/pidgin/plugins/win32/winprefs/winprefs.c pidgin-2.2.0/pidgin/plugins/win32/winprefs/winprefs.c
--- pidgin-2.1.1/pidgin/plugins/win32/winprefs/winprefs.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/win32/winprefs/winprefs.c	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include <gtk/gtk.h>
diff -ru pidgin-2.1.1/pidgin/plugins/xmppconsole.c pidgin-2.2.0/pidgin/plugins/xmppconsole.c
--- pidgin-2.1.1/pidgin/plugins/xmppconsole.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/plugins/xmppconsole.c	2007-09-14 00:45:41.000000000 -0400
@@ -15,7 +15,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/win32/gtkdocklet-win32.c pidgin-2.2.0/pidgin/win32/gtkdocklet-win32.c
--- pidgin-2.1.1/pidgin/win32/gtkdocklet-win32.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/gtkdocklet-win32.c	2007-09-14 00:45:41.000000000 -0400
@@ -18,8 +18,8 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02111-1301, USA.
  */
 
 #include <windows.h>
@@ -450,7 +450,7 @@
 		hicon = pixbuf_to_hicon(pixbuf);
 		g_object_unref(pixbuf);
 	} else
-		purple_debug_error("Unable to load pixbuf for %s.\n", stock);
+		purple_debug_error("docklet", "Unable to load pixbuf for %s.\n", stock);
 
 	return hicon;
 }
diff -ru pidgin-2.1.1/pidgin/win32/gtkwin32dep.c pidgin-2.2.0/pidgin/win32/gtkwin32dep.c
--- pidgin-2.1.1/pidgin/win32/gtkwin32dep.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/gtkwin32dep.c	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #define _WIN32_IE 0x500
diff -ru pidgin-2.1.1/pidgin/win32/gtkwin32dep.h pidgin-2.2.0/pidgin/win32/gtkwin32dep.h
--- pidgin-2.1.1/pidgin/win32/gtkwin32dep.h	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/gtkwin32dep.h	2007-09-14 00:45:41.000000000 -0400
@@ -18,7 +18,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #ifndef _GTKWIN32DEP_H_
 #define _GTKWIN32DEP_H_
diff -ru pidgin-2.1.1/pidgin/win32/nsis/pidgin-installer.nsi pidgin-2.2.0/pidgin/win32/nsis/pidgin-installer.nsi
--- pidgin-2.1.1/pidgin/win32/nsis/pidgin-installer.nsi	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/nsis/pidgin-installer.nsi	2007-09-14 00:45:41.000000000 -0400
@@ -167,6 +167,7 @@
 
   !insertmacro MUI_LANGUAGE "Afrikaans"
   !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Czech"
@@ -206,6 +207,7 @@
 
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "AFRIKAANS"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\afrikaans.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BASQUE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\basque.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CZECH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\czech.nsh"
@@ -503,8 +505,8 @@
     ${If} ${IsNT}
     ${AndIf} ${IsWinNT4}
       Delete "$INSTDIR\plugins\libsilc.dll"
-      Delete "$INSTDIR\silcclient.dll"
-      Delete "$INSTDIR\silc.dll"
+      Delete "$INSTDIR\libsilcclient-1-1-2.dll"
+      Delete "$INSTDIR\libsilc-1-1-2.dll"
     ${EndIf}
 
     SetOutPath "$INSTDIR"
@@ -554,6 +556,10 @@
     Push "msnim"
     Call RegisterURIHandler
   SectionEnd
+  Section /o "myim:" SecURI_MYIM
+    Push "myim"
+    Call RegisterURIHandler
+  SectionEnd
   Section /o "ymsgr:" SecURI_YMSGR
     Push "ymsgr"
     Call RegisterURIHandler
@@ -688,6 +694,12 @@
     DeleteRegValue HKLM "${STARTUP_RUN_KEY}" "Pidgin"
     ; Remove Language preference info (TODO: check if NSIS removes this)
 
+    Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem"
+    Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem"
+    Delete "$INSTDIR\ca-certs\Verisign_Class3_Extended_Validation_CA.pem"
+    Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
+    Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
+    RMDir "$INSTDIR\ca-certs"
     RMDir /r "$INSTDIR\locale"
     RMDir /r "$INSTDIR\pixmaps"
     RMDir /r "$INSTDIR\perlmod"
@@ -695,7 +707,7 @@
     Delete "$INSTDIR\plugins\buddynote.dll"
     Delete "$INSTDIR\plugins\convcolors.dll"
     Delete "$INSTDIR\plugins\extplacement.dll"
-    Delete "$INSTDIR\plugins\pidginrc.dll"
+    Delete "$INSTDIR\plugins\gtkbuddynote.dll"
     Delete "$INSTDIR\plugins\history.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
@@ -706,6 +718,7 @@
     Delete "$INSTDIR\plugins\libicq.dll"
     Delete "$INSTDIR\plugins\libirc.dll"
     Delete "$INSTDIR\plugins\libmsn.dll"
+    Delete "$INSTDIR\plugins\libmyspace.dll"
     Delete "$INSTDIR\plugins\libnapster.dll"
     Delete "$INSTDIR\plugins\libnovell.dll"
     Delete "$INSTDIR\plugins\libqq.dll"
@@ -721,6 +734,7 @@
     Delete "$INSTDIR\plugins\notify.dll"
     Delete "$INSTDIR\plugins\offlinemsg.dll"
     Delete "$INSTDIR\plugins\perl.dll"
+    Delete "$INSTDIR\plugins\pidginrc.dll"
     Delete "$INSTDIR\plugins\psychic.dll"
     Delete "$INSTDIR\plugins\relnot.dll"
     Delete "$INSTDIR\plugins\spellchk.dll"
@@ -734,12 +748,12 @@
     Delete "$INSTDIR\plugins\win2ktrans.dll"
     Delete "$INSTDIR\plugins\winprefs.dll"
     RMDir "$INSTDIR\plugins"
-    Delete "$INSTDIR\sounds\pidgin\alert.wav"
-    Delete "$INSTDIR\sounds\pidgin\login.wav"
-    Delete "$INSTDIR\sounds\pidgin\logout.wav"
-    Delete "$INSTDIR\sounds\pidgin\receive.wav"
-    Delete "$INSTDIR\sounds\pidgin\send.wav"
-    RMDir "$INSTDIR\sounds\pidgin"
+    Delete "$INSTDIR\sounds\purple\alert.wav"
+    Delete "$INSTDIR\sounds\purple\login.wav"
+    Delete "$INSTDIR\sounds\purple\logout.wav"
+    Delete "$INSTDIR\sounds\purple\receive.wav"
+    Delete "$INSTDIR\sounds\purple\send.wav"
+    RMDir "$INSTDIR\sounds\purple"
     RMDir "$INSTDIR\sounds"
     Delete "$INSTDIR\freebl3.dll"
     Delete "$INSTDIR\idletrack.dll"
@@ -756,8 +770,9 @@
     Delete "$INSTDIR\pidgin.dll"
     Delete "$INSTDIR\plc4.dll"
     Delete "$INSTDIR\plds4.dll"
-    Delete "$INSTDIR\silc.dll"
-    Delete "$INSTDIR\silcclient.dll"
+    Delete "$INSTDIR\libsilc-1-1-2.dll"
+    Delete "$INSTDIR\libsilcclient-1-1-2.dll"
+    Delete "$INSTDIR\smime3.dll"
     Delete "$INSTDIR\softokn3.dll"
     Delete "$INSTDIR\ssl3.dll"
     Delete "$INSTDIR\${PIDGIN_UNINST_EXE}"
Only in pidgin-2.2.0/pidgin/win32/nsis/translations: basque.nsh
diff -ru pidgin-2.1.1/pidgin/win32/winpidgin.c pidgin-2.2.0/pidgin/win32/winpidgin.c
--- pidgin-2.1.1/pidgin/win32/winpidgin.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/winpidgin.c	2007-09-14 00:45:41.000000000 -0400
@@ -21,7 +21,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 
diff -ru pidgin-2.1.1/pidgin/win32/wspell.c pidgin-2.2.0/pidgin/win32/wspell.c
--- pidgin-2.1.1/pidgin/win32/wspell.c	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/wspell.c	2007-09-14 00:45:41.000000000 -0400
@@ -19,7 +19,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #include <windows.h>
diff -ru pidgin-2.1.1/pidgin/win32/wspell.h pidgin-2.2.0/pidgin/win32/wspell.h
--- pidgin-2.1.1/pidgin/win32/wspell.h	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/pidgin/win32/wspell.h	2007-09-14 00:45:41.000000000 -0400
@@ -17,7 +17,7 @@
  *
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
 #ifndef _WSPELL_H_
diff -ru pidgin-2.1.1/pidgin.spec pidgin-2.2.0/pidgin.spec
--- pidgin-2.1.1/pidgin.spec	2007-08-20 14:14:57.000000000 -0400
+++ pidgin-2.2.0/pidgin.spec	2007-09-14 04:43:46.000000000 -0400
@@ -9,9 +9,9 @@
 #define beta 7
 
 %if 0%{?beta}
-%define pidginver %(echo "2.1.1"|sed -e 's/dev.*//; s/beta.*//')
+%define pidginver %(echo "2.2.0"|sed -e 's/dev.*//; s/beta.*//')
 %else
-%define pidginver 2.1.1
+%define pidginver 2.2.0
 %endif
 
 Summary:    A GTK+ based multiprotocol instant messaging client
@@ -21,7 +21,7 @@
 License:    GPL
 Group:      Applications/Internet
 URL:        http://pidgin.im/
-Source:     %{name}-2.1.1.tar.bz2
+Source:     %{name}-2.2.0.tar.bz2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
@@ -207,7 +207,7 @@
 %endif
 
 %prep
-%setup -q -n %{name}-2.1.1
+%setup -q -n %{name}-2.2.0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
diff -ru pidgin-2.1.1/po/af.po pidgin-2.2.0/po/af.po
--- pidgin-2.1.1/po/af.po	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/af.po	2007-09-14 00:45:41.000000000 -0400
@@ -11331,7 +11331,7 @@
 msgstr "Aktiveer watter ID?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Sluit wie by geselsie aan?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/am.po pidgin-2.2.0/po/am.po
--- pidgin-2.1.1/po/am.po	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/am.po	2007-09-14 00:45:41.000000000 -0400
@@ -10501,7 +10501,7 @@
 
 #: src/protocols/yahoo/yahoo.c:2972
 #, fuzzy
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "ውሪን አገጣጥም"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/ar.po pidgin-2.2.0/po/ar.po
--- pidgin-2.1.1/po/ar.po	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/ar.po	2007-09-14 00:45:41.000000000 -0400
@@ -13172,7 +13172,7 @@
 msgstr "وضعية رقم الانترنت النشطة"
 
 #: ../src/protocols/yahoo/yahoo.c:3094
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3104
diff -ru pidgin-2.1.1/po/az.po pidgin-2.2.0/po/az.po
--- pidgin-2.1.1/po/az.po	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/az.po	2007-09-14 00:45:41.000000000 -0400
@@ -10340,7 +10340,7 @@
 msgstr "Hansı ID fəallaşdırılsın?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Söhbəttə kimə qoşulsun?"
 
 #: src/protocols/yahoo/yahoo.c:2982
Only in pidgin-2.2.0/po: be@latin.po
diff -ru pidgin-2.1.1/po/bg.po pidgin-2.2.0/po/bg.po
--- pidgin-2.1.1/po/bg.po	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/bg.po	2007-09-14 00:45:41.000000000 -0400
@@ -14520,7 +14520,7 @@
 msgstr "Активиране на коя идентификация?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Присъединяване към кого в чата?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/bn.po pidgin-2.2.0/po/bn.po
--- pidgin-2.1.1/po/bn.po	2007-08-20 14:13:01.000000000 -0400
+++ pidgin-2.2.0/po/bn.po	2007-09-14 00:45:41.000000000 -0400
@@ -14284,7 +14284,7 @@
 msgstr "কোন আইডি সক্রিয় করা হবে?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "কার সাথে আড্ডা?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/bs.po pidgin-2.2.0/po/bs.po
--- pidgin-2.1.1/po/bs.po	2007-08-20 14:13:01.000000000 -0400
+++ pidgin-2.2.0/po/bs.po	2007-09-14 00:45:41.000000000 -0400
@@ -10646,7 +10646,7 @@
 msgstr "Aktivirati koji ID?"
 
 #: src/protocols/yahoo/yahoo.c:2947
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Kome se želite pridružiti na chat?"
 
 #: src/protocols/yahoo/yahoo.c:2957
diff -ru pidgin-2.1.1/po/ca.po pidgin-2.2.0/po/ca.po
--- pidgin-2.1.1/po/ca.po	2007-08-20 14:13:01.000000000 -0400
+++ pidgin-2.2.0/po/ca.po	2007-09-14 00:45:41.000000000 -0400
@@ -10594,7 +10594,7 @@
 msgstr "Quin ID voleu activar?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3234
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "A qui us voleu unir al xat?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3244
diff -ru pidgin-2.1.1/po/ca@valencia.po pidgin-2.2.0/po/ca@valencia.po
--- pidgin-2.1.1/po/ca@valencia.po	2007-08-20 14:13:01.000000000 -0400
+++ pidgin-2.2.0/po/ca@valencia.po	2007-09-14 00:45:41.000000000 -0400
@@ -11263,7 +11263,7 @@
 msgstr "Quin ID voleu activar?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "A qui vos voleu unir al xat?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3268
diff -ru pidgin-2.1.1/po/ChangeLog pidgin-2.2.0/po/ChangeLog
--- pidgin-2.1.1/po/ChangeLog	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/ChangeLog	2007-09-14 00:45:41.000000000 -0400
@@ -1,5 +1,25 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.2.0
+	* Basque win32 translation added (Mikel Pascual Aldabaldetreku)
+	* Belarusian Latin translation added (Ihar Hrachyshka)
+	* Czech translation updated (Miloslav Trmac)
+	* English (British) translation updated (Luke Ross)
+	* Estonian translation updated (Ivar Smolin)
+	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
+	* German translation updated (Bjoern Voigt)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Italian translation updated (Claudio Satriano)
+	* Macedonian translation updated (Арангел Ангов)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Portuguese (Brazilian) translation updated (Mauricio de
+	  L R Collares Neto)
+	* Slovak translation updated (loptosko)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernandez-Sanguino Peña)
+	* Turkish Translation updated (Serdar Soytetir)
+
 version 2.1.1
 	* Afrikaans translation added (Friedel Wolff)
 	* Estonian translation updated (Ivar Smolin)
diff -ru pidgin-2.1.1/po/cs.po pidgin-2.2.0/po/cs.po
--- pidgin-2.1.1/po/cs.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/cs.po	2007-09-14 00:45:41.000000000 -0400
@@ -1,5846 +1,6864 @@
-# Gaim Czech translation
+# Czech translation of Pidgin
 # Copyright (C) 2002, Honza Král <hkral@centrum.cz>
-# Copyright (C) 2003, 2004, 2005 Miloslav Trmac <mitr@volny.cz>
+# Copyright (C) 2003, 2004, 2005, 2007 Miloslav Trmac <mitr@volny.cz>
 #
-# This file is distributed under the same license as the Gaim package.
+# This file is distributed under the same license as the Pidgin package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim VERSION\n"
+"Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-07 00:01-0500\n"
-"PO-Revision-Date: 2006-03-08 16:45+0100\n"
+"POT-Creation-Date: 2007-09-10 03:22-0400\n"
+"PO-Revision-Date: 2007-09-10 23:53+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim Internet Messenger"
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
+msgid "Finch"
+msgstr "Finch"
 
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Internet Messenger"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Posílat instant message různými protokoly"
+#: ../finch/finch.c:206
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Pro více informací zkuste `%s -h'.\n"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr "Test šifer"
+#: ../finch/finch.c:208
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Použití: %s [PŘEPÍNAČ]...\n"
+"\n"
+"  -c, --config=ADRESÁŘ používat ADRESÁŘ pro soubory s nastavením\n"
+"  -d, --debug          vypisovat ladicí zprávy na stdout\n"
+"  -h, --help           zobrazit tuto nápovědu a skončit\n"
+"  -n, --nologin        nepřihlašovat se automaticky\n"
+"  -v, --version        zobrazit aktuální verzi a skončit\n"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Testuje šifry dodávané s gaim."
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr "V %s došlo při migraci vašeho nastavení z %s do %s k chybě. Prozkoumejte to prosím, a dokončete migraci ručně. Ohlaste prosím tuto chybu na http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1218
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
+msgid "Error"
+msgstr "Chyba"
 
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Kamarád je nečinný"
+#: ../finch/gntaccount.c:123
+msgid "Account was not added"
+msgstr "Účet nebyl přidán"
+
+#: ../finch/gntaccount.c:124
+msgid "Screenname of an account must be non-empty."
+msgstr "Jméno uživatele účtu nesmí být prázdné."
 
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Kamarád je pryč"
+#: ../finch/gntaccount.c:436
+msgid "New mail notifications"
+msgstr "Upozornění na nové zprávy"
 
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Kamarád je pryč \"na dlouho\""
+#: ../finch/gntaccount.c:446
+msgid "Remember password"
+msgstr "Zapamatovat si heslo"
 
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Kamarád je mobilní"
+#: ../finch/gntaccount.c:484
+msgid "There's no protocol plugins installed."
+msgstr "Nejní nainstalován žádný zásuvný modul protokolu."
+
+#: ../finch/gntaccount.c:485
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Pravděpodobně jste zapomněli 'make install'.)"
 
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Kamarád je odpojen"
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
+msgid "Modify Account"
+msgstr "Změnit účet"
 
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Hodnoty bodů, které používat, když..."
+#: ../finch/gntaccount.c:495
+msgid "New Account"
+msgstr "Nový účet"
 
-#: ../plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr "Kamarád s <i>největším skóre</i> bude mít v kontaktu prioritu.\n"
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokol:"
 
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Používat posledního kamaráda, když jsou si skóre rovna."
+#: ../finch/gntaccount.c:528
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Screen name:"
+msgstr "Jméno uživatele:"
 
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Hodnoty bodů, které používat pro účet..."
+#: ../finch/gntaccount.c:541
+msgid "Password:"
+msgstr "Heslo:"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Priorita kontaktu"
+#: ../finch/gntaccount.c:551
+msgid "Alias:"
+msgstr "Alias:"
 
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "Umožňuje ovládání hodnot přiřazených s různými stavy kamarádů."
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
+#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330 ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:411
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:757 ../pidgin/gtkdialogs.c:896
+#: ../pidgin/gtkdialogs.c:988 ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1102 ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1199 ../pidgin/gtkdialogs.c:1238
+#: ../pidgin/gtkdialogs.c:1265 ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1573
+msgid "Cancel"
+msgstr "Zrušit"
 
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Umožňuje změnu hodnot bodů stavů nečinný/pryč/odpojen kamarádů při výpočtech "
-"priority kontaktů."
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1054 ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Uložit"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Opravdu chcete odstranit %s?"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "Zásuvný modul pro vytvoření sezení Crazychat."
+#: ../finch/gntaccount.c:634
+msgid "Delete Account"
+msgstr "Odstranit účet"
+
+#. Delete button
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
+msgid "Delete"
+msgstr "Odstranit"
 
-#. *  description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr "Používá Gaim pro získání ip kamarádů pro připojení k sezení Crazychat"
-
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "Nastavení sítě"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "Port TCP"
-
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "Port UDP"
-
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "Kalibrace funkcí"
-
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
-msgid "Enabled"
-msgstr "Povoleno"
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+msgid "Accounts"
+msgstr "Účty"
 
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "Zakázáno"
+#: ../finch/gntaccount.c:674
+msgid "You can enable/disable accounts from the following list."
+msgstr "Můžete povolit/zakázat účty z následujícího seznamu."
+
+#. Add button
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Přidat"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:135
-msgid "DBus"
-msgstr "DBus"
+#. Modify button
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
+msgid "Modify"
+msgstr "Změnit"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
-msgid "DBus Plugin Example"
-msgstr "Příklad zásuvného modulu DBus"
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s udělali %s svým kamarádem%s%s"
 
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "Pro více nepřečtených zpráv klikněte pravým tlačítkem...\n"
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
+msgid "Add buddy to your list?"
+msgstr "Přidat kamaráda do vašeho seznamu?"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d nepřečtená zpráva od %s\n"
-msgstr[1] "%d nepřečtené zprávy od %s\n"
-msgstr[2] "%d nepřečtených zpráv od %s\n"
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s chce přidat %s do svého seznamu kamarádů%s%s"
 
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "Změnit stav"
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
+msgid "Authorize buddy?"
+msgstr "Autorizovat kamaráda?"
 
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
-msgid "Available"
-msgstr "Přítomen"
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+msgid "Authorize"
+msgstr "Autorizovat"
 
-#. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
-#: ../src/status.c:158
-msgid "Away"
-msgstr "Pryč"
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+msgid "Deny"
+msgstr "Zamítnout"
 
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "Neviditelný"
+#: ../finch/gntblist.c:288
+msgid "You must provide a screename for the buddy."
+msgstr "Musíte pro kamaráda zadat jméno uživatele."
+
+#: ../finch/gntblist.c:290
+msgid "You must provide a group."
+msgstr "Musíte zadat skupinu."
+
+#: ../finch/gntblist.c:292
+msgid "You must select an account."
+msgstr "Musíte zvolit účet."
+
+#: ../finch/gntblist.c:294
+msgid "The selected account is not online."
+msgstr "Zvolený účet není připojen."
+
+#: ../finch/gntblist.c:299
+msgid "Error adding buddy"
+msgstr "Chyba při přidávání kamaráda"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "Odpojen"
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
+msgid "Screen Name"
+msgstr "Jméno uživatele"
 
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "Nový..."
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1401
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Alias"
 
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "Uloženo..."
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
+msgid "Group"
+msgstr "Skupina"
+
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
+msgid "Account"
+msgstr "Účet"
 
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "Zobrazit seznam kamarádů"
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5477
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+msgid "Add Buddy"
+msgstr "Přidat kamaráda"
 
-#: ../plugins/docklet/docklet.c:489
-msgid "Unread Messages"
-msgstr "Nepřečtené zprávy"
+#: ../finch/gntblist.c:340
+msgid "Please enter buddy information."
+msgstr "Zadejte prosím informace o kamarádovi."
 
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "Nová zpráva.."
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
+msgid "Chats"
+msgstr "Chaty"
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
-msgid "Accounts"
-msgstr "Účty"
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590 ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:617
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Název"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
-msgid "Plugins"
-msgstr "Zásuvné moduly"
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Automatické přihlašování"
 
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
-msgid "Preferences"
-msgstr "Nastavení"
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
+msgid "Add Chat"
+msgstr "Přidat chat"
 
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "Umlčet zvuky"
+#: ../finch/gntblist.c:419
+msgid "You can edit more information from the context menu later."
+msgstr "Více informací můžete upravit později z kontextového menu."
+
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
+msgid "Error adding group"
+msgstr "Chyba při přidávání skupiny"
+
+#: ../finch/gntblist.c:433
+msgid "You must give a name for the group to add."
+msgstr "Musíte zaddat název skupiny, kterou přidat."
+
+#: ../finch/gntblist.c:446
+msgid "A group with the name already exists."
+msgstr "Skupina s tímto názvem již existuje."
+
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
+msgid "Add Group"
+msgstr "Přidat skupinu"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "Konec"
+#: ../finch/gntblist.c:453
+msgid "Enter the name of the group"
+msgstr "Zadejte název skupiny"
+
+#: ../finch/gntblist.c:801
+msgid "Edit Chat"
+msgstr "Upravit chat"
+
+#: ../finch/gntblist.c:801
+msgid "Please Update the necessary fields."
+msgstr "Aktualizujte prosím potřebná pole."
+
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
+msgid "Edit"
+msgstr "Upravit"
+
+#: ../finch/gntblist.c:827
+msgid "Edit Settings"
+msgstr "Upravit nastavení"
+
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+msgid "Information"
+msgstr "Informace"
+
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+msgid "Retrieving..."
+msgstr "Stahuji..."
+
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
+msgid "Get Info"
+msgstr "Info"
 
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "Blikat ikonou v oznamovací oblasti pro nepřečtené..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "_Instant Message:"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Nikdy"
+#: ../finch/gntblist.c:907
+msgid "Add Buddy Pounce"
+msgstr "Přidat sledování kamaráda"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
+msgid "Send File"
+msgstr "Odeslat soubor"
 
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "Ve skrytých konverzacích"
-
-#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "Vždy"
+#: ../finch/gntblist.c:918
+msgid "View Log"
+msgstr "Zobrazit záznam"
 
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "Zprávy _chatu:"
+#: ../finch/gntblist.c:999
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Zadejte prosím nový název pro %s"
 
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "Když je vyslovena má přezdívka"
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
+msgid "Rename"
+msgstr "Přejmenovat"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "Ikona v panelu"
+#: ../finch/gntblist.c:1001
+msgid "Set Alias"
+msgstr "Nastavit alias"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Zobrazuje ikonu Gaim v oznamovací oblasti."
+#: ../finch/gntblist.c:1002
+msgid "Enter empty string to reset the name."
+msgstr "Vynulujte jméno zadáním prázdného řetězce."
 
-#. *  description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr "Zobrazuje ikonu v oznamovací oblasti (např. v GNOME, KDE nebo Windows) pro zobrazení aktuálního stavu Gaim, umožnění rychlého přístupu k často používaným funkcím a přepnutí zobrazování seznamu kamarádů. Také poskytuje možnosti blikat při nepřečtených zprávách."
+#: ../finch/gntblist.c:1078
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Odstranění tohoto kontaktu také odstraní všechny kamarády v kontaktu"
 
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "Orientace"
+#: ../finch/gntblist.c:1086
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Odstranění této skupiny také odstraní všechny kamarády ve skupině"
 
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "Orientace oznamovací oblasti."
+#: ../finch/gntblist.c:1091
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Opravdu chcete odstranit %s?"
 
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Podle počtu konverzací"
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1094
+msgid "Confirm Remove"
+msgstr "Potvrdit ostranění"
+
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
+msgid "Remove"
+msgstr "Odstranit"
 
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Umísťování konverzací"
+#. Buddy List
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
+msgid "Buddy List"
+msgstr "Seznam kamarádů"
 
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Počet konverzací v okně"
+#: ../finch/gntblist.c:1256
+#, fuzzy
+msgid "Place tagged"
+msgstr "Místo uzavřeno"
 
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Oddělovat okna IM a chatů při umísťování podle čísla"
+#: ../finch/gntblist.c:1261
+msgid "Toggle Tag"
+msgstr ""
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "DalUmístění"
+#. General
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409 ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
+msgid "Nickname"
+msgstr "Přezdívka"
 
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Další možnosti umísťování konverzací"
+#. Idle stuff
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:553 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
+msgid "Idle"
+msgstr "Nečinný"
 
-#. *< summary
-#. *  description
-#: ../plugins/extplacement.c:139
+#: ../finch/gntblist.c:1333
+#, fuzzy
+msgid "On Mobile"
+msgstr "Na mobilu"
+
+#: ../finch/gntblist.c:1414
+#, c-format
 msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "Omezit počet konverzací v okně, volitelně s oddělením IM a chatů"
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Připojeno: %d\n"
+"Celkem: %d"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Ovládání Gaim souborem"
+#: ../finch/gntblist.c:1423
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Účet: %s (%s)"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Umožňuje vám ovládat Gaim zadáváním příkazů v souboru."
+#: ../finch/gntblist.c:1435
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr "\nNaposledy spatřen: před %s"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Ukázkový zásuvný modul Gaim"
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
+msgid "New..."
+msgstr "Nový..."
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Ukázkový zásuvný modul, který něco dělá - viz popis."
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "Saved..."
+msgstr "Uloženo..."
 
-#. *  description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Toto je opravdu skvělý zásuvný modul, který dělá spoustu věcí:\n"
-"- Říká vám, kdo napsal program, když se přihlásíte\n"
-"- Obrací všechen příchozí text\n"
-"- Odešle zprávu lidem ve vašem seznamu okamžitě, když se přihlásí"
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+msgid "Plugins"
+msgstr "Zásuvné moduly"
 
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Barva kurzoru"
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
+msgid "_Name"
+msgstr "_Název"
 
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Sekundární barva kurzoru"
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
+msgid "_Account"
+msgstr "_Účet"
 
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Barva odkazu"
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
+msgid "New Instant Message"
+msgstr "Nová Instant Message"
 
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Velikost rozbalovače GtkTreeView"
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "Zadejte prosím jméno uživatele nebo alias osoby, kterou chcete IM."
 
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "Vodorovné oddělení GtkTreeView"
+#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1374
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:295 ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329 ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:756 ../pidgin/gtkdialogs.c:895
+#: ../pidgin/gtkdialogs.c:987 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "OK"
 
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Pole konverzace"
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
+msgid "Options"
+msgstr "Možnosti"
 
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Historie konverzace"
+#: ../finch/gntblist.c:2246
+msgid "Send IM..."
+msgstr "Poslat IM..."
 
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Prohlížeč záznamů"
+#: ../finch/gntblist.c:2250
+msgid "Show empty groups"
+msgstr "Zobrazovat prázdné skupiny"
 
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Dialog požadavku"
+#: ../finch/gntblist.c:2256
+msgid "Show offline buddies"
+msgstr "Zobrazovat odpojené kamarády"
 
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Dialog upozornění"
+#: ../finch/gntblist.c:2262
+msgid "Sort by status"
+msgstr "Řadit podle stavu"
 
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Odsadit rozbalovače GtkTreeView"
+#: ../finch/gntblist.c:2266
+msgid "Sort alphabetically"
+msgstr "Řadit podle abecedy"
 
-#: ../plugins/gaimrc.c:287
+#: ../finch/gntblist.c:2270
+msgid "Sort by log size"
+msgstr "Řadit podle velikosti záznamu"
+
+#: ../finch/gntconn.c:110
 #, c-format
-msgid "Select Color for %s"
-msgstr "Vyberte barvu pro %s"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "Vyberte barvu"
+#: ../finch/gntconn.c:113
+#, c-format
+msgid "%s disconnected."
+msgstr "%s odpojen"
 
-#: ../plugins/gaimrc.c:324
+#: ../finch/gntconn.c:114
 #, c-format
-msgid "Select Font for %s"
-msgstr "Vyberte písmo pro %s"
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch se nepokusí znovu připojit k účtu, dokud chybu neopravíte a účet znovu nepovolíte."
 
-#: ../plugins/gaimrc.c:362
-msgid "Select Interface Font"
-msgstr "Vyberte písmo rozhraní"
+#: ../finch/gntconv.c:119
+msgid "No such command."
+msgstr "Takový příkaz neexistuje"
 
-#: ../plugins/gaimrc.c:415
-msgid "General"
-msgstr "Obecné"
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Chyba syntaxe: Zadali jste špatný počet parametrů příkazu."
 
-#: ../plugins/gaimrc.c:420
-msgid "GTK+ Interface Font"
-msgstr "Písmo rozhraní GTK+"
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
+msgid "Your command failed for an unknown reason."
+msgstr "Váš příkaz selhal z neznámého důvodu."
 
-#: ../plugins/gaimrc.c:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr "Téma GTK+ textu odkazu"
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
+msgid "That command only works in chats, not IMs."
+msgstr "Tento příkaz funguje jen v chatech, ne v IM."
 
-#: ../plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "Barvy rozhraní"
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
+msgid "That command only works in IMs, not chats."
+msgstr "Tento příkaz funguje jen v IM, ne v chatech."
 
-#: ../plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr "Velikosti widgetů"
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
+msgid "That command doesn't work on this protocol."
+msgstr "Tento příkaz nefunguje s tímto protokolem."
 
-#: ../plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "Písma"
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Zpráva nebyla odeslána, protože nejste přihlášeni."
 
-#: ../plugins/gaimrc.c:543
-msgid "Tools"
-msgstr "Nástroje"
+#: ../finch/gntconv.c:231
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
 
-#: ../plugins/gaimrc.c:548
+#: ../finch/gntconv.c:254
 #, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Zapsat nastavení do %s%sgtkrc-2.0"
+msgid "%s [%s]"
+msgstr "%s [%s]"
 
-#: ../plugins/gaimrc.c:556
-msgid "Re-read gtkrc files"
-msgstr "Znovu načíst soubory gtkrc"
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr "\n%s píše..."
 
-#: ../plugins/gaimrc.c:583
-msgid "Gaim GTK+ Theme Control"
-msgstr "Ovládání téma GTK+ Gaimu"
+#: ../finch/gntconv.c:278
+msgid "You have left this chat."
+msgstr "Opustili jste tento chatu."
 
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Poskytuje přístup k často používaným nastavením gtkrc."
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Zaznamenávání spuštěno. Budoucí zprávy v této konverzaci budou zaznamenány."
 
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Nastavení gest myši"
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Zaznamenávání zastaveno. Budoucí zprávy v této konverzaci nebudou "
+"zaznamenány."
 
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Prostřední tlačítko myši"
+#: ../finch/gntconv.c:419
+msgid "Send To"
+msgstr "Odeslat do"
 
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Pravé tlačítko myši"
+#: ../finch/gntconv.c:463
+msgid "Conversation"
+msgstr "Konverzace"
 
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Vizuální zobrazování gest"
+#: ../finch/gntconv.c:469
+msgid "Clear Scrollback"
+msgstr "Vymazat paměť řádků"
+
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
+msgid "Show Timestamps"
+msgstr "Zobrazovat časové značky"
+
+#: ../finch/gntconv.c:489
+msgid "Add Buddy Pounce..."
+msgstr "Přidat sledování kamaráda..."
+
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Povolit zaznamenávání"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Povolit zvuky"
+
+#: ../finch/gntconv.c:713
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-ODPOVĚĎ> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:835
+msgid "List of users:\n"
+msgstr "Seznam uživatelů:\n"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Gesta myši"
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
+msgid "Supported debug options are:  version"
+msgstr "Podporované ladicí přepínače jsou: version"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Poskytuje podporu pro gesta myši"
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
+msgid "No such command (in this context)."
+msgstr "Takový příkaz (v tomto kontextu) neexistuje."
 
-#. *  description
-#: ../plugins/gestures/gestures.c:294
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
 msgstr ""
-"Umožňuje podporu gest myši v oknech konverzace.\n"
-"Táhněte prostředním tlačítkem myši pro provedení určitých akcí:\n"
-"\n"
-"Táhněte dolů a pak doprava pro uzavření konverzace.\n"
-"Táhněte nahoru a pak doleva pro přepnutí na předchozí konverzaci.\n"
-"Táhněte nahoru a pak doprava pro přepnutí na následující konverzaci."
-
-#. Extract their Name and put it in
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
-msgid "Name"
-msgstr "Název"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Instant Messaging"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Vyberte osobu z vašeho adresáře níže nebo přidejte novou osobu."
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
-#: ../src/protocols/sametime/sametime.c:5532
-msgid "Search"
-msgstr "Hledat"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
-msgid "Group:"
-msgstr "Skupina:"
+"Pro nápovědu o konkrétním příkazu použijte \"/help &lt;příkaz&gt;\".\n"
+"V tomto kontextu jsou k dispozici následující příkazy:\n"
 
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
-#: ../plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "Nová osoba"
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;zpráva&gt;: Odeslat zprávu normálně, jako kdybyste nepoužívali "
+"příkaz."
 
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
-msgid "Select Buddy"
-msgstr "Vybrat kamaráda"
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;akce&gt;: Odeslat kamarádovi nebo do chatu akci ve stylu IRC."
 
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
 msgstr ""
-"Vyberte osobu z vašeho adresáře, ke které přidat tohoto kamaráda, nebo "
-"vytvořte novou osobu."
+"debug &lt;přepínač&gt;: Odeslat aktuální konverzaci různé ladicí informace."
 
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "_Podrobnosti o uživateli"
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Vymaže paměť řádků konverzace."
 
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "_Přiřadit kamaráda"
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;příkaz&gt;: Nápověda o konkrétním příkazu."
 
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
-msgid "None"
-msgstr "Žádné"
+#: ../finch/gntconv.c:1109
+msgid "users:  Show the list of users in the chat."
+msgstr "users: Zobrazit seznam uživatelů v chatu."
+
+#: ../finch/gntconv.c:1114
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Zobrazit okno zásuvných modulů."
+
+#: ../finch/gntconv.c:1117
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Zobrazit seznam kamarádů."
+
+#: ../finch/gntconv.c:1120
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Zobrazit okno účtů."
+
+#: ../finch/gntconv.c:1123
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Zobrazit ladicí okno."
+
+#: ../finch/gntconv.c:1126
+msgid "prefs: Show the preference window."
+msgstr "prefs: Zobrazit okno nastavení."
+
+#: ../finch/gntconv.c:1129
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Zobrazit okno uložených stavů."
 
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "Kamarádi"
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
+msgid "Debug Window"
+msgstr "Ladicí okno"
 
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "Nemohu odeslat e-mail"
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
+msgid "Clear"
+msgstr "Vymazat"
 
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "Program evolution nebyl nalezen v PATH."
+#: ../finch/gntdebug.c:261
+msgid "Filter: "
+msgstr "Filtr: "
 
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "Určený kamarád nebyl nalezen v kontaktech Evolution."
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+msgid "Pause"
+msgstr "Pozastavit"
 
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Přidat do adresáře"
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Přenosy souborů - %d%% z %d souborů"
 
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "Odeslat e-mail"
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+msgid "File Transfers"
+msgstr "Přenosy souborů"
 
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Nastavení integrace s Evolution"
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Průběh"
 
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Vyberte všechny účty, ke kterým se mají automaticky přidat kamarádi."
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Název souboru"
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
-msgid "Account"
-msgstr "Účet"
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Velikost"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Integrace s Evolution"
+#: ../finch/gntft.c:200
+msgid "Speed"
+msgstr "Rychlost"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "Poskytuje integraci s Evolution."
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Zbývá"
 
-#: ../plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "Zadejte prosím níže informace o osobě."
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+msgid "Status"
+msgstr "Stav"
 
-#: ../plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Zadejte prosím níže jméno uživatele kamaráda a typ účtu."
+#: ../finch/gntft.c:210
+msgid "Close this window when all transfers finish"
+msgstr "Zavřít toto okno, až všechny přenosy skončí"
+
+#: ../finch/gntft.c:217
+msgid "Clear finished transfers"
+msgstr "Vymazat dokončené přenosy"
+
+#: ../finch/gntft.c:231
+msgid "Stop"
+msgstr "Zastavit"
+
+#. Close button
+#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:412 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Zavřít"
 
-#: ../plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "Typ účtu:"
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+msgid "Waiting for transfer to begin"
+msgstr "Čekám na začátek přenosu..."
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-msgid "Screen name:"
-msgstr "Jméno uživatele:"
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+msgid "Canceled"
+msgstr "Zrušeno"
 
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "Nepovinné informace:"
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
+msgid "Failed"
+msgstr "Selhalo"
 
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
-msgid "Buddy Icon"
-msgstr "Ikona kamaráda"
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "Křestní jméno:"
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Soubor byl uložen jako %s."
 
-#: ../plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "Příjmení:"
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
+msgid "Finished"
+msgstr "Dokončeno"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "E-mail:"
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
+msgid "Transferring"
+msgstr "Přenáším"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "Test signálů GTK"
+#: ../finch/gntnotify.c:164
+msgid "Emails"
+msgstr "E-maily"
+
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
+msgid "You have mail!"
+msgstr "Přišla vám pošta!"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+msgid "Sender"
+msgstr "Odesílatel"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Test pro zjištění, jestli všechny signály ui fungují správně."
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
+msgid "Subject"
+msgstr "Předmět"
 
-#: ../plugins/history.c:120
+#: ../finch/gntnotify.c:200
 #, c-format
-msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Konverzace s %s v %s:</b><br>"
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) má %d novou zprávu."
+msgstr[1] "%s (%s) má %d nové zprávy."
+msgstr[2] "%s (%s) má %d nových zpráv."
 
-#: ../plugins/history.c:147
-msgid "History Plugin Requires Logging"
-msgstr "Zásuvný modul historie vyžaduje zaznamenávání"
-
-#: ../plugins/history.c:148
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-"Zaznamenávání lze povolit z Nástroje -> Nastavení -> Zaznamenávání.\n"
-"\n"
-"Povolení záznamů pro instant message a chaty aktivuje historii pro tytéž typy konverzací."
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
+msgid "New Mail"
+msgstr "Nový e-mail"
 
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "Historie"
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
+#, c-format
+msgid "Info for %s"
+msgstr "Informace pro %s"
 
-#: ../plugins/history.c:190
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Zobrazuje nedávno zaznamenané konverzace v nových konverzacích."
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:909
+msgid "Buddy Information"
+msgstr "Informace o kamarádovi"
 
-#: ../plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"Když je otevřena nová konverzace, tento zásuvný modul vloží poslední "
-"konverzaci do aktuální konverzace."
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
+msgid "Continue"
+msgstr "Pokračovat"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Ikonifikovat při nepřítomnosti"
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620 ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Ikonifikuje seznam kamarádů a vaše konverzace, když jdete pryč."
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
+msgid "IM"
+msgstr "IM"
 
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
-msgid "Minutes"
-msgstr "minut"
+#: ../finch/gntnotify.c:388
+msgid "Join"
+msgstr "Připojit"
 
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
-msgid "I'dle Mak'er"
-msgstr "Tvůrce nečinnosti"
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
+msgid "Invite"
+msgstr "Pozvat"
 
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
-msgid "Set Account Idle Time"
-msgstr "Nastavit čas nečinnosti účtu"
+#: ../finch/gntnotify.c:394
+msgid "(none)"
+msgstr "(žádné)"
+
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+msgid "ERROR"
+msgstr "CHYBA"
+
+#: ../finch/gntplugin.c:74
+msgid "loading plugin failed"
+msgstr "načítání zásuvnéh modulu selhalo"
+
+#: ../finch/gntplugin.c:83
+msgid "unloading plugin failed"
+msgstr "uvolňování zásuvného modulu selhalo"
+
+#: ../finch/gntplugin.c:128
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"Název: %s\n"
+"Verze: %s\n"
+"Popis: %s\n"
+"Autor: %s\n"
+"WWW server: %s\n"
+"Název souboru: %s\n"
+
+#: ../finch/gntplugin.c:186
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Zásuvný modul musí být načten, než jej můžete nastavovat."
+
+#: ../finch/gntplugin.c:234
+msgid "No configuration options for this plugin."
+msgstr "Pro tento zásuvný modul neexistují volby k nastavování."
+
+#: ../finch/gntplugin.c:259
+msgid "You can (un)load plugins from the following list."
+msgstr "Můžete načíst/uvolňit zásuvné moduly z následujícího seznamu."
+
+#: ../finch/gntplugin.c:314
+msgid "Configure Plugin"
+msgstr "Nastavit zásuvný modul"
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
+msgid "Preferences"
+msgstr "Nastavení"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
-msgid "_Set"
-msgstr "_Nastavit"
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
+msgid "Please enter a buddy to pounce."
+msgstr "Zadejte prosím kamaráda, kterého sledovat."
 
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
-msgid "_Cancel"
-msgstr "_Zrušit"
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+msgid "New Buddy Pounce"
+msgstr "Nové sledování kamaráda"
 
-#: ../plugins/idle.c:177
-msgid "None of your accounts are idle."
-msgstr "Žádný váš účet není nečinný."
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+msgid "Edit Buddy Pounce"
+msgstr "Upravit sledování kamaráda"
 
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-msgid "Unset Account Idle Time"
-msgstr "Zrušit čas nečinnosti účtu"
+#: ../finch/gntpounce.c:332
+msgid "Pounce Who"
+msgstr "Sledovat koho"
 
-#: ../plugins/idle.c:196
-msgid "_Unset"
-msgstr "_Zrušit"
+#. Account:
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
+msgid "Account:"
+msgstr "Účet:"
 
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
-msgid "Set Idle Time for All Accounts"
-msgstr "Nastavit čas nečinnosti pro všechny účty"
+#: ../finch/gntpounce.c:357
+msgid "Buddy name:"
+msgstr "Jméno kamaráda:"
 
-#: ../plugins/idle.c:262
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Zrušit čas nečinnosti pro všechny nečinné účty"
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
+msgid "Pounce When Buddy..."
+msgstr "Sledovat když kamarád..."
 
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Umožňuje vám ručně nastavit, jak dlouho jste byli nečinní"
+#: ../finch/gntpounce.c:375
+msgid "Signs on"
+msgstr "Přihlásí se"
+
+#: ../finch/gntpounce.c:376
+msgid "Signs off"
+msgstr "Odhlásí se"
+
+#: ../finch/gntpounce.c:377
+msgid "Goes away"
+msgstr "Jde pryč"
+
+#: ../finch/gntpounce.c:378
+msgid "Returns from away"
+msgstr "Vrátí se z nepřítomnosti"
+
+#: ../finch/gntpounce.c:379
+msgid "Becomes idle"
+msgstr "Stane se nečinným"
+
+#: ../finch/gntpounce.c:380
+msgid "Is no longer idle"
+msgstr "Už není nečinný"
+
+#: ../finch/gntpounce.c:381
+msgid "Starts typing"
+msgstr "Začne psát"
+
+#: ../finch/gntpounce.c:382
+msgid "Pauses while typing"
+msgstr "Zastaví se při psaní"
+
+#: ../finch/gntpounce.c:383
+msgid "Stops typing"
+msgstr "Přestane psát"
+
+#: ../finch/gntpounce.c:384
+msgid "Sends a message"
+msgstr "Odešle zprávu"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "Testovací klient IPC"
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
+msgid "Action"
+msgstr "Akce"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "Test podpory IPC zásuvných modulů jako klient."
+#: ../finch/gntpounce.c:415
+msgid "Open an IM window"
+msgstr "Otevřít okno IM"
+
+#: ../finch/gntpounce.c:416
+msgid "Pop up a notification"
+msgstr "Zobrazit upozornění"
+
+#: ../finch/gntpounce.c:417
+msgid "Send a message"
+msgstr "Odeslat zprávu"
+
+#: ../finch/gntpounce.c:418
+msgid "Execute a command"
+msgstr "Spustit příkaz"
+
+#: ../finch/gntpounce.c:419
+msgid "Play a sound"
+msgstr "Přehrát zvuk"
+
+#: ../finch/gntpounce.c:447
+msgid "Pounce only when my status is not available"
+msgstr "Sledovat, jen když můj stav je nejsem k dispozici"
 
-#. *  description
-#: ../plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr "Test podpory IPC zásuvných modulů jako klient. Nalezne zásuvnhý modul serveru a zavolá zaregistrované příkazy."
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
+msgid "Recurring"
+msgstr "Opakující se"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "Server testu IPC"
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Nemohu vytvořit sledování"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Nemáte žádné účty."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Než budete moci vytvořit sledování, musíte nejdříve vytvořit účet."
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Test podpory IPC zásuvných modulů jako server."
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Opravdu že chcete odstranit sledování %s pro %s?"
 
-#. *  description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Test podpory IPC zásuvných modulů jako server. Zaregistruje příkazy IPC."
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
+msgid "Buddy Pounces"
+msgstr "Sledování kamarádů"
 
-#: ../plugins/log_reader.c:1407
-msgid "User is offline."
-msgstr "Uživatel je odpojen."
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s vám začal psát (%s)"
 
-#: ../plugins/log_reader.c:1413
-msgid "Auto-response sent:"
-msgstr "Automatická odpověď odeslána:"
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s se zastavil, když vám psal (%s)"
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
-msgid "%s has signed off."
-msgstr "%s se odhlásil."
+msgid "%s has signed on (%s)"
+msgstr "%s se přihlásil (%s)"
 
-#: ../plugins/log_reader.c:1440
-msgid "One or more messages may have been undeliverable."
-msgstr "Jedna nebo více zpráv možná nebyla doručitelná."
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s se vrátil z nečinnosti (%s)"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "Byli jste odpojeni od serveru."
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s se vrátil z nepřítomnosti (%s)"
 
-#: ../plugins/log_reader.c:1458
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr "Momentálně jste odpojeni. Zprávy nebudou přijímány, pokud nejste přihlášeni."
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s vám přestal psát (%s)"
 
-#: ../plugins/log_reader.c:1473
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Zprávu nelze odeslat, protože byla překročena maximální délka."
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s se odhlásil (%s)"
 
-#: ../plugins/log_reader.c:1478
-msgid "Message could not be sent."
-msgstr "Zprávu nelze odeslat."
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s se stal nečinným (%s)"
 
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s šel pryč. (%s)"
 
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "Fire"
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s vám poslal zprávu. (%s)"
 
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+msgid "Unknown pounce event. Please report this!"
+msgstr "Neznámá událost sledování. Oznamte to prosím!"
 
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../finch/gntprefs.c:91
+msgid "Based on keyboard use"
+msgstr "Podle používání klávesnice"
 
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
+msgid "From last sent message"
+msgstr "Od naposledy odeslané zprávy"
 
-#. Add general preferences.
-#: ../plugins/log_reader.c:1912
-msgid "General Log Reading Configuration"
-msgstr "Obecné nastavení čtení záznamů"
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
+msgid "Never"
+msgstr "Nikdy"
 
-#: ../plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "Rychlé výpočty velikosti"
+#: ../finch/gntprefs.c:183
+msgid "Show Idle Time"
+msgstr "Zobrazovat čas nečinnosti"
+
+#: ../finch/gntprefs.c:184
+msgid "Show Offline Buddies"
+msgstr "Zobrazovat odpojené kamarády"
+
+#: ../finch/gntprefs.c:191
+msgid "Notify buddies when you are typing"
+msgstr "Upozorňovat kamarády, že jim píšete"
+
+#: ../finch/gntprefs.c:197
+msgid "Log format"
+msgstr "Formát záznamu"
+
+#: ../finch/gntprefs.c:198
+msgid "Log IMs"
+msgstr "Zaznamenávat IM"
+
+#: ../finch/gntprefs.c:199
+msgid "Log chats"
+msgstr "Zaznamenávat chaty"
+
+#: ../finch/gntprefs.c:200
+msgid "Log status change events"
+msgstr "Zaznamenávat události změn stavu"
+
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Hlásit čas nečinnosti"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Změnit stav při nečinnosti"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minuty před změnou stavu"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Změnit stav na"
 
-#: ../plugins/log_reader.c:1920
-msgid "Use name heuristics"
-msgstr "Používat heuristiku pro jména"
+#. Conversations
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Conversations"
+msgstr "Konverzace"
 
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
-msgid "Log Directory"
-msgstr "Adresář záznamů"
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
+msgid "Logging"
+msgstr "Zaznamenávání"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1969
-msgid "Log Reader"
-msgstr "Čtečka záznamů"
+#: ../finch/gntrequest.c:563
+msgid "Not implemented yet."
+msgstr "Zatím neimplementováno."
 
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1973
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Zahrnuje záznamy jiných klientů IM v prohlížeči záznamů."
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
+msgid "Save File..."
+msgstr "Uložit soubor..."
 
-#. * description
-#: ../plugins/log_reader.c:1977
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
-msgstr "Tento zásuvný modul při prohlížení záznamů přidá záznamy z jiných klientů IM. Momentálně se to týká Adium, Fire, Messenger Plus!, MSN Messenger a Trillian."
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
+msgid "Open File..."
+msgstr "Otevřít soubor..."
 
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Kontrola pošty"
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Kamarád se přihlásí"
 
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Kontroluje novou místní poštu."
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Kamarád se odhlásí"
 
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Přidá do seznamu kamarádů malý obdélník, který zobrazuje, jestli máte novou poštu."
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Zpráva přijata"
 
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Načítač zásuvných modulů Mono"
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Přijatá zpráva začíná konverzaci"
 
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "Načítá zásuvné moduly .NET pomocí Mono."
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Zpráva odeslána"
 
-#: ../plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr "Bylo vyžádáno sezení music messaging. Přijměte prosím kliknutím na ikonu MM."
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Osoba vstoupí do chatu"
 
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Sezení music messaging potvrzeno."
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Osoba opustí chat"
 
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "Music Messaging"
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Vy mluvíte v chatu"
 
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "Při spouštění příkazu došlo ke konfliktu:"
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Jiní mluví v chatu"
 
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "Chyba při spouštění editoru"
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Někdo v chatu řekne vaše jméno uživatele"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Selhání GStremaeru"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer se nemohl inicializovat."
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(implicitní)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "Zvolte soubor zvuku ..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "Nastavení zvuku"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "Profily"
 
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "Došlo k následující chybě:"
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "Automatická"
 
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "Nastavení Music Messaging"
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "Pípnutí konzoly"
 
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "Cesta editoru skóre"
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "Příkaz"
 
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "_Použít"
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "Žádný zvuk"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Zásuvný modul music messaging pro spolupráci při skládání."
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "Metoda zvuku"
 
-#. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "Metoda:"
+
+#: ../finch/gntsound.c:972
+#, c-format
 msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr "Zásuvný modul music messaging umožňuje několika uživatelům zároveň pracovat na hudebním díle upravováním společné partitury v reálném čase."
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Příkaz zvuku\n"
+"(%s pro název souboru)"
 
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "Upozorňovat na"
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "Možnosti zvuku"
 
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "Okna _IM"
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "Zvuky, když je konverzace aktivní"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Vždy"
 
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "Okna _chatu"
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "Jen, když jsem k dispozici"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "Jen, když nejsem k dispozici"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "Hlasitost(0-100):"
 
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_Jen když někdo řekne vaši přezdívku"
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "Události zvuků"
 
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "_Aktivní okna"
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "Událost"
 
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "Metody upozornění"
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "Soubor"
 
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "Připojit _řetězec před nadpis okna:"
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "Otestovat"
 
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "Vložit _počet zpráv do nadpisu okna"
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "Vymazat"
 
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Nastavit hint manažera oken \"_URGENT\""
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "Vybrat..."
 
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "Z_výšit okno konverzace"
+#: ../finch/gntstatus.c:137
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "Opravdu chcete odstranit \"%s\"?"
 
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "Odstranění upozornění"
+#: ../finch/gntstatus.c:140
+msgid "Delete Status"
+msgstr "Odstranit stav"
 
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "Odstranit, když se okno konverzace stane _aktivní"
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
+msgid "Saved Statuses"
+msgstr "Uložené stavy"
 
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "Odstranit, když okno konverzace _přijme kliknutí"
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:499
+msgid "Title"
+msgstr "Titul"
 
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "Odstranit při _psaní do okna konverzace"
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
+msgid "Type"
+msgstr "Typ"
 
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "Odstranit, když je _odeslána zpráva"
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
+msgid "Message"
+msgstr "Zpráva"
 
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "Odstranit při přepnutí na zá_ložku konverzace"
+#. Use
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
+msgid "Use"
+msgstr "Použít"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "Upozornění na zprávu"
+#: ../finch/gntstatus.c:300
+msgid "Invalid title"
+msgstr "Neplatný název"
+
+#: ../finch/gntstatus.c:301
+msgid "Please enter a non-empty title for the status."
+msgstr "Zadejte prosím neprázdný název stavu."
+
+#: ../finch/gntstatus.c:309
+msgid "Duplicate title"
+msgstr "Duplikátní název"
+
+#: ../finch/gntstatus.c:310
+msgid "Please enter a different title for the status."
+msgstr "Zadejte prosím pro stav jiný název."
+
+#: ../finch/gntstatus.c:451
+msgid "Substatus"
+msgstr "Podstav"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Poskytuje několik způsobů, jak vás upozornit na nepřečtené zprávy."
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
+msgid "Status:"
+msgstr "Stav:"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Načítač zásuvných modulů Perlu"
+#: ../finch/gntstatus.c:478
+msgid "Message:"
+msgstr "Zpráva:"
+
+#: ../finch/gntstatus.c:527
+msgid "Edit Status"
+msgstr "Upravit stav"
+
+#: ../finch/gntstatus.c:569
+msgid "Use different status for following accounts"
+msgstr "Používat pro následující účty jiný stav"
+
+#. Save & Use
+#: ../finch/gntstatus.c:603
+msgid "Save & Use"
+msgstr "Uložit a použít"
+
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certifikáty"
 
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "Poskytuje podporu pro načítání zásuvných modulů v perlu."
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "Zvuky"
 
-#: ../plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr "Telepatický režim"
+#: ../finch/gntui.c:91
+msgid "Statuses"
+msgstr "Stavy"
 
-#: ../plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
-msgstr "Telepatický režim pro příchozí konverzace"
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Chyba při načítání zásuvného modulu."
 
-#: ../plugins/psychic.c:24
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Způsobí, že okna konverzací se objeví, když vám jiní uživatelé začnou psát zprávu.  Funguje s AIM, ICQ, Jabber, Sametime a Yahoo!"
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Nemohu najít displej X"
 
-#: ../plugins/psychic.c:60
-msgid "You feel a disturbance in the force..."
-msgstr "Cítíte narušení síly..."
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Nemohu najít okno"
 
-#: ../plugins/psychic.c:79
-msgid "Only enable for users on the buddy list"
-msgstr "Povolit jen uživatelům na seznamu kamarádů"
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Tento zásuvný modul nelze načíst, protože nebyl sestaven s podporou X11."
 
-#: ../plugins/psychic.c:84
-msgid "Disable when away"
-msgstr "Zakázat při nepřítomnosti"
+#: ../finch/plugins/gntclipboard.c:158
+msgid "GntClipboard"
+msgstr "GntClipboard"
 
-#: ../plugins/psychic.c:88
-msgid "Display notification message in conversations"
-msgstr "Zobrazovat upozorňující zprávu v konverzacích"
+#: ../finch/plugins/gntclipboard.c:160
+msgid "Clipboard plugin"
+msgstr "Zásuvný modul schránky"
 
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Přímý"
+#: ../finch/plugins/gntclipboard.c:161
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr "Když se změní obsah schránky gnt, obsah je dán k dispozici X, je-li to možné."
 
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "Nechá vás odeslat přímý vstup protokolům založeným na textu."
+#: ../finch/plugins/gntgf.c:231
+#, c-format
+msgid "%s just signed on"
+msgstr "%s se právě přihlásil"
 
-#: ../plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Nechá vás odeslat přímý vstup protokolům založeným na textu (Jabber MSN, "
-"IRC, TOC). Pro odeslání stiskněte 'Enter' ve vstupním poli. Sledujte ladicí "
-"okno."
+#: ../finch/plugins/gntgf.c:238
+#, c-format
+msgid "%s just signed off"
+msgstr "%s se právě odhlásil"
 
-#: ../plugins/relnot.c:63
+#: ../finch/plugins/gntgf.c:246
 #, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Používáte Gaim verze %s. Aktuální verze je %s.<hr>"
+msgid "%s sent you a message"
+msgstr "%s vám poslal zprávu"
 
-#: ../plugins/relnot.c:69
+#: ../finch/plugins/gntgf.c:265
 #, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Seznam změn:</b>\n"
-"%s<br><br>"
+msgid "%s said your nick in %s"
+msgstr "%s řekl vaši přezdívku v %s"
 
-#: ../plugins/relnot.c:74
+#: ../finch/plugins/gntgf.c:267
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Verzi %s můžete získat z<br><a href=\"http://gaim.sourceforge.net/\">http://"
-"gaim.sourceforge.net</a>."
+msgid "%s sent a message in %s"
+msgstr "%s vám poslal zprávu v %s"
 
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "Je k dispozici nová verze"
+#: ../finch/plugins/gntgf.c:305
+msgid "Buddy signs on/off"
+msgstr "Kamarád se přihlásí/odhlásí"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "Upozornění na verzi"
+#: ../finch/plugins/gntgf.c:306
+msgid "You receive an IM"
+msgstr "Dostanete IM"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Pravidelně hledá nové verze."
+#: ../finch/plugins/gntgf.c:307
+msgid "Someone speaks in a chat"
+msgstr "Někdo mluví v chatu"
 
-#. *  description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr "Pravidelně hledá nové verze a upozorní uživatele se seznamem změn.."
+#: ../finch/plugins/gntgf.c:308
+msgid "Someone says your name in a chat"
+msgstr "Někdo v chatu řekne vaše jméno"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "Test signálů"
+#: ../finch/plugins/gntgf.c:336
+msgid "Notify with a toaster when"
+msgstr ""
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "Test pro zjištění, jestli všechny signály fungují správně."
+#: ../finch/plugins/gntgf.c:351
+msgid "Beep too!"
+msgstr "Taky pípnout!"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr "Jednoduchý zásuvný modul"
+#: ../finch/plugins/gntgf.c:357
+msgid "Set URGENT for the terminal window."
+msgstr "Nastavit URGENT pro okno terminálu."
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr "Test pro zjištění, zda většina věcí funguje."
+#: ../finch/plugins/gntgf.c:377
+msgid "GntGf"
+msgstr "GntGf"
 
-#: ../plugins/spellchk.c:1917
-msgid "Duplicate Correction"
-msgstr "Duplikátní oprava"
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+msgid "Toaster plugin"
+msgstr ""
 
-#: ../plugins/spellchk.c:1918
-msgid "The specified word already exists in the correction list."
-msgstr "Zadané slovo již v seznamu oprav existuje."
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>Konverzace s %s v %s:</b><br>"
 
-#: ../plugins/spellchk.c:2127
-msgid "Text Replacements"
-msgstr "Náhrady textu"
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "Zásuvný modul historie vyžaduje zaznamenávání"
 
-#: ../plugins/spellchk.c:2150
-msgid "You type"
-msgstr "Píšete"
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Zaznamenávání lze povolit z Nástroje -> Nastavení -> Zaznamenávání.\n"
+"\n"
+"Povolení záznamů pro instant message a chaty aktivuje historii pro tytéž "
+"typy konverzací."
 
-#: ../plugins/spellchk.c:2164
-msgid "You send"
-msgstr "Odesíláte"
+#: ../finch/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "GntHistory"
 
-#: ../plugins/spellchk.c:2178
-msgid "Whole words only"
-msgstr "Jen celá slova"
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Zobrazuje nedávno zaznamenané konverzace v nových konverzacích."
 
-#: ../plugins/spellchk.c:2190
-msgid "Case sensitive"
-msgstr "Rozlišovat velikost písmen"
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Když je otevřena nová konverzace, tento zásuvný modul vloží poslední "
+"konverzaci do aktuální konverzace."
 
-#: ../plugins/spellchk.c:2216
-msgid "Add a new text replacement"
-msgstr "Přidat novou náhradu textu"
+#: ../finch/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "Poslední záznam"
+
+#: ../finch/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: Hledá podřetězec v záznamu."
+
+#: ../finch/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "GntLastlog"
+
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Zásuvný modul posledního záznamu."
 
-#: ../plugins/spellchk.c:2232
-msgid "You _type:"
-msgstr "_Píšete:"
+#: ../libpurple/account.c:790
+msgid "accounts"
+msgstr "účty"
 
-#: ../plugins/spellchk.c:2249
-msgid "You _send:"
-msgstr "_Odesíláte:"
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
+msgid "Password is required to sign on."
+msgstr "Pro přihlášení je vyžadováno heslo."
 
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Zachovat velikost písmen (zrušte volbu pro automatické zpracovávání velikosti písmen)"
+#: ../libpurple/account.c:963
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Zadejte heslo pro %s (%s)"
 
-#: ../plugins/spellchk.c:2263
-msgid "Only replace _whole words"
-msgstr "Nahrazovat jen _celá slova"
+#: ../libpurple/account.c:970
+msgid "Enter Password"
+msgstr "Zadejte heslo"
 
-#: ../plugins/spellchk.c:2288
-msgid "General Text Replacement Options"
-msgstr "Obecné možnosti náhrady textu"
+#: ../libpurple/account.c:975
+msgid "Save password"
+msgstr "Uložit heslo"
 
-#: ../plugins/spellchk.c:2289
-msgid "Enable replacement of last word on send"
-msgstr "Povolit náhradu posledního slova při odesílání"
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Chybí zásuvný modul protokolu pro %s"
 
-#: ../plugins/spellchk.c:2314
-msgid "Text replacement"
-msgstr "Náhrada textu"
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
+msgid "Connection Error"
+msgstr "Chyba spojení"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Nahrazuje text v odchozích zprávách podle uživatelem definovaných pravidel."
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1325
+msgid "New passwords do not match."
+msgstr "Nová hesla nesouhlasí."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/account.c:1179
+msgid "Fill out all fields completely."
+msgstr "Úplně vyplňte všechna pole."
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
-msgid "Provides SSL support through GNUTLS."
-msgstr "Poskytuje podporu SSL pomocí GNUTLS."
+#: ../libpurple/account.c:1202
+msgid "Original password"
+msgstr "Původní heslo"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/account.c:1209
+msgid "New password"
+msgstr "Nové heslo"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Poskytuje podporu SSL pomocí Mozilla NSS."
+#: ../libpurple/account.c:1216
+msgid "New password (again)"
+msgstr "Nové heslo (znovu)"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/account.c:1222
+#, c-format
+msgid "Change password for %s"
+msgstr "Změnit heslo pro %s"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Poskytuje rozhraní pro knihovny podpory SSL."
+#: ../libpurple/account.c:1230
+msgid "Please enter your current password and your new password."
+msgstr "Zadejte prosím své aktuální a nové heslo."
 
-#: ../plugins/statenotify.c:49
+#: ../libpurple/account.c:1261
 #, c-format
-msgid "%s is no longer away."
-msgstr "%s už není pryč."
+msgid "Change user information for %s"
+msgstr "Změnit informace o uživateli %s"
 
-#: ../plugins/statenotify.c:51
-#, c-format
-msgid "%s has gone away."
-msgstr "%s šel pryč."
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+msgid "Set User Info"
+msgstr "Nastavit informace o uživateli"
 
-#: ../plugins/statenotify.c:61
-#, c-format
-msgid "%s has become idle."
-msgstr "%s se stal nečinným."
+#: ../libpurple/account.c:1735 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Neznámé"
+
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Kamarádi"
+
+#: ../libpurple/blist.c:548
+msgid "buddy list"
+msgstr "seznam kamarádů"
+
+#: ../libpurple/connection.c:106
+msgid "Registration Error"
+msgstr "Chyba registrace"
 
-#: ../plugins/statenotify.c:63
+#: ../libpurple/connection.c:293
 #, c-format
-msgid "%s is no longer idle."
-msgstr "%s už není nečinný."
+msgid "+++ %s signed on"
+msgstr "+++ %s se přihlásil"
 
-#: ../plugins/statenotify.c:72
+#: ../libpurple/connection.c:323
 #, c-format
-msgid "%s has signed on."
-msgstr "%s se přihlásil."
+msgid "+++ %s signed off"
+msgstr "+++ %s se odhlásil"
 
-#: ../plugins/statenotify.c:90
-msgid "Notify When"
-msgstr "Upozorňovat, když"
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:322
+msgid "Unknown error"
+msgstr "Neznámá chyba"
 
-#: ../plugins/statenotify.c:93
-msgid "Buddy Goes _Away"
-msgstr "Kamarád jde _pryč"
+#: ../libpurple/conversation.c:171
+msgid "Unable to send message: The message is too large."
+msgstr "Nemohu odeslat zprávu: Zpráva je příliš velká."
 
-#: ../plugins/statenotify.c:96
-msgid "Buddy Goes _Idle"
-msgstr "Kamarád se stane _nečinným"
+#: ../libpurple/conversation.c:174 ../libpurple/conversation.c:187
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Nemohu odeslat zprávu k %s."
 
-#: ../plugins/statenotify.c:99
-msgid "Buddy _Signs On/Off"
-msgstr "Kamarád se při_hlásí/odhlásí"
+#: ../libpurple/conversation.c:175
+msgid "The message is too large."
+msgstr "Zpráva je příliš velká."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:141
-msgid "Buddy State Notification"
-msgstr "Upozornění na stav kamaráda"
+#: ../libpurple/conversation.c:184 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
+msgid "Unable to send message."
+msgstr "Nemohu odeslat zprávu."
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Upozorňuje v okně konverzace, když kamarád je nebo přestane být pryč nebo "
-"nečinný."
+#: ../libpurple/conversation.c:1215
+msgid "Send Message"
+msgstr "Odeslat zprávu"
 
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Načítač zásuvných modulů Tcl"
+#: ../libpurple/conversation.c:1218
+msgid "_Send Message"
+msgstr "Odeslat _zprávu"
 
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "Poskytuje podporu pro načítání zásuvných modulů v Tcl"
+#: ../libpurple/conversation.c:1624
+#, c-format
+msgid "%s entered the room."
+msgstr "%s vstoupil do místnosti."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Ticker kamarádů"
+#: ../libpurple/conversation.c:1627
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] vstoupil do místnosti."
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Vodorovně se posunující verze seznamu kamarádů."
+#: ../libpurple/conversation.c:1737
+#, c-format
+msgid "You are now known as %s"
+msgstr "Jste teď znám jako %s"
 
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "Časová značka iChat"
+#: ../libpurple/conversation.c:1757
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s je teď znám jako %s"
 
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "Zpoždění"
+#: ../libpurple/conversation.c:1832
+#, c-format
+msgid "%s left the room."
+msgstr "%s opustil místnost."
 
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minut."
+#: ../libpurple/conversation.c:1835
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s opustil místnost (%s)."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:254
-msgid "Timestamp"
-msgstr "Časová značka"
+#: ../libpurple/dbus-server.c:584
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Nemohu získat spojení: %s"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "Každých N minut přidává ke konverzacím časové značky ve styly iChat."
+#: ../libpurple/dbus-server.c:596
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "Nemohu získat jméno: %s"
 
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Možnosti formátu časové značky"
+#: ../libpurple/dbus-server.c:610
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Nemohu získat název serv: %s"
 
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Vnutit 24-hodinový formát času (tradiční pro Gaim)"
+#: ../libpurple/dbus-server.h:84
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "D-BUS server purple neběží z níže vypsaného důvodu"
 
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Zobrazovat data v..."
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Žádné jméno"
 
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Konverzace:"
+#: ../libpurple/dnsquery.c:510
+msgid "Unable to create new resolver process\n"
+msgstr "Nemohu vytvořit nový proces vyhledávače\n"
 
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Pro zpožděné zprávy"
+#: ../libpurple/dnsquery.c:515
+msgid "Unable to send request to resolver process\n"
+msgstr "Nemohu odeslat požadavek procesu vyhledávače\n"
 
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Pro zpožděné zprávy a v chatech"
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"Chyba při vyhledávání %s:\n"
+"%s"
 
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Záznamy zpráv:"
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "Chyba při vyhledávání %s: %d"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "Formáty časových značek zpráv"
+#: ../libpurple/dnsquery.c:573
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Chyba při čtení ze souboru vyhledávače:\n"
+"%s"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "Upravit formáty časových značek zpráv."
+#: ../libpurple/dnsquery.c:577
+msgid "EOF while reading from resolver process"
+msgstr "Konec souboru při čtení z procesu vyhledávače"
 
-#. *  description
-#: ../plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr "Tento zásuvný modul umožňuje uživateli upravit formáty časových značek zpráv v konverzacích a záznamech."
+#: ../libpurple/dnsquery.c:760
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "Chyba při vytváření vlákna: %s"
 
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Krytí:"
+#: ../libpurple/dnsquery.c:761
+msgid "Unknown reason"
+msgstr "Neznámý důvod"
 
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Okna IM konverzace"
+#: ../libpurple/ft.c:207
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Chyba při čtení %s: \n"
+"%s.\n"
 
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "Průhlednost okna _IM"
+#: ../libpurple/ft.c:211
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Chyba při zápisu %s: \n"
+"%s.\n"
 
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Zobrazovat posuvný pruh v okně IM"
+#: ../libpurple/ft.c:215
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Chyba při přístupu k %s: \n"
+"%s.\n"
 
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Odstranit průhlednost okna IM při aktivaci"
+#: ../libpurple/ft.c:251
+msgid "Directory is not writable."
+msgstr "Do adresáře nelze zapisovat."
 
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Vždy nahoře"
+#: ../libpurple/ft.c:266
+msgid "Cannot send a file of 0 bytes."
+msgstr "Nemohu odeslat soubor s 0 bajty."
 
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Okno seznamu kamarádů"
+#: ../libpurple/ft.c:276
+msgid "Cannot send a directory."
+msgstr "Nemohu odeslat adresář."
 
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Průhlednost okna _seznamu kamarádů"
+#: ../libpurple/ft.c:285
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s není obyčejný soubor. Zbaběle odmítám jej přepsat.\n"
 
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Odstranit průhlednost okna seznamu kamarádů při aktivaci"
+#: ../libpurple/ft.c:345
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s vám chce poslat %s (%s)"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
-msgid "Transparency"
-msgstr "Průhlednost"
+#: ../libpurple/ft.c:352
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s vám chce poslat soubor"
 
-#. *< name
-#. *< version
-#. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Proměnlivá průhlednost pro seznam kamarádů a konverzace."
+#: ../libpurple/ft.c:395
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Přijmout požadavek na přenos souboru od %s?"
 
-#. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../libpurple/ft.c:399
+#, c-format
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
 msgstr ""
-"Tento zásuvný modul umožňuje proměnlivou alfa průhlednost oken konverzace a seznamu kamarádů.\n"
-"\n"
-"* Poznámka: Tento zásuvný modul vyžaduje Win2000 nebo vyšší."
+"Je k dispozici soubor pro stažení z:\n"
+"Vzdálený počítač: %s\n"
+"Vzdálený port: %d"
 
-#: ../plugins/win32/winprefs/winprefs.c:397
-msgid "GTK+ Runtime Version"
-msgstr "Verze runtime GTK+"
+#: ../libpurple/ft.c:434
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s nabízí poslat soubor %s"
 
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
-msgid "Startup"
-msgstr "Spuštění"
+#: ../libpurple/ft.c:486
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s není platný název souboru.\n"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
-msgid "_Start Gaim on Windows startup"
-msgstr "_Spustit Gaim při spuštění Windows"
+#: ../libpurple/ft.c:507
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Nabízím %2$s poslat %1$s"
 
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
-msgid "Buddy List"
-msgstr "Seznam kamarádů"
+#: ../libpurple/ft.c:519
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Začínám přenos %s od %s"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
-msgid "_Dockable Buddy List"
-msgstr "_Dokovatelný seznam kamarádů"
+#: ../libpurple/ft.c:680
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "Přenos souboru %s dokončen"
 
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
-msgid "_Keep Buddy List window on top:"
-msgstr "_Udržovat okno seznamu kamarádů nahoře:"
+#: ../libpurple/ft.c:683
+msgid "File transfer complete"
+msgstr "Přenos souborů dokončen"
 
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
-msgid "Only when docked"
-msgstr "Jen při zadokování"
+#: ../libpurple/ft.c:1101
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Zrušili jste přenos %s"
 
-#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
-msgid "Conversations"
-msgstr "Konverzace"
+#: ../libpurple/ft.c:1106
+msgid "File transfer cancelled"
+msgstr "Přenos souborů zrušen"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
-msgid "_Flash window when messages are received"
-msgstr "_Bliknout oknem, když jsou přijaty zprávy"
+#: ../libpurple/ft.c:1164
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s zrušil přenos %s"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "WinGaim Options"
-msgstr "Možnosti WinGaim"
+#: ../libpurple/ft.c:1169
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s zrušil přenos souborů"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
-msgid "Options specific to Windows Gaim."
-msgstr "Možnosti specifické pro Windows Gaim."
+#: ../libpurple/ft.c:1226
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "Přenos souboru k %s selhal."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr "Poskytuje možnosti specifické pro Gaim ve Windows, například dokování seznamu kamarádů a blikání konverzací."
+#: ../libpurple/ft.c:1228
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "Přenos souboru od %s selhal."
 
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "účty"
+#: ../libpurple/gconf/purple.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Spustit příkaz v terminálu"
 
-#: ../src/account.c:923
-msgid "Password is required to sign on."
-msgstr "Pro přihlášení je vyžadováno heslo."
+#: ../libpurple/gconf/purple.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"aim\", je-li povolen."
 
-#: ../src/account.c:948
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Zadejte heslo pro %s (%s)"
+#: ../libpurple/gconf/purple.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"gg\", je-li povolen."
 
-#: ../src/account.c:955
-msgid "Enter Password"
-msgstr "Zadejte heslo"
+#: ../libpurple/gconf/purple.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"icq\", je-li povolen."
 
-#: ../src/account.c:960
-msgid "Save password"
-msgstr "Uložit heslo"
+#: ../libpurple/gconf/purple.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"irc\", je-li povolen."
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
-msgid "OK"
-msgstr "OK"
+#: ../libpurple/gconf/purple.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"msnim\", je-li povolen."
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:276 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
-#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
-#: ../src/protocols/oscar/oscar.c:8392
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
-msgid "Cancel"
-msgstr "Zrušit"
+#: ../libpurple/gconf/purple.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"sip\", je-li povolen."
 
-#: ../src/account.c:994 ../src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Chybí zásuvný modul protokolu pro %s"
+#: ../libpurple/gconf/purple.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"xmpp\", je-li povolen."
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
-#: ../src/gtkblist.c:3505
-msgid "Connection Error"
-msgstr "Chyba spojení"
+#: ../libpurple/gconf/purple.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Příkaz používaný pro obsluhu URL \"ymsgr\", je-li povolen."
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
-msgid "New passwords do not match."
-msgstr "Nová hesla nesouhlasí."
+#: ../libpurple/gconf/purple.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "Obsluha URL \"aim\""
 
-#: ../src/account.c:1085
-msgid "Fill out all fields completely."
-msgstr "Úplně vyplňte všechna pole."
+#: ../libpurple/gconf/purple.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "Obsluha URL \"gg\""
 
-#: ../src/account.c:1108
-msgid "Original password"
-msgstr "Původní heslo"
+#: ../libpurple/gconf/purple.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "Obsluha URL \"icq\""
 
-#: ../src/account.c:1115
-msgid "New password"
-msgstr "Nové heslo"
+#: ../libpurple/gconf/purple.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "Obsluha URL \"irc\""
 
-#: ../src/account.c:1122
-msgid "New password (again)"
-msgstr "Nové heslo (znovu)"
+#: ../libpurple/gconf/purple.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "Obsluha URL \"msnim\""
 
-#: ../src/account.c:1128
-#, c-format
-msgid "Change password for %s"
-msgstr "Změnit heslo pro %s"
+#: ../libpurple/gconf/purple.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "Obsluha URL \"sip\""
 
-#: ../src/account.c:1136
-msgid "Please enter your current password and your new password."
-msgstr "Zadejte prosím své aktuální a nové heslo."
+#: ../libpurple/gconf/purple.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "Obsluha URL \"xmpp\""
 
-#: ../src/account.c:1169
-#, c-format
-msgid "Change user information for %s"
-msgstr "Změnit informace o uživateli %s"
+#: ../libpurple/gconf/purple.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "Obsluha URL \"ymsgr\""
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
-#: ../src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "Uložit"
+#: ../libpurple/gconf/purple.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"aim\"."
 
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
-msgid "Unknown"
-msgstr "Neznámé"
+#: ../libpurple/gconf/purple.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"gg\"."
 
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "seznam kamarádů"
+#: ../libpurple/gconf/purple.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"icq\"."
 
-#: ../src/blist.c:1173
-msgid "Chats"
-msgstr "Chaty"
+#: ../libpurple/gconf/purple.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"irc\"."
 
-#: ../src/blist.c:1894
-#, c-format
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d kamarád ze skupiny %s nebyl odstraněn, protože patří k účtu, který je zakázán nebo odpojen. "
-"Tento kamarád a skupina nebyli odstraněni.\n"
-msgstr[1] ""
-"%d kamarádi ze skupiny %s nebyli odstraněni, protože patří k účtu, který je zakázán nebo odpojen. "
-"Tito kamarádi a skupina nebyli odstraněni.\n"
-msgstr[2] ""
-"%d kamarádů ze skupiny %s nebylo odstraněno, protože patří k účtu, který je zakázán nebo odpojen. "
-"Tito kamarádi a skupina nebyli odstraněni.\n"
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"msnim\"."
 
-#: ../src/blist.c:1904
-msgid "Group not removed"
-msgstr "Skupina neodstraněna"
+#: ../libpurple/gconf/purple.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"sip\"."
 
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "Chyba registrace"
+#: ../libpurple/gconf/purple.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"xmpp\"."
 
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s se přihlásil"
+#: ../libpurple/gconf/purple.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr "Pravda, jestliže příkaz zadaný v klíči \"command\" má obsluhovat URL \"ymsgr\"."
 
-#: ../src/connection.c:322
-#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s se odhlásil"
+#: ../libpurple/gconf/purple.schemas.in.h:26
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr "Pravda, jestliže příkaz používaný pro obsluhu tohoto typu URL má běžet v terminálu."
 
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "Nemohu odeslat zprávu: Zpráva je příliš velká."
+#: ../libpurple/gconf/purple.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"aim\""
 
-#: ../src/conversation.c:166 ../src/conversation.c:179
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Nemohu odeslat zprávu k %s."
+#: ../libpurple/gconf/purple.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"gg\""
 
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "Zpráva je příliš velká."
+#: ../libpurple/gconf/purple.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"icq\""
 
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "Nemohu odeslat zprávu."
+#: ../libpurple/gconf/purple.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"irc\""
 
-#: ../src/conversation.c:1517
-#, c-format
-msgid "%s entered the room."
-msgstr "%s vstoupil do místnosti."
+#: ../libpurple/gconf/purple.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"msnim\""
 
-#: ../src/conversation.c:1520
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] vstoupil do místnosti."
+#: ../libpurple/gconf/purple.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"sip\""
 
-#: ../src/conversation.c:1627
-#, c-format
-msgid "You are now known as %s"
-msgstr "Jste teď znám jako %s"
+#: ../libpurple/gconf/purple.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"xmpp\""
 
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s je teď znám jako %s"
+#: ../libpurple/gconf/purple.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Jestli má zadaný příkaz obsluhovat URL \"ymsgr\""
 
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s opustil místnost."
+#: ../libpurple/log.c:182
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">Zaznamenávač nemá funkci read</font></b>"
 
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s opustil místnost (%s)."
+#: ../libpurple/log.c:597
+msgid "HTML"
+msgstr "HTML"
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
-msgid "No name"
-msgstr "Žádné jméno"
+#: ../libpurple/log.c:611
+msgid "Plain text"
+msgstr "Prostý text"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Chyba při čtení %s: \n"
-"%s.\n"
+#: ../libpurple/log.c:625
+msgid "Old flat format"
+msgstr "Starý plochý formát"
 
-#: ../src/ft.c:193
+#: ../libpurple/log.c:838
+msgid "Logging of this conversation failed."
+msgstr "Zaznamenávání této konverzace selhalo."
+
+#: ../libpurple/log.c:1281
+msgid "XML"
+msgstr "XML"
+
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
-"Error writing %s: \n"
-"%s.\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"Chyba při zápisu %s: \n"
-"%s.\n"
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: ../src/ft.c:197
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
-"Error accessing %s: \n"
-"%s.\n"
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"Chyba při přístupu k %s: \n"
-"%s.\n"
-
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "Nemohu odeslat soubor s 0 bajty."
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
 
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "Nemohu odeslat adresář."
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>Nemohu najít cestu záznamu!</b></font>"
 
-#: ../src/ft.c:249
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s není obyčejný soubor. Zbaběle odmítám jej přepsat.\n"
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr "<font color=\"red\"><b>Nemohu přečíst soubor: %s</b></font>"
 
-#: ../src/ft.c:307
+#: ../libpurple/log.c:1499
 #, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s vám chce poslat %s (%s)"
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
 
-#: ../src/ft.c:314
+#: ../libpurple/plugin.c:365
 #, c-format
-msgid "%s wants to send you a file"
-msgstr "%s vám chce poslat soubor"
+msgid "You are using %s, but this plugin requires %s."
+msgstr "Používáte %s, ale tento zásuvný modul vyžaduje %s."
 
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "Přijmout požadavek na přenos souboru od %s?"
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "Tento zásuvný modul nedefinoval ID."
 
-#: ../src/ft.c:359
+#: ../libpurple/plugin.c:448
 #, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Je k dispozici soubor pro stažení z:\n"
-"Vzdálený počítač: %s\n"
-"Vzdálený port: %d"
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Magie zásuvného modulu %d nesouhlasí (potřebuji %d)"
 
-#: ../src/ft.c:391
+#: ../libpurple/plugin.c:465
 #, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s nabízí poslat soubor %s"
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "Verze ABI %d.%d.x nesouhlasí (potřebuji %d.%d.x)"
 
-#: ../src/ft.c:442
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s není platný název souboru.\n"
+#: ../libpurple/plugin.c:482
+msgid "Plugin does not implement all required functions"
+msgstr "Zásuvný modul neimplementuje všechny vyžadované funkce"
 
-#: ../src/ft.c:463
+#: ../libpurple/plugin.c:547
 #, c-format
-msgid "Offering to send %s to %s"
-msgstr "Nabízím %2$s poslat %1$s"
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Vyžadovaný zásuvný modul %s nebyl nalezen. Nainstalujte prosím tento zásuvný "
+"modul a zkuste to znovu."
 
-#: ../src/ft.c:474
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Začínám přenos %s od %s"
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Nemohu načíst zásuvný modul"
 
-#: ../src/ft.c:628
+#: ../libpurple/plugin.c:574
 #, c-format
-msgid "Transfer of file %s complete"
-msgstr "Přenos souboru %s dokončen"
+msgid "The required plugin %s was unable to load."
+msgstr "Vyžadovaný zásuvný modul %s nebylo možné načíst."
 
-#: ../src/ft.c:631
-msgid "File transfer complete"
-msgstr "Přenos souborů dokončen"
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Nemohu načíst váš zásuvný modul."
 
-#: ../src/ft.c:1022
+#: ../libpurple/plugin.c:677
 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Zrušili jste přenos %s"
+msgid "The dependent plugin %s failed to unload."
+msgstr "Závislý zásuvný modul %s nelze odebrat."
 
-#: ../src/ft.c:1027
-msgid "File transfer cancelled"
-msgstr "Přenos souborů zrušen"
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "Při uvolňování zásuvného modulu došlo k chybám."
+
+#: ../libpurple/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Automatické přijímání"
+
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "Automaticky přijímat požadavky na přenosy souborů od vybraných uživatelů."
+
+#: ../libpurple/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Automaticky přijatý přenos souboru \"%s\" od \"%s\" dokončen."
+
+#: ../libpurple/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr "Automatické přijetí dokončeno"
+
+#: ../libpurple/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "Když přijde požadavek na přenos souboru od %s"
+
+#: ../libpurple/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr "Nastavit automatické přijímání"
+
+#: ../libpurple/plugins/autoaccept.c:164
+msgid "_Save"
+msgstr "_Uložit"
+
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: ../src/ft.c:1084
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s zrušil přenos %s"
+#: ../libpurple/plugins/autoaccept.c:168
+msgid "Ask"
+msgstr "Zeptat se"
 
-#: ../src/ft.c:1089
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s zrušil přenos souborů"
+#: ../libpurple/plugins/autoaccept.c:169
+msgid "Auto Accept"
+msgstr "Automaticky přijmout"
 
-#: ../src/ft.c:1146
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "Přenos souboru k %s selhal."
+#: ../libpurple/plugins/autoaccept.c:170
+msgid "Auto Reject"
+msgstr "Automaticky odmítnout"
 
-#: ../src/ft.c:1148
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "Přenos souboru od %s selhal."
+#: ../libpurple/plugins/autoaccept.c:185
+msgid "Autoaccept File Transfers..."
+msgstr "Automaticky přijímané přenosy souborů..."
 
-#: ../src/gtkaccount.c:374
-#, c-format
+#. XXX: Is there a better way than this? There really should be.
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
+"Path to save the files in\n"
+"(Please provide the full path)"
 msgstr ""
-"<b>Soubor:</b> %s\n"
-"<b>Velikost souboru:</b> %s\n"
-"<b>Velikost obrázku:</b> %d×%d"
+"Cesta, kam ukládat soubory\n"
+"(Zadejte prosím plnou cestu)"
 
-#. Build the login options frame.
-#: ../src/gtkaccount.c:762
-msgid "Login Options"
-msgstr "Možnosti přihlášení"
+#: ../libpurple/plugins/autoaccept.c:220
+msgid "Automatically reject from users not in buddy list"
+msgstr "Automaticky odmítat od uživatelů, kteří nejsou na seznamu kamarádů"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
-msgid "Protocol:"
-msgstr "Protokol:"
+#: ../libpurple/plugins/autoaccept.c:224
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+"Upozornit vyskakovacím oknem, když je automaticky přijatý přenos souboru dokončen\n"
+"(jen když neexistuje konverzace s odesílatelem)"
 
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Heslo:"
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
+msgid "Notes"
+msgstr "Poznámky"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
-msgid "Alias:"
-msgstr "Alias:"
+#: ../libpurple/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr "Zadejte své poznámky níže..."
 
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "Zapamatovat si heslo"
+#: ../libpurple/plugins/buddynote.c:65
+msgid "Edit Notes..."
+msgstr "Upravit poznámky..."
 
-#. Build the user options frame.
-#: ../src/gtkaccount.c:919
-msgid "User Options"
-msgstr "Nastavení uživatele"
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
+msgid "Buddy Notes"
+msgstr "Poznámky o kamarádech"
 
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "Upozornění na nové zprávy"
+#. *< name
+#. *< version
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
+msgid "Store notes on particular buddies."
+msgstr "Ukládat poznámky o konkrétních kamarádech."
 
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "Ikona kamaráda:"
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr "Přidá možnost ukládat poznámky o kamarádech do vašeho seznamu kamarádů."
 
-#. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
-#, c-format
-msgid "%s Options"
-msgstr "Nastavení %s"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Test šifer"
 
-#: ../src/gtkaccount.c:1233
-msgid "Use Global Proxy Settings"
-msgstr "Použít globální nastavení proxy"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Testuje šifry dodávané s libpurple."
 
-#: ../src/gtkaccount.c:1239
-msgid "No Proxy"
-msgstr "Žádná proxy"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "Příklad DBusu"
 
-#: ../src/gtkaccount.c:1245
-msgid "HTTP"
-msgstr "HTTP"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "Příklad zásuvného modulu DBus"
 
-#: ../src/gtkaccount.c:1251
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Ovládání souborem"
 
-#: ../src/gtkaccount.c:1257
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Umožňuje ovládat zadáváním příkazů v souboru."
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
-msgid "Use Environmental Settings"
-msgstr "Použít globální prostředí"
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+msgid "Minutes"
+msgstr "minut"
 
-# More daring translation?
-#: ../src/gtkaccount.c:1297
-msgid "you can see the butterflies mating"
-msgstr "můžete vidět, jak se motýli párují"
-
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr "Pokud se podíváte opravdu zblízka,"
-
-#: ../src/gtkaccount.c:1317
-msgid "Proxy Options"
-msgstr "Možnosti proxy"
-
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
-msgid "Proxy _type:"
-msgstr "_Typ proxy:"
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+msgid "I'dle Mak'er"
+msgstr "Tvůrce nečinnosti"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
-msgid "_Host:"
-msgstr "_Počítač:"
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+msgid "Set Account Idle Time"
+msgstr "Nastavit čas nečinnosti účtu"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
-msgid "_Port:"
-msgstr "_Port:"
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+msgid "_Set"
+msgstr "_Nastavit"
 
-#: ../src/gtkaccount.c:1352
-msgid "_Username:"
-msgstr "Jméno _uživatele:"
+#: ../libpurple/plugins/idle.c:184
+msgid "None of your accounts are idle."
+msgstr "Žádný váš účet není nečinný."
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
-msgid "Pa_ssword:"
-msgstr "_Heslo:"
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+msgid "Unset Account Idle Time"
+msgstr "Zrušit čas nečinnosti účtu"
 
-#: ../src/gtkaccount.c:1736
-msgid "Add Account"
-msgstr "Přidat účet"
+#: ../libpurple/plugins/idle.c:203
+msgid "_Unset"
+msgstr "_Zrušit"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
-msgid "Modify Account"
-msgstr "Změnit účet"
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+msgid "Set Idle Time for All Accounts"
+msgstr "Nastavit čas nečinnosti pro všechny účty"
 
-#: ../src/gtkaccount.c:1760
-msgid "_Basic"
-msgstr "Zá_kladní"
+#: ../libpurple/plugins/idle.c:271
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "Zrušit čas nečinnosti pro všechny nečinné účty"
 
-#: ../src/gtkaccount.c:1771
-msgid "_Advanced"
-msgstr "_Pokročilé"
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Umožňuje vám ručně nastavit, jak dlouho jste byli nečinní"
 
-#. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
-msgid "Register"
-msgstr "Registrovat"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "Testovací klient IPC"
 
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Opravdu chcete odstranit %s?"
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "Test podpory IPC zásuvných modulů jako klient."
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Odstranit"
+#. *  description
+#: ../libpurple/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Test podpory IPC zásuvných modulů jako klient. Nalezne zásuvnhý modul "
+"serveru a zavolá zaregistrované příkazy."
 
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
-msgid "Screen Name"
-msgstr "Jméno uživatele"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "Server testu IPC"
 
-#: ../src/gtkaccount.c:2259
-msgid "Protocol"
-msgstr "Protokol"
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Test podpory IPC zásuvných modulů jako server."
 
-#: ../src/gtkaccount.c:2586
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s udělali %s svým kamarádem%s%s"
+#. *  description
+#: ../libpurple/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Test podpory IPC zásuvných modulů jako server. Zaregistruje příkazy IPC."
 
-#: ../src/gtkaccount.c:2635
-msgid "Add buddy to your list?"
-msgstr "Přidat kamaráda do vašeho seznamu?"
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Nastavení skrývání připojování/odpojování"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "Minimální velikost místnosti"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "Čas pro neaktivitu uživatele (v minutách)"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
-#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
-msgid "Add"
-msgstr "Přidat"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr "Skrývání připojování/odpojování"
 
-#: ../src/gtkblist.c:673
-msgid "Join a Chat"
-msgstr "Připojit se k chatu"
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr "Skrývat přílišné zprávy o připojování/odpojování"
 
-#: ../src/gtkblist.c:694
+#. *  description
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Zadejte prosím odpovídající informace o chatu, ke kterému se chcete "
-"připojit.\n"
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr "Tento zásuvný modul skrývá zprávy o připojování/odpojování ve velkých místnostech, kromě uživatelů aktivně se účasnících konverzace."
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libpurple/plugins/log_reader.c:493
+msgid "(UTC)"
+msgstr "(UTC)"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
-msgid "_Account:"
-msgstr "_Účet:"
+#: ../libpurple/plugins/log_reader.c:1577
+msgid "User is offline."
+msgstr "Uživatel je odpojen."
 
-# KEEP THIS SHORT FORM, the full one doesn't fit on a button.
-#: ../src/gtkblist.c:949
-msgid "Get _Info"
-msgstr "_Info"
+#: ../libpurple/plugins/log_reader.c:1583
+msgid "Auto-response sent:"
+msgstr "Automatická odpověď odeslána:"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "I_M"
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s se odhlásil."
 
-#: ../src/gtkblist.c:958
-msgid "_Send File"
-msgstr "_Odeslat soubor"
+#: ../libpurple/plugins/log_reader.c:1610
+msgid "One or more messages may have been undeliverable."
+msgstr "Jedna nebo více zpráv možná nebyla doručitelná."
 
-#: ../src/gtkblist.c:965
-msgid "Add Buddy _Pounce"
-msgstr "Přidat _sledování kamaráda"
+#: ../libpurple/plugins/log_reader.c:1620
+msgid "You were disconnected from the server."
+msgstr "Byli jste odpojeni od serveru."
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
-msgid "View _Log"
-msgstr "Zobrazit záz_nam"
+#: ../libpurple/plugins/log_reader.c:1628
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Momentálně jste odpojeni. Zprávy nebudou přijímány, pokud nejste přihlášeni."
 
-#: ../src/gtkblist.c:984
-msgid "Alias..."
-msgstr "Alias..."
+#: ../libpurple/plugins/log_reader.c:1643
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "Zprávu nelze odeslat, protože byla překročena maximální délka."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
-msgid "Remove"
-msgstr "Odstranit"
+#: ../libpurple/plugins/log_reader.c:1648
+msgid "Message could not be sent."
+msgstr "Zprávu nelze odeslat."
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
-msgid "_Alias..."
-msgstr "_Alias..."
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
+msgid "Adium"
+msgstr "Adium"
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
-msgid "_Remove"
-msgstr "_Odstranit"
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
+msgid "Fire"
+msgstr "Fire"
 
-#: ../src/gtkblist.c:1043
-msgid "Add a _Buddy"
-msgstr "_Přidat kamaráda"
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
 
-#: ../src/gtkblist.c:1045
-msgid "Add a C_hat"
-msgstr "Přidat _chat"
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
 
-#: ../src/gtkblist.c:1048
-msgid "_Delete Group"
-msgstr "_Odstranit skupinu"
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
+msgid "Trillian"
+msgstr "Trillian"
 
-#: ../src/gtkblist.c:1050
-msgid "_Rename"
-msgstr "_Přejmenovat"
+#. Add general preferences.
+#: ../libpurple/plugins/log_reader.c:2454
+msgid "General Log Reading Configuration"
+msgstr "Obecné nastavení čtení záznamů"
 
-#. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "_Připojit"
+#: ../libpurple/plugins/log_reader.c:2458
+msgid "Fast size calculations"
+msgstr "Rychlé výpočty velikosti"
 
-#: ../src/gtkblist.c:1070
-msgid "Auto-Join"
-msgstr "Automatické přihlašování"
+#: ../libpurple/plugins/log_reader.c:2462
+msgid "Use name heuristics"
+msgstr "Používat heuristiku pro jména"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
-msgid "_Collapse"
-msgstr "_Sbalit"
+#. Add Log Directory preferences.
+#: ../libpurple/plugins/log_reader.c:2468
+msgid "Log Directory"
+msgstr "Adresář záznamů"
 
-#: ../src/gtkblist.c:1136
-msgid "_Expand"
-msgstr "_Rozbalit"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/log_reader.c:2523
+msgid "Log Reader"
+msgstr "Čtečka záznamů"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
-#: ../src/gtkblist.c:3778
-msgid "/Tools/Mute Sounds"
-msgstr "/Nástroje/Umlčet zvuky"
+#. *< name
+#. *< version
+#. * summary
+#: ../libpurple/plugins/log_reader.c:2527
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "Zahrnuje záznamy jiných klientů IM v prohlížeči záznamů."
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4194 ../src/gtkpounce.c:426
+#. * description
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "Nejste momentálně připojen s účtem, který může přidat tohoto kamaráda."
-
-#. Buddies menu
-#: ../src/gtkblist.c:2463
-msgid "/_Buddies"
-msgstr "/_Kamarádi"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Při prohlížení záznamů tento zásuvný modul přidá záznamy z jiných klientů IM. Momentálně se to týká Adium, MSN Messenger a Trillian.\n"
+"\n"
+"VAROVÁNÍ: Tento zásuvný modul je ještě alfa kód a může často padat. Používejte jej na své vlastní nebezpečí!"
 
-#: ../src/gtkblist.c:2464
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Kamarádi/Nová _Instant Message..."
+#: ../libpurple/plugins/mono/loader/mono.c:217
+msgid "Mono Plugin Loader"
+msgstr "Načítač zásuvných modulů Mono"
 
-#: ../src/gtkblist.c:2465
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Kamarádi/Připojit se k _chatu..."
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
+msgid "Loads .NET plugins with Mono."
+msgstr "Načítá zásuvné moduly .NET pomocí Mono."
 
-#: ../src/gtkblist.c:2466
-msgid "/Buddies/Get User _Info..."
-msgstr "/Kamarádi/Získat informace o _uživateli..."
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/newline.c:68
+msgid "New Line"
+msgstr "Nový řádek"
 
-#: ../src/gtkblist.c:2467
-msgid "/Buddies/View User _Log..."
-msgstr "/Kamarádi/Zobrazit _záznam uživatele..."
+#. *< name
+#. *< version
+#: ../libpurple/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr "Připojí nový řádek před zobrazovanou zprávu."
 
-#: ../src/gtkblist.c:2469
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Kamarádi/Zobrazovat _odpojené kamarády"
-
-#: ../src/gtkblist.c:2470
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Kamarádi/Zobrazovat _prázdné skupiny"
-
-#: ../src/gtkblist.c:2471
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Kamarádi/Zobrazovat _podrobnosti o kamarádovi"
-
-#: ../src/gtkblist.c:2472
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Kamarádi/Zobrazovat _čas nečinnosti"
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr "Připojí nový řádek před zprávy, takže se v okně konverzace zbytek zprávy objeví  pod jménem uživatele."
+
+#: ../libpurple/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr "Emulace zprávy při odpojení"
+
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr "Uložit zprávy poslané odpojenným uživatelům jako sledování."
+
+#: ../libpurple/plugins/offlinemsg.c:95
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr "Ostatní zprávy budou uloženy jako sledování. Můžete sledování upravit/odstranit v dialogu `Sledování kamaráda'."
+
+#: ../libpurple/plugins/offlinemsg.c:156
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" je momentálně odpojen. Chcete uložit zbytek zpráv ve sledování a automaticky je odeslat, když se \"%s\" znovu připojí?"
+
+#: ../libpurple/plugins/offlinemsg.c:160
+msgid "Offline Message"
+msgstr "Zprávy při odpojení"
+
+#: ../libpurple/plugins/offlinemsg.c:161
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "Sledování můžete upravit/odstranit v dialogu `Sledování kamaráda'"
+
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Ano"
 
-#: ../src/gtkblist.c:2473
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Kamarádi/_Řadit kamarády"
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Ne"
 
-#: ../src/gtkblist.c:2475
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Kamarádi/_Přidat kamaráda..."
+#: ../libpurple/plugins/offlinemsg.c:193
+msgid "Save offline messages in pounce"
+msgstr "Ukládat zprávy při odpojení do sledování"
+
+#: ../libpurple/plugins/offlinemsg.c:197
+msgid "Do not ask. Always save in pounce."
+msgstr "Neptat se. Vždy uložit do sledování."
 
-#: ../src/gtkblist.c:2476
-msgid "/Buddies/Add C_hat..."
-msgstr "/Kamarádi/Přidat _chat..."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/perl/perl.c:601
+msgid "Perl Plugin Loader"
+msgstr "Načítač zásuvných modulů Perlu"
 
-#: ../src/gtkblist.c:2477
-msgid "/Buddies/Add _Group..."
-msgstr "/Kamarádi/Přidat _skupinu..."
+#. *< name
+#. *< version
+#. *< summary
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+msgid "Provides support for loading perl plugins."
+msgstr "Poskytuje podporu pro načítání zásuvných modulů v perlu."
 
-#: ../src/gtkblist.c:2479
-msgid "/Buddies/_Quit"
-msgstr "/Kamarádi/_Konec"
+#: ../libpurple/plugins/psychic.c:20
+msgid "Psychic Mode"
+msgstr "Telepatický režim"
 
-#. Accounts menu
-#: ../src/gtkblist.c:2482
-msgid "/_Accounts"
-msgstr "/_Účty"
+#: ../libpurple/plugins/psychic.c:21
+msgid "Psychic mode for incoming conversation"
+msgstr "Telepatický režim pro příchozí konverzace"
 
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Účty/Přidat\\/upravit"
+#: ../libpurple/plugins/psychic.c:22
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Způsobí, že okna konverzací se objeví, když vám jiní uživatelé začnou psát zprávu. Funguje s AIM, ICQ, XMPP, Sametime a Yahoo!"
 
-#. Tools
-#: ../src/gtkblist.c:2486
-msgid "/_Tools"
-msgstr "/_Nástroje"
+#: ../libpurple/plugins/psychic.c:72
+msgid "You feel a disturbance in the force..."
+msgstr "Cítíte narušení síly..."
 
-#: ../src/gtkblist.c:2487
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Nástroje/_Sledování kamarádů"
+#: ../libpurple/plugins/psychic.c:91
+msgid "Only enable for users on the buddy list"
+msgstr "Povolit jen uživatelům na seznamu kamarádů"
 
-#: ../src/gtkblist.c:2488
-msgid "/Tools/Plu_gins"
-msgstr "/Nástroje/_Zásuvné moduly"
+#: ../libpurple/plugins/psychic.c:96
+msgid "Disable when away"
+msgstr "Zakázat při nepřítomnosti"
 
-#: ../src/gtkblist.c:2489
-msgid "/Tools/Pr_eferences"
-msgstr "/Nástroje/_Nastavení"
+#: ../libpurple/plugins/psychic.c:100
+msgid "Display notification message in conversations"
+msgstr "Zobrazovat upozorňující zprávu v konverzacích"
 
-#: ../src/gtkblist.c:2490
-msgid "/Tools/Pr_ivacy"
-msgstr "/Nástroje/_Soukromí"
+#: ../libpurple/plugins/psychic.c:105
+msgid "Raise psychic conversations"
+msgstr "Zvyšovat telepatické konverzace"
 
-#: ../src/gtkblist.c:2492
-msgid "/Tools/_File Transfers"
-msgstr "/Nástroje/_Přenosy souborů"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/signals-test.c:711
+msgid "Signals Test"
+msgstr "Test signálů"
 
-#: ../src/gtkblist.c:2493
-msgid "/Tools/R_oom List"
-msgstr "/Nástroje/_Seznam místností"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
+msgid "Test to see that all signals are working properly."
+msgstr "Test pro zjištění, jestli všechny signály fungují správně."
 
-#: ../src/gtkblist.c:2494
-msgid "/Tools/System _Log"
-msgstr "/Nástroje/Systémový záz_nam"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Jednoduchý zásuvný modul"
 
-#: ../src/gtkblist.c:2496
-msgid "/Tools/Mute _Sounds"
-msgstr "/Nástroje/Umlčet _zvuky"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Test pro zjištění, zda většina věcí funguje."
 
-#. Help
-#: ../src/gtkblist.c:2499
-msgid "/_Help"
-msgstr "/Nápo_věda"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
-#: ../src/gtkblist.c:2500
-msgid "/Help/Online _Help"
-msgstr "/Nápověda/_Nápověda online"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Poskytuje rozhraní pro knihovny podpory SSL."
 
-#: ../src/gtkblist.c:2501
-msgid "/Help/_Debug Window"
-msgstr "/Nápověda/_Ladicí okno"
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "Certifikáty X.509"
 
-#: ../src/gtkblist.c:2502
-msgid "/Help/_About"
-msgstr "/Nápověda/O _aplikaci"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Účet:</b> %s"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Poskytuje podporu SSL pomocí GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
-#: ../src/gtkblist.c:2615
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Poskytuje podporu SSL pomocí Mozilla NSS."
+
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
-msgid ""
-"\n"
-"<b>Buddy Alias:</b> %s"
-msgstr "\n<b>Alias kamaráda:</b> %s"
+msgid "%s is no longer away."
+msgstr "%s už není pryč."
 
-#: ../src/gtkblist.c:2627
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr "\n<b>Přezdívka:</b> %s"
+msgid "%s has gone away."
+msgstr "%s šel pryč."
 
-#: ../src/gtkblist.c:2636
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr "\n<b>Přihlášen:</b> %s"
+msgid "%s has become idle."
+msgstr "%s se stal nečinným."
 
-#: ../src/gtkblist.c:2647
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr "\n<b>Nečinný:</b> %s"
+msgid "%s is no longer idle."
+msgstr "%s už není nečinný."
 
-#: ../src/gtkblist.c:2682
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr "\n<b>Naposledy spatřen:</b> před %s"
+msgid "%s has signed on."
+msgstr "%s se přihlásil."
 
-#: ../src/gtkblist.c:2691
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Stav:</b> Odpojen"
+#: ../libpurple/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Upozorňovat, když"
 
-#: ../src/gtkblist.c:2702
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>Popis:</b> Vystrašený"
+#: ../libpurple/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "Kamarád jde _pryč"
 
-#: ../src/gtkblist.c:2704
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr "\n<b>Stav:</b> Skvělý"
+#: ../libpurple/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "Kamarád se stane _nečinným"
+
+#: ../libpurple/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Kamarád se při_hlásí/odhlásí"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/statenotify.c:148
+msgid "Buddy State Notification"
+msgstr "Upozornění na stav kamaráda"
 
-#: ../src/gtkblist.c:2706
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
 msgstr ""
-"\n"
-"<b>Stav:</b> Žůžo"
+"Upozorňuje v okně konverzace, když kamarád je nebo přestane být pryč nebo "
+"nečinný."
 
-#: ../src/gtkblist.c:2995
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Nečinný %dh %02dm"
+#: ../libpurple/plugins/tcl/tcl.c:421
+msgid "Tcl Plugin Loader"
+msgstr "Načítač zásuvných modulů Tcl"
 
-#: ../src/gtkblist.c:2997
-#, c-format
-msgid "Idle %dm"
-msgstr "Nečinný %dm"
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+msgid "Provides support for loading Tcl plugins"
+msgstr "Poskytuje podporu pro načítání zásuvných modulů v Tcl"
 
-#. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
-#: ../src/protocols/yahoo/yahoo_profile.c:691
-msgid "Idle"
-msgstr "Nečinný"
+#: ../libpurple/plugins/tcl/tcl.c:507
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr "Nemohu detekovat instalaci ActiveTCL. Pokud chcete používat zásuvné moduly TCL, nainstalujte ActiveTCL z http://www.activestate.com\n"
 
-#: ../src/gtkblist.c:3132
-msgid "/Buddies/New Instant Message..."
-msgstr "/Kamarádi/Nová Instant Message..."
+#. Send a message about the connection error
+#: ../libpurple/protocols/bonjour/bonjour.c:112
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Nemohu poslouchat příchozí spojení IM\n"
 
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
-msgid "/Buddies/Join a Chat..."
-msgstr "/Kamarádi/Připojit se k chatu..."
+#: ../libpurple/protocols/bonjour/bonjour.c:137
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Nemohu vytvořit spojení s místním serverem mDNS. Běží?"
 
-#: ../src/gtkblist.c:3134
-msgid "/Buddies/Get User Info..."
-msgstr "/Kamarádi/Získat informace o uživateli..."
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:819
+msgid "First name"
+msgstr "Křestní jméno"
 
-#: ../src/gtkblist.c:3135
-msgid "/Buddies/Add Buddy..."
-msgstr "/Kamarádi/Přidat kamaráda..."
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:824
+msgid "Last name"
+msgstr "Příjmení"
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
-msgid "/Buddies/Add Chat..."
-msgstr "/Kamarádi/Přidat chat..."
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "Email"
 
-#: ../src/gtkblist.c:3137
-msgid "/Buddies/Add Group..."
-msgstr "/Kamarádi/Přidat skupinu..."
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "Účet AIM"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "Účet XMPP"
 
-#: ../src/gtkblist.c:3172
-msgid "/Tools/Buddy Pounces"
-msgstr "/Nástroje/Sledování kamarádů"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
+msgid "Bonjour Protocol Plugin"
+msgstr "Zásuvný modul protokolu Bonjour"
 
-#: ../src/gtkblist.c:3175
-msgid "/Tools/Privacy"
-msgstr "/Nástroje/Soukromí"
+#: ../libpurple/protocols/bonjour/bonjour.c:610
+msgid "Purple Person"
+msgstr "Osoba Purple"
 
-#: ../src/gtkblist.c:3178
-msgid "/Tools/Room List"
-msgstr "/Nástroje/Seznam místností"
+#. Creating the user splits
+#: ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Název počítače"
 
-#: ../src/gtkblist.c:3372
-msgid "Manually"
-msgstr "Ručně"
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
+msgid "E-mail"
+msgstr "E-mail"
 
-#: ../src/gtkblist.c:3374
-msgid "Alphabetically"
-msgstr "Podle abecedy"
+#: ../libpurple/protocols/bonjour/bonjour.h:33
+msgid "Bonjour"
+msgstr "Bonjour"
 
-#: ../src/gtkblist.c:3375
-msgid "By status"
-msgstr "Podle stavu"
-
-#: ../src/gtkblist.c:3376
-msgid "By log size"
-msgstr "Podle velikosti záznamu"
-
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
-msgid "%s disconnected"
-msgstr "%s odpojen"
+msgid "%s has closed the conversation."
+msgstr "%s zavřel konverzaci."
 
-#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
-msgid "Connect"
-msgstr "Připojit"
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
 
-#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
-msgid "Enable Account"
-msgstr "Povolit účet"
+#: ../libpurple/protocols/bonjour/jabber.c:583
+msgid "Cannot open socket"
+msgstr "Nemohu otevřít socket"
 
-#: ../src/gtkblist.c:3530
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s odpojen: %s</span>"
+#: ../libpurple/protocols/bonjour/jabber.c:591
+msgid "Error setting socket options"
+msgstr "Chyba při nastavování možností socketu"
 
-#: ../src/gtkblist.c:3657
-msgid "/Accounts"
-msgstr "/Účty"
+#: ../libpurple/protocols/bonjour/jabber.c:615
+msgid "Could not bind socket to port"
+msgstr "Nemohu připojit socket k portu"
 
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../src/gtkblist.c:3762
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Kamarádi/Zobrazovat odpojené kamarády"
-
-#: ../src/gtkblist.c:3765
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Kamarádi/Zobrazovat prázdné skupiny"
-
-#: ../src/gtkblist.c:3771
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Kamarádi/Zobrazit podrobnosti o kamarádovi"
-
-#: ../src/gtkblist.c:3774
-msgid "/Buddies/Show Idle Times"
-msgstr "/Kamarádi/Zobrazit čas nečinnosti"
-
-#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
-msgid "Add Buddy"
-msgstr "Přidat kamaráda"
+#: ../libpurple/protocols/bonjour/jabber.c:623
+msgid "Could not listen on socket"
+msgstr "Nemohu poslouchat na socketu"
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+msgid "Invalid proxy settings"
+msgstr "Neplatná nastavení proxy"
 
-#: ../src/gtkblist.c:4510
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
 msgstr ""
-"Zadejte prosím jméno uživatele, kterého chcete přidat do svého seznamu "
-"kamarádů. Můžete také zadat alias nebo přezdívku pro kamaráda. Alias bude "
-"zobrazen místo jména uživatele kdykoli je to možné.\n"
+"Buď jméno počítače nebo číslo portu uvedené pro vámi zadaný typ proxy je "
+"neplatné."
 
-#: ../src/gtkblist.c:4532
-msgid "Screen Name:"
-msgstr "Jméno uživatele:"
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
+msgid "Token Error"
+msgstr "Chyba tokenu"
 
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
-msgid "Account:"
-msgstr "Účet:"
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
+msgid "Unable to fetch the token.\n"
+msgstr "Nemohu získat token.\n"
 
-#: ../src/gtkblist.c:4832
-msgid "This protocol does not support chat rooms."
-msgstr "Tento protokol nepodporuje místnosti chatu."
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+msgid "Save Buddylist..."
+msgstr "Uložit seznam kamarádů..."
 
-#: ../src/gtkblist.c:4848
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Nejste momentálně připojen s žádným protokolem, který má možnost chatu."
+#: ../libpurple/protocols/gg/gg.c:270
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr "Váš seznam kamarádů je prázdný, do souboru nebylo nic zapsáno."
 
-#: ../src/gtkblist.c:4865
-msgid "Add Chat"
-msgstr "Přidat chat"
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+msgid "Couldn't open file"
+msgstr "Nemohu otevřít soubor"
 
-#: ../src/gtkblist.c:4889
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Zadejte prosím alias a odpovídající informace o chatu, který chcete přidat "
-"do svého seznamu kamarádů.\n"
+#: ../libpurple/protocols/gg/gg.c:289
+msgid "Buddylist saved successfully!"
+msgstr "Seznam kamarádů úspěšně uložen!"
 
-#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
-msgid "Add Group"
-msgstr "Přidat skupinu"
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+msgid "Couldn't load buddylist"
+msgstr "Nemohu načíst seznam kamarádů"
 
-#: ../src/gtkblist.c:4972
-msgid "Please enter the name of the group to be added."
-msgstr "Zadejte prosím název skupiny, kterou přidat."
+#: ../libpurple/protocols/gg/gg.c:324
+msgid "Load Buddylist..."
+msgstr "Načíst seznam kamarádů..."
 
-#: ../src/gtkblist.c:5593
-msgid "_Edit Account"
-msgstr "_Upravit účet"
+#: ../libpurple/protocols/gg/gg.c:325
+msgid "Buddylist loaded successfully!"
+msgstr "Seznam kamarádů úspěšně načten!"
 
-#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
-msgid "No actions available"
-msgstr "Žádné akce nejsou k dispozici"
+#: ../libpurple/protocols/gg/gg.c:336
+msgid "Save buddylist..."
+msgstr "Uložit seznam kamarádů..."
 
-#: ../src/gtkblist.c:5640
-msgid "_Disable"
-msgstr "Za_kázat"
+#: ../libpurple/protocols/gg/gg.c:384
+msgid "Fill in the registration fields."
+msgstr "Vyplňte pole pro registraci."
 
-#: ../src/gtkblist.c:5705
-msgid "/Tools"
-msgstr "/Nástroje"
+#: ../libpurple/protocols/gg/gg.c:389
+msgid "Passwords do not match."
+msgstr "Hesla nesouhlasí."
 
-#: ../src/gtkblist.c:5800
-msgid "/Buddies/Sort Buddies"
-msgstr "/Kamarádi/Řadit kamarády"
+#: ../libpurple/protocols/gg/gg.c:398
+msgid "Unable to register new account. Error occurred.\n"
+msgstr "Nemohu zaregistrovat nový účet. Došlo k chybě.\n"
 
-#: ../src/gtkconn.c:197
-#, c-format
-msgid ""
-"%s was disconnected due to an error: %s\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-"%s byl odpojen kvůli chybě: %s\n"
-"Gaim se nepokusí znovu připojit k účtu, dokud chybu neopravíte a účet znovu nepovolíte."
+#: ../libpurple/protocols/gg/gg.c:411
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Nový účet Gadu-Gadu zaregistrován"
 
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are:  version"
-msgstr "Podporované ladicí přepínače jsou: version"
+#: ../libpurple/protocols/gg/gg.c:412
+msgid "Registration completed successfully!"
+msgstr "Registrace úspěšně dokončena!"
 
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "Takový příkaz (v tomto kontextu) neexistuje."
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
+msgid "Password"
+msgstr "Heslo"
 
-#: ../src/gtkconv.c:412
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Pro nápovědu o konkrétním příkazu použijte \"/help &lt;příkaz&gt;\".\n"
-"V tomto kontextu jsou k dispozici následující příkazy:\n"
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
 
-#: ../src/gtkconv.c:484
-msgid "No such command."
-msgstr "Takový příkaz neexistuje"
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+msgid "Enter current token"
+msgstr "Zadejte aktuální token"
 
-#: ../src/gtkconv.c:491
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Chyba syntaxe: Zadali jste špatný počet parametrů příkazu."
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+msgid "Current token"
+msgstr "Aktuální token"
 
-#: ../src/gtkconv.c:496
-msgid "Your command failed for an unknown reason."
-msgstr "Váš příkaz selhal z neznámého důvodu."
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+msgid "Register New Gadu-Gadu Account"
+msgstr "Zaregistrovat nový účet Gadu-Gadu"
 
-#: ../src/gtkconv.c:503
-msgid "That command only works in chats, not IMs."
-msgstr "Tento příkaz funguje jen v chatech, ne v IM."
+#: ../libpurple/protocols/gg/gg.c:499
+msgid "Please, fill in the following fields"
+msgstr "Vyplňte prosím následující pole"
 
-#: ../src/gtkconv.c:506
-msgid "That command only works in IMs, not chats."
-msgstr "Tento příkaz funguje jen v IM, ne v chatech."
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/qq/buddy_info.c:49
+msgid "City"
+msgstr "Město"
 
-#: ../src/gtkconv.c:510
-msgid "That command doesn't work on this protocol."
-msgstr "Tento příkaz nefunguje s tímto protokolem."
+#: ../libpurple/protocols/gg/gg.c:642
+msgid "Year of birth"
+msgstr "Rok narození"
 
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "Tento kamarád není na stejném protokolu jako tento chat."
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+msgid "Gender"
+msgstr "Pohlaví"
 
-#: ../src/gtkconv.c:764
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr "Nejste momentálně připojen s účtem, který může pozvat tohoto kamaráda."
+#: ../libpurple/protocols/gg/gg.c:646
+msgid "Male or female"
+msgstr "Muž nebo žena"
 
-#: ../src/gtkconv.c:817
-msgid "Invite Buddy Into Chat Room"
-msgstr "Pozvat kamaráda do místnosti chatu"
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:226
+msgid "Male"
+msgstr "Muž"
 
-#. Put our happy label in it.
-#: ../src/gtkconv.c:847
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
-"zprávu."
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:229
+msgid "Female"
+msgstr "Žena"
 
-#: ../src/gtkconv.c:868
-msgid "_Buddy:"
-msgstr "_Kamarád:"
+#: ../libpurple/protocols/gg/gg.c:652
+msgid "Only online"
+msgstr "Jen připojené"
 
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
-msgid "_Message:"
-msgstr "Z_práva:"
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+msgid "Find buddies"
+msgstr "Hledat kamarády"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
-msgid "Unable to open file."
-msgstr "Nemohu otevřít soubor."
+#: ../libpurple/protocols/gg/gg.c:658
+msgid "Please, enter your search criteria below"
+msgstr "Zadejte prosím podmínky hledání níže"
 
-#: ../src/gtkconv.c:951
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Konverzace s %s</h1>\n"
+#: ../libpurple/protocols/gg/gg.c:696
+msgid "Fill in the fields."
+msgstr "Vyplňte tato pole."
 
-#: ../src/gtkconv.c:975
-msgid "Save Conversation"
-msgstr "Uložit konverzaci"
+#: ../libpurple/protocols/gg/gg.c:708
+msgid "Your current password is different from the one that you specified."
+msgstr "Vaše aktuální heslo je jiné než to, které jste zadali."
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
-msgid "Find"
-msgstr "Hledat"
+#: ../libpurple/protocols/gg/gg.c:722
+msgid "Unable to change password. Error occurred.\n"
+msgstr "Nemohu změnit heslo. Došlo k chybě.\n"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
-msgid "_Search for:"
-msgstr "_Hledat:"
+#: ../libpurple/protocols/gg/gg.c:731
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Změnit heslo pro účet Gadu-Gadu"
 
-#: ../src/gtkconv.c:1290
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Zaznamenávání spuštěno. Budoucí zprávy v této konverzaci budou zaznamenány."
+#: ../libpurple/protocols/gg/gg.c:732
+msgid "Password was changed successfully!"
+msgstr "Heslo bylo úspěšně změněno!"
 
-#: ../src/gtkconv.c:1298
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Zaznamenávání zastaveno. Budoucí zprávy v této konverzaci nebudou zaznamenány."
+#: ../libpurple/protocols/gg/gg.c:765
+msgid "Current password"
+msgstr "Aktuální heslo"
 
-#: ../src/gtkconv.c:1556
-msgid "IM"
-msgstr "IM"
+#: ../libpurple/protocols/gg/gg.c:790
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "Zadejte prosím své aktuální a nové heslo pro UIN: "
 
-#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
-msgid "Send File"
-msgstr "Odeslat soubor"
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+msgid "Change Gadu-Gadu Password"
+msgstr "Změnit heslo Gadu-Gadu"
 
-#: ../src/gtkconv.c:1569
-msgid "Un-Ignore"
-msgstr "Přestat ignorovat"
+#: ../libpurple/protocols/gg/gg.c:871
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "Vyberte chat pro kamaráda: %s"
 
-#: ../src/gtkconv.c:1572
-msgid "Ignore"
-msgstr "Ignorovat"
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+msgid "Add to chat..."
+msgstr "Přidat k chatu..."
 
-#: ../src/gtkconv.c:1578
-msgid "Info"
-msgstr "Info"
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
+msgid "Offline"
+msgstr "Odpojen"
 
-#: ../src/gtkconv.c:1584
-msgid "Get Away Message"
-msgstr "Získat zprávu o nepřítomnosti"
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
+msgid "Available"
+msgstr "Přítomen"
 
-#: ../src/gtkconv.c:1599
-msgid "Last said"
-msgstr "Naposledy řečeno"
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Pryč"
 
-#: ../src/gtkconv.c:2385
-msgid "Unable to save icon file to disk."
-msgstr "Nemohu uložit soubor ikony na disk."
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
+msgid "UIN"
+msgstr "UIN"
 
-#: ../src/gtkconv.c:2409
-msgid "Save Icon"
-msgstr "Uložit ikonu"
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
+msgid "First Name"
+msgstr "Křestní jméno"
 
-#: ../src/gtkconv.c:2458
-msgid "Animate"
-msgstr "Animovat"
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+msgid "Birth Year"
+msgstr "Rok narození"
 
-#: ../src/gtkconv.c:2463
-msgid "Hide Icon"
-msgstr "Skrýt ikonu"
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3904
+msgid "Unable to display the search results."
+msgstr "Nemohu zobrazit výsledky hledání."
 
-#: ../src/gtkconv.c:2469
-msgid "Save Icon As..."
-msgstr "Uložit ikonu jako..."
+#: ../libpurple/protocols/gg/gg.c:1166
+msgid "Gadu-Gadu Public Directory"
+msgstr "Veřejný adresář Gadu-Gadu"
 
-#. Conversation menu
-#: ../src/gtkconv.c:2610
-msgid "/_Conversation"
-msgstr "/_Konverzace"
-
-#: ../src/gtkconv.c:2612
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Konverzace/Nová _Instant Message..."
+#: ../libpurple/protocols/gg/gg.c:1167
+msgid "Search results"
+msgstr "Výsledky hledání"
 
-#: ../src/gtkconv.c:2617
-msgid "/Conversation/_Find..."
-msgstr "/Konverzace/_Hledat..."
+#: ../libpurple/protocols/gg/gg.c:1210
+msgid "No matching users found"
+msgstr "Nenalezen žádný odpovídající uživatel"
 
-#: ../src/gtkconv.c:2619
-msgid "/Conversation/View _Log"
-msgstr "/Konverzace/Zobrazit záz_nam"
+#: ../libpurple/protocols/gg/gg.c:1211
+msgid "There are no users matching your search criteria."
+msgstr "Neexistuje žádný uživatel odpovídající vašim podmínkám hledání."
 
-#: ../src/gtkconv.c:2620
-msgid "/Conversation/_Save As..."
-msgstr "/Konverzace/_Uložit jako..."
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+msgid "Unable to read socket"
+msgstr "Nemohu číst ze socketu"
 
-#: ../src/gtkconv.c:2622
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Konverzace/Vy_mazat paměť řádků"
+#: ../libpurple/protocols/gg/gg.c:1390
+msgid "Buddy list downloaded"
+msgstr "Seznam kamarádů stažen"
 
-#: ../src/gtkconv.c:2626
-msgid "/Conversation/Se_nd File..."
-msgstr "/Konverzace/Odeslat _soubor..."
+#: ../libpurple/protocols/gg/gg.c:1391
+msgid "Your buddy list was downloaded from the server."
+msgstr "Váš seznam kamarádů byl stažen ze serveru."
 
-#: ../src/gtkconv.c:2627
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Konverzace/Přidat _sledování kamaráda..."
+#: ../libpurple/protocols/gg/gg.c:1398
+msgid "Buddy list uploaded"
+msgstr "Seznam kamarádů odeslán"
 
-#: ../src/gtkconv.c:2629
-msgid "/Conversation/_Get Info"
-msgstr "/Konverzace/_Získat informace"
+#: ../libpurple/protocols/gg/gg.c:1399
+msgid "Your buddy list was stored on the server."
+msgstr "Váš seznam kamarádů byl uložen na serveru."
 
-#: ../src/gtkconv.c:2631
-msgid "/Conversation/In_vite..."
-msgstr "/Konverzace/_Pozvat..."
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+msgid "Connection failed."
+msgstr "Spojení selhalo."
 
-#: ../src/gtkconv.c:2636
-msgid "/Conversation/Al_ias..."
-msgstr "/Konverzace/_Alias..."
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:568
+msgid "Blocked"
+msgstr "Zablokován"
 
-#: ../src/gtkconv.c:2638
-msgid "/Conversation/_Block..."
-msgstr "/Konverzace/_Blokovat..."
+#: ../libpurple/protocols/gg/gg.c:1639
+msgid "Add to chat"
+msgstr "Přidat k chatu"
 
-#: ../src/gtkconv.c:2640
-msgid "/Conversation/_Add..."
-msgstr "/Konverzace/_Přidat..."
+#: ../libpurple/protocols/gg/gg.c:1648
+msgid "Unblock"
+msgstr "Odblokovat"
 
-#: ../src/gtkconv.c:2642
-msgid "/Conversation/_Remove..."
-msgstr "/Konverzace/_Odstranit..."
+#: ../libpurple/protocols/gg/gg.c:1652
+msgid "Block"
+msgstr "Blokovat"
 
-#: ../src/gtkconv.c:2647
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Konverzace/Vložit _odkaz..."
+#: ../libpurple/protocols/gg/gg.c:1669
+msgid "Chat _name:"
+msgstr "_Název chatu:"
 
-#: ../src/gtkconv.c:2649
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Konverzace/Vložit _obrázek..."
+#: ../libpurple/protocols/gg/gg.c:1909
+msgid "Chat error"
+msgstr "Chyba chatu"
 
-#: ../src/gtkconv.c:2654
-msgid "/Conversation/_Close"
-msgstr "/Konverzace/_Zavřít"
+#: ../libpurple/protocols/gg/gg.c:1910
+msgid "This chat name is already in use"
+msgstr "Tento název chatu se již používá"
 
-#. Options
-#: ../src/gtkconv.c:2658
-msgid "/_Options"
-msgstr "/_Možnosti"
+#: ../libpurple/protocols/gg/gg.c:1993
+msgid "Not connected to the server."
+msgstr "Nepřipojen k serveru."
 
-#: ../src/gtkconv.c:2659
-msgid "/Options/Enable _Logging"
-msgstr "/Možnosti/Povolit zaz_namenávání"
+#: ../libpurple/protocols/gg/gg.c:2016
+msgid "Find buddies..."
+msgstr "Hledat kamarády..."
 
-#: ../src/gtkconv.c:2660
-msgid "/Options/Enable _Sounds"
-msgstr "/Možnosti/Povolit _zvuky"
+#: ../libpurple/protocols/gg/gg.c:2022
+msgid "Change password..."
+msgstr "Změnit heslo..."
 
-#: ../src/gtkconv.c:2661
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
+#: ../libpurple/protocols/gg/gg.c:2028
+msgid "Upload buddylist to Server"
+msgstr "Odeslat seznam kamarádů na server"
 
-#: ../src/gtkconv.c:2663
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Možnosti/Zobrazovat lišty nástrojů _Formátování"
+#: ../libpurple/protocols/gg/gg.c:2032
+msgid "Download buddylist from Server"
+msgstr "Stáhnout seznam kamarádů ze serveru"
 
-#: ../src/gtkconv.c:2664
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Možnosti/Zobrazovat _časové značky"
+#: ../libpurple/protocols/gg/gg.c:2036
+msgid "Delete buddylist from Server"
+msgstr "Odstranit seznam kamarádů ze serveru"
 
-#: ../src/gtkconv.c:2756
-msgid "/Conversation/View Log"
-msgstr "/Konverzace/Zobrazit záznam"
+#: ../libpurple/protocols/gg/gg.c:2040
+msgid "Save buddylist to file..."
+msgstr "Uložit seznam kamarádů do souboru..."
 
-#: ../src/gtkconv.c:2762
-msgid "/Conversation/Send File..."
-msgstr "/Konverzace/Odeslat soubor..."
+#: ../libpurple/protocols/gg/gg.c:2044
+msgid "Load buddylist from file..."
+msgstr "Načíst seznam kamarádů ze serveru..."
 
-#: ../src/gtkconv.c:2766
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Konverzace/Přidat sledování kamaráda..."
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+#: ../libpurple/protocols/gg/gg.c:2148
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Zásuvný modul protokolu Gadu-Gadu"
 
-#: ../src/gtkconv.c:2772
-msgid "/Conversation/Get Info"
-msgstr "/Konverzace/Získat informace"
+#. summary
+#: ../libpurple/protocols/gg/gg.c:2149
+msgid "Polish popular IM"
+msgstr "Populární polský IM"
 
-#: ../src/gtkconv.c:2776
-msgid "/Conversation/Invite..."
-msgstr "/Konverzace/Pozvat..."
+#: ../libpurple/protocols/gg/gg.c:2203
+msgid "Gadu-Gadu User"
+msgstr "Uživatel Gadu-Gadu"
 
-#: ../src/gtkconv.c:2782
-msgid "/Conversation/Alias..."
-msgstr "/Konverzace/Alias..."
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
+#, c-format
+msgid "Unknown command: %s"
+msgstr "Neznámý příkaz: %s"
 
-#: ../src/gtkconv.c:2786
-msgid "/Conversation/Block..."
-msgstr "/Konverzace/Blokovat..."
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
+#, c-format
+msgid "current topic is: %s"
+msgstr "aktuální téma je: %s"
 
-#: ../src/gtkconv.c:2790
-msgid "/Conversation/Add..."
-msgstr "/Konverzace/Přidat..."
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
+msgid "No topic is set"
+msgstr "Nenastaveno žádné téma"
 
-#: ../src/gtkconv.c:2794
-msgid "/Conversation/Remove..."
-msgstr "/Konverzace/Odstranit..."
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+msgid "File Transfer Failed"
+msgstr "Přenos souborů selhal"
 
-#: ../src/gtkconv.c:2800
-msgid "/Conversation/Insert Link..."
-msgstr "/Konverzace/Vložit odkaz..."
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Nemohu otevřít poslouchající port."
 
-#: ../src/gtkconv.c:2804
-msgid "/Conversation/Insert Image..."
-msgstr "/Konverzace/Vložit obrázek..."
+#: ../libpurple/protocols/irc/irc.c:79
+msgid "Error displaying MOTD"
+msgstr "Chyba při zobrazování MOTD"
 
-#: ../src/gtkconv.c:2810
-msgid "/Options/Enable Logging"
-msgstr "/Možnosti/Povolit zaznamenávání"
+#: ../libpurple/protocols/irc/irc.c:79
+msgid "No MOTD available"
+msgstr "MOTD není k dispozici"
 
-#: ../src/gtkconv.c:2813
-msgid "/Options/Enable Sounds"
-msgstr "/Možnosti/Povolit zvuky"
+#: ../libpurple/protocols/irc/irc.c:80
+msgid "There is no MOTD associated with this connection."
+msgstr "S tímto spojením není asociována MOTD."
 
-#: ../src/gtkconv.c:2826
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Možnosti/Zobrazovat lišty nástrojů Formátování"
+#: ../libpurple/protocols/irc/irc.c:83
+#, c-format
+msgid "MOTD for %s"
+msgstr "MOTD pro %s"
 
-#: ../src/gtkconv.c:2829
-msgid "/Options/Show Timestamps"
-msgstr "/Možnosti/Zobrazovat časové značky"
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
+msgid "Server has disconnected"
+msgstr "Server se odpojil"
 
-#: ../src/gtkconv.c:2832
-msgid "/Options/Show Buddy Icon"
-msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
+#: ../libpurple/protocols/irc/irc.c:249
+msgid "View MOTD"
+msgstr "Zobrazit MOTD"
 
-#: ../src/gtkconv.c:2912
-msgid "User is typing..."
-msgstr "Uživatel píše..."
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
+msgid "_Channel:"
+msgstr "_Kanál:"
 
-#: ../src/gtkconv.c:2915
-msgid "User has typed something and stopped"
-msgstr "Uživatel něco napsal a počkal"
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+msgid "_Password:"
+msgstr "_Heslo:"
 
-#. Build the Send To menu
-#: ../src/gtkconv.c:3098
-msgid "_Send To"
-msgstr "_Odeslat do"
+#: ../libpurple/protocols/irc/irc.c:298
+msgid "IRC nicks may not contain whitespace"
+msgstr "Přezdívky IRC nemohou obsahovat mezery"
 
-#: ../src/gtkconv.c:3750
-msgid "_Send"
-msgstr "_Odeslat"
+#. 1. connect to server
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1037
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+msgid "Connecting"
+msgstr "Připojuji se"
 
-#: ../src/gtkconv.c:3805 ../src/protocols/sametime/sametime.c:3572
-msgid "Topic:"
-msgstr "Téma:"
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
+msgid "SSL support unavailable"
+msgstr "Podpora SSL není k dispozici"
 
-#. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3857
-msgid "0 people in room"
-msgstr "0 lidí v místnosti"
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1592
+msgid "Couldn't create socket"
+msgstr "Nemohu vytvořit socket"
 
-#: ../src/gtkconv.c:3936
-msgid "IM the user"
-msgstr "IM uživatele"
-
-#: ../src/gtkconv.c:3949
-msgid "Ignore the user"
-msgstr "Ignorovat uživatele"
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
+msgid "Couldn't connect to host"
+msgstr "Nemohu se připojit k hostiteli"
 
-#: ../src/gtkconv.c:3961
-msgid "Get the user's information"
-msgstr "Získat informace o uživateli"
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
+msgid "Read error"
+msgstr "Chyba čtení"
 
-#: ../src/gtkconv.c:4935 ../src/gtkconv.c:5044
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d osoba v místnosti"
-msgstr[1] "%d osoby v místnosti"
-msgstr[2] "%d osob v místnosti"
+#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+msgid "Users"
+msgstr "Uživatelé"
 
-#: ../src/gtkconv.c:6517
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;zpráva&gt;: Odeslat zprávu normálně, jako kdybyste nepoužívali "
-"příkaz."
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+msgid "Topic"
+msgstr "Téma"
 
-#: ../src/gtkconv.c:6520
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;akce&gt;: Odeslat kamarádovi nebo do chatu akci ve stylu IRC."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../libpurple/protocols/irc/irc.c:914
+msgid "IRC Protocol Plugin"
+msgstr "Zásuvný modul protokolu IRC"
 
-#: ../src/gtkconv.c:6523
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;přepínač&gt;: Odeslat aktuální konverzaci různé ladicí informace."
+#. *  summary
+#: ../libpurple/protocols/irc/irc.c:915
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "Zásuvný modul protokolu IRC, který není tak špatný"
 
-#: ../src/gtkconv.c:6526
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Vymaže paměť řádků konverzace."
+#. host to connect to
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/toc/toc.c:2327
+msgid "Server"
+msgstr "Server"
 
-#: ../src/gtkconv.c:6529
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;příkaz&gt;: Nápověda o konkrétním příkazu."
+#. port to connect to
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/toc/toc.c:2331
+msgid "Port"
+msgstr "Port"
 
-#: ../src/gtkconv.c:6688
-msgid "Confirm close"
-msgstr "Potvrdit zavření"
+#: ../libpurple/protocols/irc/irc.c:946
+msgid "Encodings"
+msgstr "Kódování"
 
-#: ../src/gtkconv.c:6720
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Máte nepřečtené zprávy. Opravdu chcete zavřít okno?"
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:794
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
+msgid "Username"
+msgstr "Jméno uživatele"
 
-#: ../src/gtkconv.c:7242
-msgid "Close other tabs"
-msgstr "Zavřít ostatní záložky"
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
+msgid "Real name"
+msgstr "Skutečné jméno"
 
-#: ../src/gtkconv.c:7248
-msgid "Close all tabs"
-msgstr "Zavřít všechny záložky"
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+#: ../libpurple/protocols/irc/irc.c:960
+msgid "Use SSL"
+msgstr "Používat SSL"
 
-#: ../src/gtkconv.c:7256
-msgid "Detach this tab"
-msgstr "Odpojit tuto záložku"
+#: ../libpurple/protocols/irc/msgs.c:187
+msgid "Bad mode"
+msgstr "Špatný tah"
 
-#: ../src/gtkconv.c:7262
-msgid "Close this tab"
-msgstr "Zavřít tuto záložku"
+#: ../libpurple/protocols/irc/msgs.c:198
+#, c-format
+msgid "You are banned from %s."
+msgstr "Byl vám zakázán vstup do %s."
 
-#: ../src/gtkconv.c:7524
-msgid "Close conversation"
-msgstr "Zavřít konverzaci"
+#: ../libpurple/protocols/irc/msgs.c:199
+msgid "Banned"
+msgstr "Zakázán"
 
-#: ../src/gtkconv.c:7988
-msgid "Last created window"
-msgstr "Poslední vytvořené okno"
+#: ../libpurple/protocols/irc/msgs.c:216
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "Nemohu zakázat %s: seznam zakázaných je plný"
 
-#: ../src/gtkconv.c:7990
-msgid "Separate IM and Chat windows"
-msgstr "Oddělovat okna IM a chatů"
+#: ../libpurple/protocols/irc/msgs.c:301
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
 
-#: ../src/gtkconv.c:7992 ../src/gtkprefs.c:1243
-msgid "New window"
-msgstr "Nové okno"
+#: ../libpurple/protocols/irc/msgs.c:302
+msgid " <i>(identified)</i>"
+msgstr " <i>(identifikován)</i>"
 
-#: ../src/gtkconv.c:7994
-msgid "By group"
-msgstr "Podle skupiny"
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
+msgid "Nick"
+msgstr "Přezdívka"
 
-#: ../src/gtkconv.c:7996
-msgid "By account"
-msgstr "Podle účtu"
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
+msgid "Currently on"
+msgstr "Momentálně na"
 
-#: ../src/gtkdebug.c:232
-msgid "Save Debug Log"
-msgstr "Uložit ladicí záznam"
+#: ../libpurple/protocols/irc/msgs.c:334
+msgid "Idle for"
+msgstr "Nečinný po"
 
-#: ../src/gtkdebug.c:586
-msgid "Invert"
-msgstr "Invertovat"
+#: ../libpurple/protocols/irc/msgs.c:337
+msgid "Online since"
+msgstr "Připojen od"
 
-#: ../src/gtkdebug.c:589
-msgid "Highlight matches"
-msgstr "Zvýrazňovat výskyty"
+#: ../libpurple/protocols/irc/msgs.c:341
+msgid "<b>Defining adjective:</b>"
+msgstr "<b>Definující přídavné jméno:</b>"
 
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Ladicí okno"
+#: ../libpurple/protocols/irc/msgs.c:341
+msgid "Glorious"
+msgstr ""
 
-#: ../src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Vymazat"
+#: ../libpurple/protocols/irc/msgs.c:420
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s změnil téma na: %s"
 
-#: ../src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Pozastavit"
+#: ../libpurple/protocols/irc/msgs.c:422
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s změnil téma."
 
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Časové značky"
+#: ../libpurple/protocols/irc/msgs.c:430
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "Téma pro %s je: %s"
 
-#: ../src/gtkdebug.c:724
-msgid "Filter"
-msgstr "Filtr"
+#: ../libpurple/protocols/irc/msgs.c:448
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "Neznámá zpráva '%s'"
 
-#: ../src/gtkdebug.c:743
-msgid "Right click for more options."
-msgstr "Pro více možností klikněte pravým tlačítkem."
+#: ../libpurple/protocols/irc/msgs.c:449
+msgid "Unknown message"
+msgstr "Neznámá zpráva"
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
-msgid "lead developer"
-msgstr "vedoucí vývojář"
+#: ../libpurple/protocols/irc/msgs.c:449
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC server přijal zprávu, které nerozuměl."
 
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
-msgid "developer"
-msgstr "vývojář"
+#: ../libpurple/protocols/irc/msgs.c:470
+#, c-format
+msgid "Users on %s: %s"
+msgstr "Uživatelé na %s: %s"
 
-#: ../src/gtkdialogs.c:64
-msgid "win32 port"
-msgstr "port na win32"
+#: ../libpurple/protocols/irc/msgs.c:575
+msgid "Time Response"
+msgstr "Odpověď s časem"
 
-#: ../src/gtkdialogs.c:66
-msgid "developer & webmaster"
-msgstr "vývojář a webmaster"
+#: ../libpurple/protocols/irc/msgs.c:576
+msgid "The IRC server's local time is:"
+msgstr "Místní čas IRC serveru je:"
 
-#: ../src/gtkdialogs.c:72
-msgid "support"
-msgstr "podpora"
+#: ../libpurple/protocols/irc/msgs.c:587
+msgid "No such channel"
+msgstr "Takový kanál neexistuje"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
-msgid "maintainer"
-msgstr "správce"
+#. does this happen?
+#: ../libpurple/protocols/irc/msgs.c:598
+msgid "no such channel"
+msgstr "Takový kanál neexistuje"
 
-#: ../src/gtkdialogs.c:96
-msgid "libfaim maintainer"
-msgstr "správce libfaim"
+#: ../libpurple/protocols/irc/msgs.c:601
+msgid "User is not logged in"
+msgstr "Uživatel není přihlášen"
 
-#: ../src/gtkdialogs.c:97
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker a jmenovaný řidič [líná kůže]"
+#: ../libpurple/protocols/irc/msgs.c:606
+msgid "No such nick or channel"
+msgstr "Taková přezdívka nebo kanál neexistuje"
 
-#: ../src/gtkdialogs.c:98
-msgid "Jabber developer"
-msgstr "vývojář Jabberu"
+#: ../libpurple/protocols/irc/msgs.c:626
+msgid "Could not send"
+msgstr "Nemohu odeslat"
 
-#: ../src/gtkdialogs.c:99
-msgid "original author"
-msgstr "původní autor"
+#: ../libpurple/protocols/irc/msgs.c:682
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "Připojení se k %s vyžaduje pozvání."
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
-msgid "Bulgarian"
-msgstr "Bulharština"
+#: ../libpurple/protocols/irc/msgs.c:683
+msgid "Invitation only"
+msgstr "Jen pro pozvané"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
-msgid "Bengali"
-msgstr "Bengálština"
+#: ../libpurple/protocols/irc/msgs.c:795
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "Byli jste vykopnuti z %s: (%s)"
 
-#: ../src/gtkdialogs.c:110
-msgid "Bosnian"
-msgstr "Bosenština"
+#. Remove user from channel
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "Vykopnut od %s: (%s)"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
-msgid "Catalan"
-msgstr "Katalánština"
+#: ../libpurple/protocols/irc/msgs.c:823
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "režim (%s %s) od %s"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
-msgid "Czech"
-msgstr "Čeština"
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+msgid "Invalid nickname"
+msgstr "Neplatná přezdívka"
 
-#: ../src/gtkdialogs.c:113
-msgid "Danish"
-msgstr "Dánština"
+#: ../libpurple/protocols/irc/msgs.c:910
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Vámi zvolená přezdívka byla serverem odmítnuta. Pravděpodobně obsahuje "
+"neplatné znaky."
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
-msgid "German"
-msgstr "Němčina"
+#: ../libpurple/protocols/irc/msgs.c:915
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Vámi zvolený název účtu byl serverem odmítnut. Pravděpodobně obsahuje "
+"neplatné znaky."
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
-msgid "Greek"
-msgstr "Řečtina"
+#: ../libpurple/protocols/irc/msgs.c:954
+msgid "Cannot change nick"
+msgstr "Nemohu změnit přezdívku"
 
-#: ../src/gtkdialogs.c:117
-msgid "Australian English"
-msgstr "Australská angličtina"
+#: ../libpurple/protocols/irc/msgs.c:954
+msgid "Could not change nick"
+msgstr "Nemohu změnit přezdívku"
 
-#: ../src/gtkdialogs.c:118
-msgid "Canadian English"
-msgstr "Kanadská angličtina"
+#: ../libpurple/protocols/irc/msgs.c:975
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "Opustili jste kanál%s%s"
 
-#: ../src/gtkdialogs.c:119
-msgid "British English"
-msgstr "Britská angličtina"
+#: ../libpurple/protocols/irc/msgs.c:1017
+msgid "Error: invalid PONG from server"
+msgstr "Chyba: neplatný PONG od serveru"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
-msgid "Spanish"
-msgstr "Španělština"
+#: ../libpurple/protocols/irc/msgs.c:1019
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "Odpověď na PING -- zpoždění: %lu sekund"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
-msgid "Persian"
-msgstr "Perština"
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Nemohu se připojit k %s: Je vyžadována registrace."
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-msgid "Finnish"
-msgstr "Finština"
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
+msgid "Cannot join channel"
+msgstr "Nemohu se připojit ke kanálu"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
-msgid "French"
-msgstr "Francouzština"
+#: ../libpurple/protocols/irc/msgs.c:1145
+msgid "Nick or channel is temporarily unavailable."
+msgstr "Přezdívka nebo kanál je dočasně nedostupná."
 
-#: ../src/gtkdialogs.c:125
-msgid "Hebrew"
-msgstr "Hebrejština"
+#: ../libpurple/protocols/irc/msgs.c:1157
+#, c-format
+msgid "Wallops from %s"
+msgstr "Wallops od %s"
 
-#: ../src/gtkdialogs.c:126
-msgid "Hindi"
-msgstr "Hindština"
+#: ../libpurple/protocols/irc/parse.c:122
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;akce, kterou provést&gt;: Provést akci."
 
-#: ../src/gtkdialogs.c:127
-msgid "Hungarian"
-msgstr "Maďarština"
+#: ../libpurple/protocols/irc/parse.c:123
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [zpráva]: Nastavit zprávu o nepřítomnosti, nebo nepoužijte žádnou "
+"zprávu pro návrat z nepřítomnosti."
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
-msgid "Italian"
-msgstr "Italština"
+#: ../libpurple/protocols/irc/parse.c:124
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Odeslat příkaz chanservu"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
-msgid "Japanese"
-msgstr "Japonština"
+#: ../libpurple/protocols/irc/parse.c:125
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;přezd1&gt; [přezd2] ...:  Odejmout někomu stav operátora kanálu. "
+"Abyste to mohli udělat, musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
-msgid "Georgian"
-msgstr "Gruzínština"
+#: ../libpurple/protocols/irc/parse.c:126
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;přezd1&gt; [přezd2] ...: Odejmout někomu stav hlasu v kanálu, "
+"což mu brání mluvit, pokud je kanál moderován (+m). Abyste to mohli udělat, "
+"musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
-msgid "Korean"
-msgstr "Korejština"
+#: ../libpurple/protocols/irc/parse.c:127
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;přezd&gt; [místnost]: Pozvat někoho, aby se k vám přidal v "
+"určeném nebo aktuálním kanálu."
 
-#: ../src/gtkdialogs.c:132
-msgid "Kurdish"
-msgstr "Kurdština"
+#: ../libpurple/protocols/irc/parse.c:128
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
+"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
+"vyžadováno."
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
-msgid "Lithuanian"
-msgstr "Litevština"
+#: ../libpurple/protocols/irc/parse.c:129
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
+"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
+"vyžadováno."
 
-#: ../src/gtkdialogs.c:134
-msgid "Macedonian"
-msgstr "Makedonština"
+#: ../libpurple/protocols/irc/parse.c:130
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;přezdívka&gt; [zpráva]: Odstranit někoho z kanálu. Abyste to mohli "
+"udělat, musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:135
-msgid "Dutch, Flemish"
-msgstr "Holandština, vlámština"
+#: ../libpurple/protocols/irc/parse.c:131
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list: Zobrazit seznam místností chatu na síti. <i>Varování, některé servery "
+"vás za to mohou odpojit.</i>"
 
-#: ../src/gtkdialogs.c:136
-msgid "Norwegian"
-msgstr "Norština"
+#: ../libpurple/protocols/irc/parse.c:132
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;akce, kterou provést&gt;: Provést akci."
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
-msgid "Polish"
-msgstr "Polština"
+#: ../libpurple/protocols/irc/parse.c:133
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Odeslat příkaz memoservu"
 
-#: ../src/gtkdialogs.c:139
-msgid "Portuguese"
-msgstr "Portugalština"
+#: ../libpurple/protocols/irc/parse.c:134
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;přezdívka|kanál&gt;: Nastavit nebo zrušit "
+"režim kanálu nebo uživatele."
 
-#: ../src/gtkdialogs.c:140
-msgid "Portuguese-Brazil"
-msgstr "Portugalština-brazilská"
+#: ../libpurple/protocols/irc/parse.c:135
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Poslat soukromou zprávu uživateli (ne "
+"kanálu)."
 
-#: ../src/gtkdialogs.c:141
-msgid "Romanian"
-msgstr "Rumunština"
+#: ../libpurple/protocols/irc/parse.c:136
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [kanál]: Vypsat uživatele momentálně v kanálu."
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
-msgid "Russian"
-msgstr "Ruština"
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1821
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;nová přezdívka&gt;: Změnit vaši přezdívku."
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
-msgid "Serbian"
-msgstr "Srbština"
+#: ../libpurple/protocols/irc/parse.c:138
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Odeslat příkaz nickservu"
 
-#: ../src/gtkdialogs.c:145
-msgid "Slovenian"
-msgstr "Slovinština"
+#: ../libpurple/protocols/irc/parse.c:139
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav operátora kanálu. Abyste "
+"to mohli udělat, musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
-msgid "Swedish"
-msgstr "Švédština"
+#: ../libpurple/protocols/irc/parse.c:140
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
+"použít."
 
-#: ../src/gtkdialogs.c:147
-msgid "Tamil"
-msgstr "Tamil"
+#: ../libpurple/protocols/irc/parse.c:141
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: Odeslat příkaz operservu"
 
-#: ../src/gtkdialogs.c:148
-msgid "Telugu"
-msgstr "Telugu"
+#: ../libpurple/protocols/irc/parse.c:142
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [místnost] [zpráva]: Opustit aktuální nebo určený kanál s nepovinnou "
+"zprávou."
 
-#: ../src/gtkdialogs.c:149
-msgid "Turkish"
-msgstr "Turečtina"
+#: ../libpurple/protocols/irc/parse.c:143
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [přezdívka]: Zjišťuje, jaké zpoždění má uživatel (nebo server, pokud "
+"není určen uživatel)."
 
-#: ../src/gtkdialogs.c:150
-msgid "Vietnamese"
-msgstr "Vietnamština"
+#: ../libpurple/protocols/irc/parse.c:144
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat soukromou zprávu uživateli "
+"(ne kanálu)."
 
-#: ../src/gtkdialogs.c:150
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh a tým Gnome-Vi"
+#: ../libpurple/protocols/irc/parse.c:145
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [zpráva]: Odpojit se od serveru s nepovinnou zprávou."
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
-msgid "Simplified Chinese"
-msgstr "Zjednodušená čínština"
+#: ../libpurple/protocols/irc/parse.c:146
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]: Poslat serveru nezpracovaný příkaz."
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
-msgid "Traditional Chinese"
-msgstr "Tradiční čínština"
+#: ../libpurple/protocols/irc/parse.c:147
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;přezdívka&gt; [zpráva]: Odstranit někoho z místnosti. Abyste to "
+"mohli udělat, musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:159
-msgid "Amharic"
-msgstr "Amharština"
+#: ../libpurple/protocols/irc/parse.c:148
+msgid "time: Displays the current local time at the IRC server."
+msgstr "time: Zobrazí momentální místní čas na IRC serveru."
 
-#: ../src/gtkdialogs.c:186
-msgid "Slovak"
-msgstr "Slovenština"
+#: ../libpurple/protocols/irc/parse.c:149
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [nové téma]: Zobrazit nebo změnit téma kanálu."
 
-#: ../src/gtkdialogs.c:230
-msgid "About Gaim"
-msgstr "O Gaim"
-
-#: ../src/gtkdialogs.c:254
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
-"file for the complete list of contributors.  We provide no warranty for this "
-"program.<BR><BR>"
-msgstr "Gaim je modulární klient IM schopný zároveň používat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, a Gadu-Gadu. Je napsán pomocí GTK+<BR><BR>Program můžete upravovat a dále šířit pod podmínkami GPL (verze 2 nebo novější). Kopie GPL je obsažena v souboru 'COPYING' dodávaném s Gaim. Copyright Gaimu vlastní jeho spoluautoři. Pro úplný seznam spoluautorů viz soubor 'COPYRIGHT'. Pro tento program neposkytujeme žádnou záruku.<BR><BR>"
-
-#: ../src/gtkdialogs.c:268
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
-
-#: ../src/gtkdialogs.c:271
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
+#: ../libpurple/protocols/irc/parse.c:150
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit režim uživatele."
 
-#: ../src/gtkdialogs.c:277
-msgid "Current Developers"
-msgstr "Současní vývojáři"
+#: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [přezdívka]: poslat uživateli požadavek CTCP VERSION"
 
-#: ../src/gtkdialogs.c:292
-msgid "Crazy Patch Writers"
-msgstr "Šílení autoři patchů"
+#: ../libpurple/protocols/irc/parse.c:152
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav hlasu v kanálu. Abyste "
+"to mohli udělat, musíte být operátor kanálu."
 
-#: ../src/gtkdialogs.c:307
-msgid "Retired Developers"
-msgstr "Vývojáři na odpočinku"
+#: ../libpurple/protocols/irc/parse.c:153
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
+"použít."
 
-#: ../src/gtkdialogs.c:322
-msgid "Current Translators"
-msgstr "Současní překladatelé"
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [server] &lt;přezdívka&gt;: Získat informace o uživateli."
 
-#: ../src/gtkdialogs.c:342
-msgid "Past Translators"
-msgstr "Dřívější překladatelé"
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whois &lt;přezdívka&gt;: Získat informace o uživateli, který se odpojil."
 
-#: ../src/gtkdialogs.c:360
-msgid "Debugging Information"
-msgstr "Ladicí informace"
+#: ../libpurple/protocols/irc/parse.c:465
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "Čas odpovědi z %s: %lu sekund"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
-msgid "_Name"
-msgstr "_Název"
+#: ../libpurple/protocols/irc/parse.c:466
+msgid "PONG"
+msgstr "PONG"
 
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
-msgid "_Account"
-msgstr "_Účet"
+#: ../libpurple/protocols/irc/parse.c:466
+msgid "CTCP PING reply"
+msgstr "Odpověď na CTCP PING"
 
-#: ../src/gtkdialogs.c:579
-msgid "New Instant Message"
-msgstr "Nová Instant Message"
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
+msgid "Disconnected."
+msgstr "Odpojen."
 
-#: ../src/gtkdialogs.c:581
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "Zadejte prosím jméno uživatele nebo alias osoby, kterou chcete IM."
+#: ../libpurple/protocols/jabber/auth.c:52
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
 
-#: ../src/gtkdialogs.c:716
-msgid "Get User Info"
-msgstr "Získat informace o uživateli"
+#: ../libpurple/protocols/jabber/auth.c:115
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
 
-#: ../src/gtkdialogs.c:718
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
+#, c-format
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "Zadejte prosím jméno uživatele nebo alias osoby, jejíž informace chcete zobrazit."
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s vyžaduje textovou autentizaci přes nešifrované spojení. Povolit to a pokračovat v autentizaci?"
+
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
+msgid "Plaintext Authentication"
+msgstr "Textová autentizace"
 
-#: ../src/gtkdialogs.c:784
-msgid "View User Log"
-msgstr "Zobrazit záznam uživatele"
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
+msgid "Server does not use any supported authentication method"
+msgstr "Server nepoužívá žádnou podporovanou metodu autentizace"
 
-#: ../src/gtkdialogs.c:786
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "Neplatná odpověď od serveru."
+
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "Zadejte prosím jméno uživatele nebo alias osoby, jejíž záznam chcete zobrazit."
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Tento server vyžaduje textovou autentizaci přes nešifrované spojení. Povolit "
+"a pokračovat v autentizaci?"
 
-#: ../src/gtkdialogs.c:805
-msgid "Alias Contact"
-msgstr "Alias kontaktu"
+#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
+msgid "Invalid challenge from server"
+msgstr "Neplatná výzva od serveru"
 
-#: ../src/gtkdialogs.c:806
-msgid "Enter an alias for this contact."
-msgstr "Zadejte alias pro tento kontakt."
+#: ../libpurple/protocols/jabber/auth.c:887
+msgid "SASL error"
+msgstr "Chyba SASL"
 
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
-msgid "Alias"
-msgstr "Alias"
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
+msgid "Full Name"
+msgstr "Celé jméno"
 
-#: ../src/gtkdialogs.c:826
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Zadejte alias pro %s"
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
+msgid "Family Name"
+msgstr "Příjmení"
 
-#: ../src/gtkdialogs.c:828
-msgid "Alias Buddy"
-msgstr "Alias kamaráda"
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:842
+msgid "Given Name"
+msgstr "Křestní jméno"
 
-#: ../src/gtkdialogs.c:847
-msgid "Alias Chat"
-msgstr "Alias chatu"
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:854
+msgid "URL"
+msgstr "URL"
 
-#: ../src/gtkdialogs.c:848
-msgid "Enter an alias for this chat."
-msgstr "Zadejte alias pro tento chat."
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:894
+msgid "Street Address"
+msgstr "Adresa ulice"
 
-#: ../src/gtkdialogs.c:885
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Hodláte odstranit kontakt obsahující %s a %d jiného kamaráda ze svého "
-"seznamu kamarádů. Chcete pokračovat?"
-msgstr[1] ""
-"Hodláte odstranit kontakt obsahující %s a %d jiné kamarády ze svého "
-"seznamu kamarádů. Chcete pokračovat?"
-msgstr[2] ""
-"Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
-"seznamu kamarádů. Chcete pokračovat?"
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:890
+msgid "Extended Address"
+msgstr "Rozšířená adresa"
 
-#: ../src/gtkdialogs.c:893
-msgid "Remove Contact"
-msgstr "Odstranit kontakt"
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:898
+msgid "Locality"
+msgstr "Lokalita"
 
-#: ../src/gtkdialogs.c:894
-msgid "_Remove Contact"
-msgstr "_Odstranit kontakt"
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:902
+msgid "Region"
+msgstr "Region"
 
-#: ../src/gtkdialogs.c:945
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"Hodláte odstranit skupinu %s a všechny její členy ze svého seznamu kamarádů. "
-"Chcete pokračovat?"
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:906
+msgid "Postal Code"
+msgstr "PSČ"
 
-#: ../src/gtkdialogs.c:948
-msgid "Remove Group"
-msgstr "Odstranit skupinu"
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
+msgid "Country"
+msgstr "Země"
 
-#: ../src/gtkdialogs.c:949
-msgid "_Remove Group"
-msgstr "_Odstranit skupinu"
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
+msgid "Telephone"
+msgstr "Telefon"
 
-#: ../src/gtkdialogs.c:982
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Hodláte odstranit %s ze svého seznamu kamarádů. Chcete pokračovat?"
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:963
+msgid "Organization Name"
+msgstr "Název organizace"
 
-#: ../src/gtkdialogs.c:985
-msgid "Remove Buddy"
-msgstr "Odstranit kamaráda"
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:967
+msgid "Organization Unit"
+msgstr "Jednotka organizace"
 
-#: ../src/gtkdialogs.c:986
-msgid "_Remove Buddy"
-msgstr "_Odstranit kamaráda"
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:976
+msgid "Role"
+msgstr "Role"
 
-#: ../src/gtkdialogs.c:1007
-#, c-format
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3742
+msgid "Birthday"
+msgstr "Datum narození"
+
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkprefs.c:738
+msgid "Description"
+msgstr "Popis"
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
+msgid "Edit XMPP vCard"
+msgstr "Upravit vCard XMPP"
+
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
 msgstr ""
-"Hodláte odstranit chat %s ze svého seznamu kamarádů. Chcete pokračovat?"
+"Všechny údaje níže jsou nepovinné. Zadejte jen ty informace, které chcete."
 
-#: ../src/gtkdialogs.c:1010
-msgid "Remove Chat"
-msgstr "Odstranit chat"
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
+msgid "Client"
+msgstr "Klient"
+
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
+msgid "Operating System"
+msgstr "Operační systém"
+
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:859
+msgid "Resource"
+msgstr "Zdroj"
 
-#: ../src/gtkdialogs.c:1011
-msgid "_Remove Chat"
-msgstr "_Odstranit chat"
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+msgid "Priority"
+msgstr "Priorita"
 
-#: ../src/gtkft.c:139
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Middle Name"
+msgstr "Prostřední jméno"
 
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
-msgid "Finished"
-msgstr "Dokončeno"
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
+msgid "Address"
+msgstr "Adresa"
 
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
-msgid "Canceled"
-msgstr "Zrušeno"
+#: ../libpurple/protocols/jabber/buddy.c:886
+msgid "P.O. Box"
+msgstr "P.O. Box"
 
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
-msgid "Waiting for transfer to begin"
-msgstr "Čekám na začátek přenosu..."
+#: ../libpurple/protocols/jabber/buddy.c:1000
+msgid "Photo"
+msgstr "Foto"
 
-#: ../src/gtkft.c:219
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Přijímám jako:</b>"
+#: ../libpurple/protocols/jabber/buddy.c:1000
+msgid "Logo"
+msgstr "Logo"
 
-#: ../src/gtkft.c:221
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Přijímám od:</b>"
+#: ../libpurple/protocols/jabber/buddy.c:1409
+msgid "Un-hide From"
+msgstr "Zrušit skrytí Od"
 
-#: ../src/gtkft.c:225
-msgid "<b>Sending To:</b>"
-msgstr "<b>Odesílám k:</b>"
+#: ../libpurple/protocols/jabber/buddy.c:1413
+msgid "Temporarily Hide From"
+msgstr "Dočasně skrýt Od"
 
-#: ../src/gtkft.c:227
-msgid "<b>Sending As:</b>"
-msgstr "<b>Odesílám jako:</b>"
+#. && NOT ME
+#: ../libpurple/protocols/jabber/buddy.c:1421
+msgid "Cancel Presence Notification"
+msgstr "Zrušit upozornění na přítomnosti"
 
-#: ../src/gtkft.c:443
-msgid "There is no application configured to open this type of file."
-msgstr "Pro otevírání tohoto typu souborů není nastavena žádná aplikace."
+#: ../libpurple/protocols/jabber/buddy.c:1428
+msgid "(Re-)Request authorization"
+msgstr "(Znovu) vyžádat autorizaci"
 
-#: ../src/gtkft.c:448
-msgid "An error occurred while opening the file."
-msgstr "Při otevírání souboru došlo k chybě."
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: ../libpurple/protocols/jabber/buddy.c:1437
+msgid "Unsubscribe"
+msgstr "Odhlásit"
 
-#: ../src/gtkft.c:485
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Chyba při spouštění %s: %s"
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1243
+msgid "Chatty"
+msgstr "Chatty"
 
-#: ../src/gtkft.c:494
-#, c-format
-msgid "Error running %s"
-msgstr "Chyba při spouštění %s"
+#: ../libpurple/protocols/jabber/buddy.c:1474
+msgid "Extended Away"
+msgstr "Pryč na dlouho"
 
-#: ../src/gtkft.c:495
-#, c-format
-msgid "Process returned error code %d"
-msgstr "Proces vrátil kód chyby %d"
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
+msgid "Do Not Disturb"
+msgstr "Nerušit"
 
-#: ../src/gtkft.c:589
-msgid "Progress"
-msgstr "Průběh"
+#: ../libpurple/protocols/jabber/buddy.c:1621
+msgid "JID"
+msgstr "JID"
+
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3704
+msgid "Last Name"
+msgstr "Příjmení"
 
-#: ../src/gtkft.c:596
-msgid "Filename"
-msgstr "Název souboru"
+#: ../libpurple/protocols/jabber/buddy.c:1657
+msgid "The following are the results of your search"
+msgstr "Výsledky vašeho hledání jsou následující"
 
-#: ../src/gtkft.c:603
-msgid "Size"
-msgstr "Velikost"
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libpurple/protocols/jabber/buddy.c:1732
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr "Hledejte kontakt zadáním kritérií hledání do daných políček. Poznámka: Všechna pole podporují hledání se zástupnými znaky (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:1752
+msgid "Directory Query Failed"
+msgstr "Hledání v adresáři selhalo"
+
+#: ../libpurple/protocols/jabber/buddy.c:1753
+msgid "Could not query the directory server."
+msgstr "Nemohu se ptát serveru adresáře."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libpurple/protocols/jabber/buddy.c:1787
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Instrukce od serveru: %s"
+
+#: ../libpurple/protocols/jabber/buddy.c:1794
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Hledejte odpovídající uživatele XMPP vyplněním jedno nebo více polí."
+
+#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
+msgid "E-Mail Address"
+msgstr "E-mailová adresa"
 
-#: ../src/gtkft.c:610
-msgid "Remaining"
-msgstr "Zbývá"
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
+msgid "Search for XMPP users"
+msgstr "Hledat uživatele XMPP"
 
-#: ../src/gtkft.c:641
-msgid "Filename:"
-msgstr "Název souboru:"
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+msgid "Search"
+msgstr "Hledat"
 
-#: ../src/gtkft.c:642
-msgid "Local File:"
-msgstr "Místní soubor:"
+#: ../libpurple/protocols/jabber/buddy.c:1840
+msgid "Invalid Directory"
+msgstr "Neplatný adresář"
 
-#: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "Stav:"
+#: ../libpurple/protocols/jabber/buddy.c:1857
+msgid "Enter a User Directory"
+msgstr "Zadejte adresář uživatelů"
 
-#: ../src/gtkft.c:644
-msgid "Speed:"
-msgstr "Rychlost:"
+#: ../libpurple/protocols/jabber/buddy.c:1858
+msgid "Select a user directory to search"
+msgstr "Zvolte adresář uživatelů, ve kterém hledat"
 
-#: ../src/gtkft.c:645
-msgid "Time Elapsed:"
-msgstr "Využitý čas:"
+#: ../libpurple/protocols/jabber/buddy.c:1861
+msgid "Search Directory"
+msgstr "Hledat v adresáři"
 
-#: ../src/gtkft.c:646
-msgid "Time Remaining:"
-msgstr "Zbývající čas:"
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+msgid "_Room:"
+msgstr "_Místnost:"
 
-#: ../src/gtkft.c:708
-msgid "File Transfers"
-msgstr "Přenosy souborů"
+#: ../libpurple/protocols/jabber/chat.c:47
+msgid "_Server:"
+msgstr "_Server:"
 
-#: ../src/gtkft.c:731
-msgid "Close this window when all transfers _finish"
-msgstr "Zavřít toto okno, až všechny přenosy _skončí"
+#: ../libpurple/protocols/jabber/chat.c:53
+msgid "_Handle:"
+msgstr "_Přezdívka:"
 
-#: ../src/gtkft.c:741
-msgid "C_lear finished transfers"
-msgstr "_Vymazat dokončené přenosy"
+#: ../libpurple/protocols/jabber/chat.c:223
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s není platný název místnosti"
 
-#. "Download Details" arrow
-#: ../src/gtkft.c:750
-msgid "File transfer _details"
-msgstr "_Podrobnosti o přenosu souboru"
+#: ../libpurple/protocols/jabber/chat.c:224
+msgid "Invalid Room Name"
+msgstr "Neplatný název místnosti"
 
-#. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "_Pozastavit"
+#: ../libpurple/protocols/jabber/chat.c:229
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s není platný název serveru"
 
-#. Resume button
-#: ../src/gtkft.c:790
-msgid "_Resume"
-msgstr "_Pokračovat"
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
+msgid "Invalid Server Name"
+msgstr "Neplatný název serveru"
 
-#: ../src/gtkft.c:1005
-msgid "Failed"
-msgstr "Selhalo"
+#: ../libpurple/protocols/jabber/chat.c:235
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s není platná přezdívka místnosti"
 
-#: ../src/gtkimhtml.c:821
-msgid "Paste as Plain _Text"
-msgstr "Vložit _jako text"
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
+msgid "Invalid Room Handle"
+msgstr "Neplatná přezdívka místnosti"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Vymazat formátování"
+#: ../libpurple/protocols/jabber/chat.c:396
+msgid "Configuration error"
+msgstr "Chyba nastavení"
 
-#: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Barva odkazu"
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
+msgid "Unable to configure"
+msgstr "Nemohu nastavit"
 
-#: ../src/gtkimhtml.c:1329
-msgid "Color to draw hyperlinks."
-msgstr "Barva, kterou kreslit odkazy."
+#: ../libpurple/protocols/jabber/chat.c:420
+msgid "Room Configuration Error"
+msgstr "Chyba nastavení místnosti"
 
-#: ../src/gtkimhtml.c:1332
-msgid "Hyperlink prelight color"
-msgstr "Barva zvýraznění odkazu"
+#: ../libpurple/protocols/jabber/chat.c:421
+msgid "This room is not capable of being configured"
+msgstr "Tuto místnost není možné nastavovat"
 
-#: ../src/gtkimhtml.c:1333
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Barva, kterou kreslit odkazy, když je nad nimi myš."
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
+msgid "Registration error"
+msgstr "Chyba registrace"
 
-#: ../src/gtkimhtml.c:1554
-msgid "_Copy E-Mail Address"
-msgstr "_Kopírovat e-mailovou adresu"
+#: ../libpurple/protocols/jabber/chat.c:627
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "Změna přezdívky není podporována v ne-MUC místnostech"
 
-#: ../src/gtkimhtml.c:1566
-msgid "_Open Link in Browser"
-msgstr "_Otevřít odkaz v prohlížeči"
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
+msgid "Error retrieving room list"
+msgstr "Chyba při získávání seznamu místností"
 
-#: ../src/gtkimhtml.c:1576
-msgid "_Copy Link Location"
-msgstr "_Kopírovat adresu odkazu"
+#: ../libpurple/protocols/jabber/chat.c:737
+msgid "Invalid Server"
+msgstr "Neplatný server"
 
-#: ../src/gtkimhtml.c:3273
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Nerozpoznaný typ souboru</span>\n"
-"\n"
-"Používám PNG."
+#: ../libpurple/protocols/jabber/chat.c:781
+msgid "Enter a Conference Server"
+msgstr "Zadejte server konference"
 
-#: ../src/gtkimhtml.c:3276
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nerozpoznaný typ souboru\n"
-"\n"
-"Používám PNG."
+#: ../libpurple/protocols/jabber/chat.c:782
+msgid "Select a conference server to query"
+msgstr "Zvolte server konference, kterého se ptát"
 
-#: ../src/gtkimhtml.c:3289
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Chyba při ukládání obrázku</span>\n"
-"\n"
-"%s"
+#: ../libpurple/protocols/jabber/chat.c:785
+msgid "Find Rooms"
+msgstr "Hledat místnosti"
+
+#: ../libpurple/protocols/jabber/jabber.c:84
+msgid "Error initializing session"
+msgstr "Chyba při inicializaci sezení"
+
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
+msgid "Write error"
+msgstr "Chyba zápisu"
+
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
+msgid "Read Error"
+msgstr "Chyba čtení"
 
-#: ../src/gtkimhtml.c:3292
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
-"Error saving image\n"
-"\n"
+"Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
-"Chyba při ukládání obrázku\n"
-"\n"
+"Nemohu navázat spojení se serverem:\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
-msgid "Save Image"
-msgstr "Uložit obrázek"
+#: ../libpurple/protocols/jabber/jabber.c:514
+msgid "Unable to create socket"
+msgstr "Nemohu vytvořit socket"
 
-#: ../src/gtkimhtml.c:3412
-msgid "_Save Image..."
-msgstr "_Uložit obrázek..."
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
+msgid "Invalid XMPP ID"
+msgstr "Neplatné ID XMPP"
+
+#: ../libpurple/protocols/jabber/jabber.c:564
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Neplatné ID XMPP. Musí být nastavena doména."
 
-#: ../src/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Vyberte písmo"
+#: ../libpurple/protocols/jabber/jabber.c:635
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "Registrace %s@%s úspěšná"
 
-#: ../src/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Vyberte barvu textu"
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
+msgid "Registration Successful"
+msgstr "Registrace úspěšná"
 
-#: ../src/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Vyberte barvu pozadí"
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
+msgid "Unknown Error"
+msgstr "Neznámá chyba"
 
-#: ../src/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
+msgid "Registration Failed"
+msgstr "Registrace selhala"
 
-#: ../src/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Popis"
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
+msgid "Already Registered"
+msgstr "Již zaregistrován"
 
-#: ../src/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Zadejte prosím URL a popis odkazu, který chcete vložit. Popis je nepovinný."
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
+msgid "State"
+msgstr "Stát"
 
-#: ../src/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Zadejte prosím URL odkazu, který chcete vložit."
+#: ../libpurple/protocols/jabber/jabber.c:844
+msgid "Postal code"
+msgstr "PSČ"
 
-#: ../src/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Vložit odkaz"
+#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
+msgid "Phone"
+msgstr "Telefon"
 
-#: ../src/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Vložit"
+#: ../libpurple/protocols/jabber/jabber.c:859
+msgid "Date"
+msgstr "Datum"
 
-#: ../src/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Nemohu uložit obrázek: %s\n"
+#: ../libpurple/protocols/jabber/jabber.c:867
+msgid "Please fill out the information below to register your new account."
+msgstr "Pro zaregistrování vašeho nového účtu prosím vyplňte informace níže."
 
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Vložit obrázek"
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
+msgid "Register New XMPP Account"
+msgstr "Zaregistrovat nový účet XMPP"
 
-#: ../src/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "V tomto tématu nejsou k dispozici smajlíky."
+#: ../libpurple/protocols/jabber/jabber.c:872
+msgid "Register"
+msgstr "Registrovat"
 
-#. show everything
-#: ../src/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Úsměv!"
+#: ../libpurple/protocols/jabber/jabber.c:1041
+msgid "Initializing Stream"
+msgstr "Inicializuji proud"
 
-#: ../src/gtkimhtmltoolbar.c:923
-msgid "Bold"
-msgstr "Tučné"
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:351
+msgid "Authenticating"
+msgstr "Autentizuji"
 
-#: ../src/gtkimhtmltoolbar.c:934
-msgid "Italic"
-msgstr "Kurzíva"
+#: ../libpurple/protocols/jabber/jabber.c:1055
+msgid "Re-initializing Stream"
+msgstr "Reinicializuji proud"
 
-#: ../src/gtkimhtmltoolbar.c:945
-msgid "Underline"
-msgstr "Podtržené"
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
+msgid "Not Authorized"
+msgstr "Neautorizován"
 
-#: ../src/gtkimhtmltoolbar.c:961
-msgid "Larger font size"
-msgstr "Větší velikost písma"
-
-#: ../src/gtkimhtmltoolbar.c:973
-msgid "Smaller font size"
-msgstr "Menší velikost písma"
+#: ../libpurple/protocols/jabber/jabber.c:1159
+msgid "Both"
+msgstr "Obojí"
 
-#: ../src/gtkimhtmltoolbar.c:990
-msgid "Font Face"
-msgstr "Řez písma"
+#: ../libpurple/protocols/jabber/jabber.c:1161
+msgid "From (To pending)"
+msgstr "Z (do čeká)"
 
-#: ../src/gtkimhtmltoolbar.c:1002
-msgid "Foreground font color"
-msgstr "Barva pozadí písma"
+#: ../libpurple/protocols/jabber/jabber.c:1163
+msgid "From"
+msgstr "Z"
 
-#: ../src/gtkimhtmltoolbar.c:1014
-msgid "Background color"
-msgstr "Barva pozadí"
+#: ../libpurple/protocols/jabber/jabber.c:1166
+msgid "To"
+msgstr "Do"
 
-#: ../src/gtkimhtmltoolbar.c:1045
-msgid "Insert link"
-msgstr "Vložit odkaz"
+#: ../libpurple/protocols/jabber/jabber.c:1168
+msgid "None (To pending)"
+msgstr "Žádné (do čeká)"
 
-#: ../src/gtkimhtmltoolbar.c:1055
-msgid "Insert image"
-msgstr "Vložit obrázek"
+#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Žádné"
 
-#: ../src/gtkimhtmltoolbar.c:1066
-msgid "Insert smiley"
-msgstr "Vložit smajlík"
+#: ../libpurple/protocols/jabber/jabber.c:1173
+msgid "Subscription"
+msgstr "Přihlášení"
 
-#: ../src/gtklog.c:202
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Konverzace v %s v %s</span>"
+#: ../libpurple/protocols/jabber/jabber.c:1303
+msgid "Password Changed"
+msgstr "Heslo změněno"
 
-#: ../src/gtklog.c:207
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Konverzace s %s v %s</span>"
+#: ../libpurple/protocols/jabber/jabber.c:1304
+msgid "Your password has been changed."
+msgstr "Vaše heslo bylo změněno."
 
-#: ../src/gtklog.c:258
-msgid "%B %Y"
-msgstr "%B %Y"
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
+msgid "Error changing password"
+msgstr "Chyba při změně hesla"
 
-#: ../src/gtklog.c:311
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr "Systémový události budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny změny stavu do systémového záznamu\"."
+#: ../libpurple/protocols/jabber/jabber.c:1366
+msgid "Password (again)"
+msgstr "Heslo (znovu)"
 
-#: ../src/gtklog.c:315
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr "Instant message budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny instant message\"."
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
+msgid "Change XMPP Password"
+msgstr "Změnit heslo XMPP"
 
-#: ../src/gtklog.c:318
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Chaty budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat všechny chaty\"."
+#: ../libpurple/protocols/jabber/jabber.c:1373
+msgid "Please enter your new password"
+msgstr "Zadejte prosím své nové heslo"
 
-#: ../src/gtklog.c:322
-msgid "No logs were found"
-msgstr "Nebyly nalezeny žádné záznamy"
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
+msgid "Set User Info..."
+msgstr "Nastavit informace o uživateli..."
 
-#: ../src/gtklog.c:398
-msgid "Total log size:"
-msgstr "Celková velikost záznamu:"
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
+msgid "Change Password..."
+msgstr "Změnit heslo..."
 
-#: ../src/gtklog.c:474
-#, c-format
-msgid "Conversations in %s"
-msgstr "Konverzace v %s"
+#. }
+#: ../libpurple/protocols/jabber/jabber.c:1395
+msgid "Search for Users..."
+msgstr "Hledat uživatele..."
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
-#, c-format
-msgid "Conversations with %s"
-msgstr "Konverzace s %s"
+#: ../libpurple/protocols/jabber/jabber.c:1473
+msgid "Bad Request"
+msgstr "Špatný požadavek"
 
-#: ../src/gtklog.c:558
-msgid "System Log"
-msgstr "Systémový záznam"
+#: ../libpurple/protocols/jabber/jabber.c:1475
+msgid "Conflict"
+msgstr "Konflikt"
 
-#: ../src/gtkmain.c:308
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Pro více informací zkuste `%s -h'.\n"
+#: ../libpurple/protocols/jabber/jabber.c:1477
+msgid "Feature Not Implemented"
+msgstr "Funkce neimplementována"
 
-#: ../src/gtkmain.c:310
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Použití: %s [PŘEPÍNAČ]...\n"
-"\n"
-"  -c, --config=ADRESÁŘ používat adresář pro soubory s nastavením\n"
-"  -d, --debug          vypisovat ladicí zprávy na stdout\n"
-"  -h, --help           zobrazit tuto nápovědu a skončit\n"
-"  -n, --nologin        nepřihlašovat se automaticky\n"
-"  -l, --login[=NÁZEV]  automaticky se přihlásit (nepovinný parametr NÁZEV\n"
-"                       určuje účty, které použít, oddělené čárkami)\n"
-"  -v, --version        zobrazit aktuální verzi a skončit\n"
+#: ../libpurple/protocols/jabber/jabber.c:1479
+msgid "Forbidden"
+msgstr "Zakázáno"
 
-#: ../src/gtkmain.c:493
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-"Gaim spadl a pokusil se vypsat soubor core.\n"
-"Toto je chyba v programu a nestalo se to vaší\n"
-"vinou.\n"
-"\n"
-"Pokud umíte pád zopakovat, upozorněte prosím\n"
-"vývojáře gaimu ohlášením chyby na\n"
-"%sbug.php\n"
-"\n"
-"Zkontrolujte prosím, že jste popsali, co jste v té době\n"
-"dělali, a že jste poslali backtrace ze souboru core. Pokud\n"
-"nevíte, jak získat backtrace, přečtěte si prosím instrukce na\n"
-"%sgdb.php\n"
-"\n"
-"Pokud potřebujete další pomoc, prosím IM buď SeanEgn nebo\n"
-"LSchiere (pomocí AIM). Kontaktní informace pro Sean a Luka\n"
-"na jiných protokolech je na\n"
-"%scontactinfo.php\n"
+#: ../libpurple/protocols/jabber/jabber.c:1481
+msgid "Gone"
+msgstr "Pryč"
 
-#: ../src/gtknotify.c:327
-msgid "New Mail"
-msgstr "Nový e-mail"
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
+msgid "Internal Server Error"
+msgstr "Interní chyba serveru"
 
-#: ../src/gtknotify.c:343
-msgid "Open All Messages"
-msgstr "Otevřít všechny zprávy"
+#: ../libpurple/protocols/jabber/jabber.c:1485
+msgid "Item Not Found"
+msgstr "Položka nenalezena"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
-msgid "From"
-msgstr "Z"
+#: ../libpurple/protocols/jabber/jabber.c:1487
+msgid "Malformed XMPP ID"
+msgstr "Neplatné ID XMPP"
 
-#: ../src/gtknotify.c:418
-msgid "Subject"
-msgstr "Předmět"
+#: ../libpurple/protocols/jabber/jabber.c:1489
+msgid "Not Acceptable"
+msgstr "Nepřijatelné"
 
-#: ../src/gtknotify.c:427
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+#: ../libpurple/protocols/jabber/jabber.c:1491
+msgid "Not Allowed"
+msgstr "Nepovoleno"
 
-#: ../src/gtknotify.c:493
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s má %d novou zprávu."
-msgstr[1] "%s má %d nové zprávy."
-msgstr[2] "%s má %d nových zpráv."
+#: ../libpurple/protocols/jabber/jabber.c:1495
+msgid "Payment Required"
+msgstr "Je vyžadována platba"
 
-#: ../src/gtknotify.c:498
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Máte poštu!</span>\n"
-"\n"
-"%s"
+#: ../libpurple/protocols/jabber/jabber.c:1497
+msgid "Recipient Unavailable"
+msgstr "Příjemce nedostupný"
 
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
-msgid "Search Results"
-msgstr "Výsledky hledání"
+#: ../libpurple/protocols/jabber/jabber.c:1501
+msgid "Registration Required"
+msgstr "Je vyžadována registrace"
 
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
-#, c-format
-msgid "Info for %s"
-msgstr "Informace pro %s"
+#: ../libpurple/protocols/jabber/jabber.c:1503
+msgid "Remote Server Not Found"
+msgstr "Vzdálený server nenalezen"
 
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Informace o kamarádovi"
+#: ../libpurple/protocols/jabber/jabber.c:1505
+msgid "Remote Server Timeout"
+msgstr "Vzdálenému serveru vypršel čas"
 
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Příkaz prohlížeče <b>%s</b> není platný."
+#: ../libpurple/protocols/jabber/jabber.c:1507
+msgid "Server Overloaded"
+msgstr "Server přetížen"
 
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
-#: ../src/gtknotify.c:1034
-msgid "Unable to open URL"
-msgstr "Nemohu otevřít URL"
+#: ../libpurple/protocols/jabber/jabber.c:1509
+msgid "Service Unavailable"
+msgstr "Služba nedostupná"
 
-#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Chyba při spouštění <b>%s</b>: %s"
+#: ../libpurple/protocols/jabber/jabber.c:1511
+msgid "Subscription Required"
+msgstr "Vyžadováno přihlášení"
 
-#: ../src/gtknotify.c:1035
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Byl zvolen 'Ruční' příkaz prohlížeče, ale nebyl nastaven žádný příkaz."
+#: ../libpurple/protocols/jabber/jabber.c:1513
+msgid "Unexpected Request"
+msgstr "Neočekávaný požadavek"
 
-#: ../src/gtkplugin.c:275
-msgid "The following plugins will be unloaded."
-msgstr "Následující zásuvné moduly budou odebrány."
+#: ../libpurple/protocols/jabber/jabber.c:1520
+msgid "Authorization Aborted"
+msgstr "Autorizace přerušena"
 
-#: ../src/gtkplugin.c:294
-msgid "Multiple plugins will be unloaded."
-msgstr "Několik zásuvných modulů bude odebráno."
+#: ../libpurple/protocols/jabber/jabber.c:1522
+msgid "Incorrect encoding in authorization"
+msgstr "Neplatné kódování v autorizaci"
 
-#: ../src/gtkplugin.c:296
-msgid "Unload Plugins"
-msgstr "Odebrat zásuvné moduly"
+#: ../libpurple/protocols/jabber/jabber.c:1525
+msgid "Invalid authzid"
+msgstr "Neplatné autzid"
 
-#: ../src/gtkplugin.c:410
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Napsal:</span>\t%s\n"
-"<span weight=\"bold\">WWW stránka:</span>\t\t%s\n"
-"<span weight=\"bold\">Název souboru:</span>\t%s"
-
-#: ../src/gtkplugin.c:420
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Chyba: %s\n"
-"Hledejte aktualizaci na WWW zásuvného modulu.</span>"
-
-#: ../src/gtkplugin.c:546
-msgid "Configure Pl_ugin"
-msgstr "Nastavit zásuvný _modul"
-
-#: ../src/gtkplugin.c:604
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Podrobnosti o zásuvném modulu</b>"
-
-#: ../src/gtkpounce.c:162
-msgid "Select a file"
-msgstr "Zvolte soubor"
-
-#: ../src/gtkpounce.c:259
-msgid "Please enter a buddy to pounce."
-msgstr "Zadejte prosím kamaráda, kterého sledovat."
+#: ../libpurple/protocols/jabber/jabber.c:1528
+msgid "Invalid Authorization Mechanism"
+msgstr "Neplatný mechanismus autorizace"
 
-#: ../src/gtkpounce.c:503
-msgid "New Buddy Pounce"
-msgstr "Nové sledování kamaráda"
+#: ../libpurple/protocols/jabber/jabber.c:1531
+msgid "Authorization mechanism too weak"
+msgstr "Mechanismus autorizace příliš slabý"
 
-#: ../src/gtkpounce.c:503
-msgid "Edit Buddy Pounce"
-msgstr "Upravit sledování kamaráda"
+#: ../libpurple/protocols/jabber/jabber.c:1536
+msgid "Temporary Authentication Failure"
+msgstr "Dočasné selhání autentizace"
 
-#. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
-msgid "Pounce on Whom"
-msgstr "Sledovat koho"
+#: ../libpurple/protocols/jabber/jabber.c:1539
+msgid "Authentication Failure"
+msgstr "Selhání autentizace"
 
-#: ../src/gtkpounce.c:547
-msgid "_Buddy name:"
-msgstr "_Jméno kamaráda:"
+#: ../libpurple/protocols/jabber/jabber.c:1545
+msgid "Bad Format"
+msgstr "Špatný formát"
 
-#. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
-msgid "Pounce When Buddy..."
-msgstr "Sledovat když kamarád..."
+#: ../libpurple/protocols/jabber/jabber.c:1547
+msgid "Bad Namespace Prefix"
+msgstr "Špatná předpona prostoru jmen"
 
-#: ../src/gtkpounce.c:581
-msgid "Si_gns on"
-msgstr "_Přihlásí se"
+#: ../libpurple/protocols/jabber/jabber.c:1550
+msgid "Resource Conflict"
+msgstr "Konflikt zdrojů"
 
-#: ../src/gtkpounce.c:583
-msgid "Signs o_ff"
-msgstr "_Odhlásí se"
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
+msgid "Connection Timeout"
+msgstr "Spojení vypršel čas"
 
-#: ../src/gtkpounce.c:585
-msgid "Goes a_way"
-msgstr "Jde _pryč"
+#: ../libpurple/protocols/jabber/jabber.c:1554
+msgid "Host Gone"
+msgstr "Počítač zmizel"
 
-#: ../src/gtkpounce.c:587
-msgid "Ret_urns from away"
-msgstr "_Vrátí se z nepřítomnosti"
+#: ../libpurple/protocols/jabber/jabber.c:1556
+msgid "Host Unknown"
+msgstr "Neznámý počítač"
 
-#: ../src/gtkpounce.c:589
-msgid "Becomes _idle"
-msgstr "Stane se _nečinným"
+#: ../libpurple/protocols/jabber/jabber.c:1558
+msgid "Improper Addressing"
+msgstr "Nesprávné adresování"
 
-#: ../src/gtkpounce.c:591
-msgid "Is no longer i_dle"
-msgstr "Už není ne_činný."
+#: ../libpurple/protocols/jabber/jabber.c:1562
+msgid "Invalid ID"
+msgstr "Neplatné ID"
 
-#: ../src/gtkpounce.c:593
-msgid "Starts _typing"
-msgstr "Začne _psát"
+#: ../libpurple/protocols/jabber/jabber.c:1564
+msgid "Invalid Namespace"
+msgstr "Neplatný prostor jmen"
 
-#: ../src/gtkpounce.c:595
-msgid "Stops t_yping"
-msgstr "Přestane p_sát"
+#: ../libpurple/protocols/jabber/jabber.c:1566
+msgid "Invalid XML"
+msgstr "Neplatné XML"
 
-#: ../src/gtkpounce.c:597
-msgid "Sends a _message"
-msgstr "Odešle _zprávu"
+#: ../libpurple/protocols/jabber/jabber.c:1568
+msgid "Non-matching Hosts"
+msgstr "Neodpovídající počítače"
 
-#. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
-msgid "Action"
-msgstr "Akce"
+#: ../libpurple/protocols/jabber/jabber.c:1572
+msgid "Policy Violation"
+msgstr "Porušení pravidel"
 
-#: ../src/gtkpounce.c:637
-msgid "Ope_n an IM window"
-msgstr "_Otevřít okno IM"
+#: ../libpurple/protocols/jabber/jabber.c:1574
+msgid "Remote Connection Failed"
+msgstr "Selhalo vzdálené připojení"
 
-#: ../src/gtkpounce.c:639
-msgid "_Pop up a notification"
-msgstr "Zobrazit _upozornění"
+#: ../libpurple/protocols/jabber/jabber.c:1576
+msgid "Resource Constraint"
+msgstr "Omezení zdrojů"
 
-#: ../src/gtkpounce.c:641
-msgid "Send a _message"
-msgstr "Odeslat _zprávu"
+#: ../libpurple/protocols/jabber/jabber.c:1578
+msgid "Restricted XML"
+msgstr "Omezené XML"
 
-#: ../src/gtkpounce.c:643
-msgid "E_xecute a command"
-msgstr "Spustit _příkaz"
+#: ../libpurple/protocols/jabber/jabber.c:1580
+msgid "See Other Host"
+msgstr "Zobrazit druhý počítač"
 
-#: ../src/gtkpounce.c:645
-msgid "P_lay a sound"
-msgstr "Pře_hrát zvuk"
+#: ../libpurple/protocols/jabber/jabber.c:1582
+msgid "System Shutdown"
+msgstr "Vypnutí systému"
 
-#: ../src/gtkpounce.c:650
-msgid "Brows_e..."
-msgstr "_Procházet..."
+#: ../libpurple/protocols/jabber/jabber.c:1584
+msgid "Undefined Condition"
+msgstr "Nedefinovaná podmínka"
 
-#: ../src/gtkpounce.c:652
-msgid "Br_owse..."
-msgstr "_Procházet..."
+#: ../libpurple/protocols/jabber/jabber.c:1586
+msgid "Unsupported Encoding"
+msgstr "Nepodporované kódování"
 
-#: ../src/gtkpounce.c:653
-msgid "Pre_view"
-msgstr "Ná_hled"
+#: ../libpurple/protocols/jabber/jabber.c:1588
+msgid "Unsupported Stanza Type"
+msgstr "Nepodporovaný typ stanza"
 
-#. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
-msgid "Options"
-msgstr "Možnosti"
+#: ../libpurple/protocols/jabber/jabber.c:1590
+msgid "Unsupported Version"
+msgstr "Nepodporovaná verze"
 
-#: ../src/gtkpounce.c:773
-msgid "P_ounce only when my status is not available"
-msgstr "_Sledovat, jen když můj stav je nejsem k dispozici"
+#: ../libpurple/protocols/jabber/jabber.c:1592
+msgid "XML Not Well Formed"
+msgstr "XML není well-formed"
 
-#: ../src/gtkpounce.c:778
-msgid "_Recurring"
-msgstr "_Opakující se"
+#: ../libpurple/protocols/jabber/jabber.c:1594
+msgid "Stream Error"
+msgstr "Chyba proudu"
 
-#: ../src/gtkpounce.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Opravdu že chcete odstranit sledování %s pro %s?"
-
-#: ../src/gtkpounce.c:1240
-msgid "Pounce Target"
-msgstr "Cíl sledování"
-
-#: ../src/gtkpounce.c:1275
-msgid "Recurring"
-msgstr "Opakující se"
-
-#: ../src/gtkpounce.c:1322
-msgid "Buddy Pounces"
-msgstr "Sledování kamarádů"
+msgid "Unable to ban user %s"
+msgstr "Nemohu zakázat uživatele %s"
 
-#: ../src/gtkpounce.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s vám začal psát (%s)"
+msgid "Unknown affiliation: \"%s\""
+msgstr "Neznámý vztah: \"%s\""
 
-#: ../src/gtkpounce.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s se přihlásil (%s)"
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "Nemohu nastavit vztah uživatele %s na \"%s\""
 
-#: ../src/gtkpounce.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s se vrátil z nečinnosti (%s)"
+msgid "Unknown role: \"%s\""
+msgstr "Neznámá role: \"%s\""
 
-#: ../src/gtkpounce.c:1455
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s se vrátil z nepřítomnosti (%s)"
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Nemohu nastavit roli \"%s\" uživateli: %s"
 
-#: ../src/gtkpounce.c:1457
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s vám přestal psát (%s)"
+msgid "Unable to kick user %s"
+msgstr "Nemohu vykopnout uživatele %s"
 
-#: ../src/gtkpounce.c:1459
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s se odhlásil (%s)"
+#: ../libpurple/protocols/jabber/jabber.c:1813
+msgid "config:  Configure a chat room."
+msgstr "config: Nastavit místnost chatu."
 
-#: ../src/gtkpounce.c:1461
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s se stal nečinným (%s)"
+#: ../libpurple/protocols/jabber/jabber.c:1817
+msgid "configure:  Configure a chat room."
+msgstr "configure: Nastavit místnost chatu."
 
-#: ../src/gtkpounce.c:1463
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s šel pryč. (%s)"
+#: ../libpurple/protocols/jabber/jabber.c:1826
+msgid "part [room]:  Leave the room."
+msgstr "part [místnost]: Opustit místnost."
 
-#: ../src/gtkpounce.c:1465
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s vám poslal zprávu. (%s)"
+#: ../libpurple/protocols/jabber/jabber.c:1831
+msgid "register:  Register with a chat room."
+msgstr "register: Zaregistrovat se u místnosti chatu."
 
-#: ../src/gtkpounce.c:1466
-msgid "Unknown pounce event. Please report this!"
-msgstr "Neznámá událost sledování. Oznamte to prosím!"
+#: ../libpurple/protocols/jabber/jabber.c:1837
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [nové téma]: Zobrazit nebo změnit téma."
 
-#: ../src/gtkprefs.c:512
-msgid "Smiley theme failed to unpack."
-msgstr "Téma smajlíků nelze rozbalit."
+#: ../libpurple/protocols/jabber/jabber.c:1843
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr ""
+"ban &lt;uživatel&gt; [místnost]: Zakázat uživateli přístup do místnosti."
 
-#: ../src/gtkprefs.c:638
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
 msgstr ""
-"Vyberte téma smajlíků, které chcete používat, ze seznamu níže. Nová témata "
-"mohou být nainstalována jejich přetažením do seznamu témat."
+"affiliate &lt;uživatel&gt; &lt;owner|admin|member|outcast|none&gt;: Nastavit "
+"uživatelův vztah k místnosti."
 
-#: ../src/gtkprefs.c:673
-msgid "Icon"
-msgstr "Ikona"
+#: ../libpurple/protocols/jabber/jabber.c:1855
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;uživatel&gt; &lt;moderator|participant|visitor|none&gt;: Nastavit "
+"uživatelovu roli v místnosti."
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "Popis"
+#: ../libpurple/protocols/jabber/jabber.c:1861
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "invite &lt;uživatel&gt; [zpráva]: Pozvat uživatele do místnosti."
 
-#: ../src/gtkprefs.c:821
-msgid "_Hide new IM conversations"
-msgstr "_Skrýt nové konverzace IM"
+#: ../libpurple/protocols/jabber/jabber.c:1867
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr ""
+"join: &lt;místnost&gt; [server]: Připojit se k diskusi na tomto serveru."
 
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
-msgid "When away"
-msgstr "Při nepřítomnosti"
+#: ../libpurple/protocols/jabber/jabber.c:1873
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "kick &lt;uživatel&gt; [místnost]: Vykopnout uživatele z místnosti."
 
-#: ../src/gtkprefs.c:828
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Odesílat neznámé příkazy s \"_lomítkem\" jako zprávy"
+#: ../libpurple/protocols/jabber/jabber.c:1878
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;uživatel&gt; &lt;zpráva&gt;: Poslat soukromou zprávu jinému "
+"uživateli."
 
-#: ../src/gtkprefs.c:830
-msgid "Show _formatting on incoming messages"
-msgstr "Zobrazovat _Formátování u příchozích zpráv"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
+msgid "XMPP Protocol Plugin"
+msgstr "Zásuvný modul protokolu XMPP"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:506
+msgid "Domain"
+msgstr "Doména"
 
-#: ../src/gtkprefs.c:833
-msgid "Show buddy _icons"
-msgstr "Zobrazovat _ikony kamarádů"
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+msgid "Force old (port 5223) SSL"
+msgstr "Vnutit staré SSL (port 5223)"
 
-#: ../src/gtkprefs.c:835
-msgid "Enable buddy ic_on animation"
-msgstr "Povolit _animaci ikon kamarádů"
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
 
-#: ../src/gtkprefs.c:842
-msgid "_Notify buddies that you are typing to them"
-msgstr "Upozorňovat kamarády, že jim _píšete"
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3276
+#: ../libpurple/protocols/simple/simple.c:1862
+msgid "Connect port"
+msgstr "Port spojení"
 
-#: ../src/gtkprefs.c:845
-msgid "Highlight _misspelled words"
-msgstr "Z_výrazňovat slova s překlepy"
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+msgid "Connect server"
+msgstr "Server spojení"
 
-#: ../src/gtkprefs.c:849
-msgid "Use smooth-scrolling"
-msgstr "Používat hladké posouvání"
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s opustil konverzaci."
 
-#: ../src/gtkprefs.c:865
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Takto bude vypadat text vaší odchozí zprávy, pokud používáte protokoly, "
-"které podporují formátování. :)"
+#: ../libpurple/protocols/jabber/message.c:153
+#, c-format
+msgid "Message from %s"
+msgstr "Zpráva od %s"
 
-#. All the tab options!
-#: ../src/gtkprefs.c:887
-msgid "Tab Options"
-msgstr "Možnosti záložek"
+#: ../libpurple/protocols/jabber/message.c:217
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s změnil téma na: %s"
 
-#: ../src/gtkprefs.c:889
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Zobrazovat IM a chaty v oknech se zá_ložkami."
+#: ../libpurple/protocols/jabber/message.c:219
+#, c-format
+msgid "The topic is: %s"
+msgstr "Téma je: %s"
 
-#: ../src/gtkprefs.c:903
-msgid "Show close b_utton on tabs"
-msgstr "Zobrazovat na záložkách tlačítko z_avřít"
+#: ../libpurple/protocols/jabber/message.c:267
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "Doručení zprávy pro %s selhalo: %s"
 
-#: ../src/gtkprefs.c:909
-msgid "_Placement:"
-msgstr "_Umístění:"
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "Chyba zprávy XMPP"
 
-#: ../src/gtkprefs.c:911
-msgid "Top"
-msgstr "Nahoře"
+#: ../libpurple/protocols/jabber/message.c:359
+#, c-format
+msgid " (Code %s)"
+msgstr " (Kód %s)"
 
-#: ../src/gtkprefs.c:912
-msgid "Bottom"
-msgstr "Dole"
+#: ../libpurple/protocols/jabber/parser.c:193
+msgid "XML Parse error"
+msgstr "Chyba zpracování XML"
 
-#: ../src/gtkprefs.c:913
-msgid "Left"
-msgstr "Vlevo"
+#: ../libpurple/protocols/jabber/presence.c:292
+msgid "Unknown Error in presence"
+msgstr "Neznámá chyba v přítomnosti"
 
-#: ../src/gtkprefs.c:914
-msgid "Right"
-msgstr "Vpravo"
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
+msgid "Create New Room"
+msgstr "Vytvořit novou místnost"
 
-#: ../src/gtkprefs.c:916
-msgid "Left Vertical"
-msgstr "Vlevo svislé"
+#: ../libpurple/protocols/jabber/presence.c:368
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Vytváříte novou místnost. Chcete ji nastavit nebo použít implicitní "
+"nastavení?"
 
-#: ../src/gtkprefs.c:917
-msgid "Right Vertical"
-msgstr "Vpravo svislé"
+#: ../libpurple/protocols/jabber/presence.c:374
+msgid "_Configure Room"
+msgstr "_Nastavit místnost"
 
-#: ../src/gtkprefs.c:922
-msgid "N_ew conversations:"
-msgstr "_Nové konverzace:"
+#: ../libpurple/protocols/jabber/presence.c:375
+msgid "_Accept Defaults"
+msgstr "_Přijmout implicitní"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
-msgid "IP Address"
-msgstr "IP adresa"
+#: ../libpurple/protocols/jabber/presence.c:417
+#, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chatu %s"
 
-#: ../src/gtkprefs.c:975
-msgid "ST_UN server:"
-msgstr "Server ST_UN:"
+#: ../libpurple/protocols/jabber/presence.c:421
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Chyba při připojování k chatu %s"
 
-#: ../src/gtkprefs.c:977
-msgid "_Autodetect IP address"
-msgstr "_Autodetekovat IP adresu"
+#: ../libpurple/protocols/jabber/si.c:775
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "Nemohu odeslat soubor %s, uživatel nepodporuje přenosy souborů"
 
-#: ../src/gtkprefs.c:986
-msgid "Public _IP:"
-msgstr "Veřejná _IP:"
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
+msgid "File Send Failed"
+msgstr "Odeslání souboru selhalo"
 
-#: ../src/gtkprefs.c:1014
-msgid "Ports"
-msgstr "Porty"
+#: ../libpurple/protocols/jabber/si.c:838
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Nemohu odeslat zprávu k %s, neplatné JID"
 
-#: ../src/gtkprefs.c:1017
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Ručně určit rozsah portů, na kterých poslouchat"
+#: ../libpurple/protocols/jabber/si.c:840
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Nemohu odeslat soubor %s, uživatel není připojen"
 
-#: ../src/gtkprefs.c:1020
-msgid "_Start port:"
-msgstr "_Počáteční port:"
+#: ../libpurple/protocols/jabber/si.c:842
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "Nemohu odeslat soubor %s, nepřihlášen k přítomnosti uživatele"
 
-#: ../src/gtkprefs.c:1027
-msgid "_End port:"
-msgstr "_Koncový port:"
+#: ../libpurple/protocols/jabber/si.c:857
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Zvolte prosím, na který zdroj %s chcete odeslat soubor"
 
-#: ../src/gtkprefs.c:1035
-msgid "Proxy Server"
-msgstr "Proxy server"
+#: ../libpurple/protocols/jabber/si.c:873
+msgid "Select a Resource"
+msgstr "Zvolte zdroj"
 
-#: ../src/gtkprefs.c:1039
-msgid "No proxy"
-msgstr "Žádná proxy"
+#: ../libpurple/protocols/msn/dialog.c:110
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problém se synchronizací seznamu kamarádů v %s (%s)"
 
-#: ../src/gtkprefs.c:1095
-msgid "_User:"
-msgstr "_Uživatel:"
+#: ../libpurple/protocols/msn/dialog.c:116
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s na místním seznamu je ve skupině \"%s\", ale ne v seznamu na serveru. "
+"Chcete přidat tohoto kamaráda?"
 
-#: ../src/gtkprefs.c:1157
-msgid "Epiphany"
-msgstr "Epiphany"
+#: ../libpurple/protocols/msn/dialog.c:124
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s je na místním seznamu, ale ne v seznamu na serveru. Chcete přidat tohoto "
+"kamaráda?"
 
-#: ../src/gtkprefs.c:1158
-msgid "Firebird"
-msgstr "Firebird"
+#: ../libpurple/protocols/msn/error.c:36
+msgid "Unable to parse message"
+msgstr "Nemohu zpracovat zprávu"
 
-#: ../src/gtkprefs.c:1159
-msgid "Firefox"
-msgstr "Firefox"
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Syntaktická chyba (pravděpodobně chyba v klientovi)"
 
-#: ../src/gtkprefs.c:1160
-msgid "Galeon"
-msgstr "Galeon"
+#: ../libpurple/protocols/msn/error.c:46
+msgid "Invalid e-mail address"
+msgstr "Neplatná e-mailová adresa"
 
-#: ../src/gtkprefs.c:1161
-msgid "GNOME Default"
-msgstr "Implicitní pro GNOME"
+#: ../libpurple/protocols/msn/error.c:49
+msgid "User does not exist"
+msgstr "Uživatel neexistuje"
 
-#: ../src/gtkprefs.c:1162
-msgid "Konqueror"
-msgstr "Konqueror"
+#: ../libpurple/protocols/msn/error.c:53
+msgid "Fully qualified domain name missing"
+msgstr "Chybí plně kvalifikovaný název domény"
 
-#: ../src/gtkprefs.c:1163
-msgid "Mozilla"
-msgstr "Mozilla"
+#: ../libpurple/protocols/msn/error.c:56
+msgid "Already logged in"
+msgstr "Již přihlášen"
 
-#: ../src/gtkprefs.c:1164
-msgid "Netscape"
-msgstr "Netscape"
+#: ../libpurple/protocols/msn/error.c:59
+msgid "Invalid screen name"
+msgstr "Neplatné jméno uživatele"
 
-#: ../src/gtkprefs.c:1165
-msgid "Opera"
-msgstr "Opera"
+#: ../libpurple/protocols/msn/error.c:62
+msgid "Invalid friendly name"
+msgstr "Neplatné přátelské jméno"
 
-#: ../src/gtkprefs.c:1174
-msgid "Manual"
-msgstr "Ruční"
+#: ../libpurple/protocols/msn/error.c:65
+msgid "List full"
+msgstr "Seznam plný"
 
-#: ../src/gtkprefs.c:1227
-msgid "Browser Selection"
-msgstr "Výběr prohlížeče"
+#: ../libpurple/protocols/msn/error.c:68
+msgid "Already there"
+msgstr "Již tam"
 
-#: ../src/gtkprefs.c:1231
-msgid "_Browser:"
-msgstr "_Prohlížeč:"
+#: ../libpurple/protocols/msn/error.c:72
+msgid "Not on list"
+msgstr "Ne na seznamu"
 
-#: ../src/gtkprefs.c:1239
-msgid "_Open link in:"
-msgstr "_Otevřít odkaz v:"
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
+msgid "User is offline"
+msgstr "Uživatel je odpojen"
 
-#: ../src/gtkprefs.c:1241
-msgid "Browser default"
-msgstr "Implicitní nastavení prohlížeče"
+#: ../libpurple/protocols/msn/error.c:78
+msgid "Already in the mode"
+msgstr "Již v daném režimu"
 
-#: ../src/gtkprefs.c:1242
-msgid "Existing window"
-msgstr "Existující okno"
+#: ../libpurple/protocols/msn/error.c:82
+msgid "Already in opposite list"
+msgstr "Již v opačném seznamu"
 
-#: ../src/gtkprefs.c:1244
-msgid "New tab"
-msgstr "Nová záložka"
+#: ../libpurple/protocols/msn/error.c:86
+msgid "Too many groups"
+msgstr "Příliš mnoho skupin"
 
-#: ../src/gtkprefs.c:1258
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Ruční:\n"
-"(%s pro URL)"
+#: ../libpurple/protocols/msn/error.c:89
+msgid "Invalid group"
+msgstr "Neplatná skupina"
 
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
-msgid "Logging"
-msgstr "Zaznamenávání"
+#: ../libpurple/protocols/msn/error.c:92
+msgid "User not in group"
+msgstr "Uživatel není ve skupině"
 
-#: ../src/gtkprefs.c:1297
-msgid "Log _format:"
-msgstr "_Formát záznamu:"
+#: ../libpurple/protocols/msn/error.c:95
+msgid "Group name too long"
+msgstr "Název skupiny příliš dlouhý"
 
-#: ../src/gtkprefs.c:1302
-msgid "Log all _instant messages"
-msgstr "Zaz_namenávat všechny instant message"
+#: ../libpurple/protocols/msn/error.c:98
+msgid "Cannot remove group zero"
+msgstr "Nemohu odstranit skupinu nula"
 
-#: ../src/gtkprefs.c:1304
-msgid "Log all c_hats"
-msgstr "Zaznamenávat všechny _chaty"
+#: ../libpurple/protocols/msn/error.c:103
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Pokus přidat uživatele do skupiny, která neexistuje"
 
-#: ../src/gtkprefs.c:1306
-msgid "Log all _status changes to system log"
-msgstr "Zaznamenávat všechny změny _stavu do systémového záznamu"
+#: ../libpurple/protocols/msn/error.c:107
+msgid "Switchboard failed"
+msgstr "Ústředna selhala"
 
-#: ../src/gtkprefs.c:1454
-msgid "Sound Selection"
-msgstr "Výběr zvuku"
+#: ../libpurple/protocols/msn/error.c:111
+msgid "Notify transfer failed"
+msgstr "Přenos upozornění selhal"
 
-#: ../src/gtkprefs.c:1462
-msgid "Quietest"
-msgstr "Nejtišší"
+#: ../libpurple/protocols/msn/error.c:116
+msgid "Required fields missing"
+msgstr "Vyžadovaná pole chybí"
 
-#: ../src/gtkprefs.c:1464
-msgid "Quieter"
-msgstr "Tišší"
+#: ../libpurple/protocols/msn/error.c:120
+msgid "Too many hits to a FND"
+msgstr "Příliš mnoho výsledků FND"
 
-#: ../src/gtkprefs.c:1466
-msgid "Quiet"
-msgstr "Tichý"
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
+msgid "Not logged in"
+msgstr "Nepřihlášen."
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
-msgid "Normal"
-msgstr "Normální"
+#: ../libpurple/protocols/msn/error.c:128
+msgid "Service temporarily unavailable"
+msgstr "Služba momentálně není k dispozici"
 
-#: ../src/gtkprefs.c:1470
-msgid "Loud"
-msgstr "Hlasitý"
+#: ../libpurple/protocols/msn/error.c:131
+msgid "Database server error"
+msgstr "Chyba databázového serveru"
 
-#: ../src/gtkprefs.c:1472
-msgid "Louder"
-msgstr "Hlasitější"
+#: ../libpurple/protocols/msn/error.c:135
+msgid "Command disabled"
+msgstr "Příkaz zakázán"
 
-#: ../src/gtkprefs.c:1474
-msgid "Loudest"
-msgstr "Nejhlasitější"
+#: ../libpurple/protocols/msn/error.c:139
+msgid "File operation error"
+msgstr "Chyba práce se soubory"
 
-#: ../src/gtkprefs.c:1537
-msgid "Sound Method"
-msgstr "Metoda zvuku"
+#: ../libpurple/protocols/msn/error.c:143
+msgid "Memory allocation error"
+msgstr "Chyba alokace paměti"
 
-#: ../src/gtkprefs.c:1538
-msgid "_Method:"
-msgstr "_Metoda:"
+#: ../libpurple/protocols/msn/error.c:147
+msgid "Wrong CHL value sent to server"
+msgstr "Serveru odeslána špatná hodnota CHL"
 
-#: ../src/gtkprefs.c:1540
-msgid "Console beep"
-msgstr "Pípnutí konzoly"
+#: ../libpurple/protocols/msn/error.c:152
+msgid "Server busy"
+msgstr "Server zaneprázdněn"
 
-#: ../src/gtkprefs.c:1542
-msgid "Automatic"
-msgstr "Automatická"
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
+msgid "Server unavailable"
+msgstr "Server nedostupný"
 
-#: ../src/gtkprefs.c:1547
-msgid "Command"
-msgstr "Příkaz"
+#: ../libpurple/protocols/msn/error.c:158
+msgid "Peer notification server down"
+msgstr "Server upozornění na partnera nedostupný"
 
-#: ../src/gtkprefs.c:1548
-msgid "No sounds"
-msgstr "Žádné zvuky"
+#: ../libpurple/protocols/msn/error.c:162
+msgid "Database connect error"
+msgstr "Chyba připojení k databázi"
 
-#: ../src/gtkprefs.c:1556
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"_Příkaz zvuku:\n"
-"(%s pro název souboru)"
+#: ../libpurple/protocols/msn/error.c:167
+msgid "Server is going down (abandon ship)"
+msgstr "Server se vypíná (opusťte loď)"
 
-#: ../src/gtkprefs.c:1582
-msgid "Sound Options"
-msgstr "Možnosti zvuku"
+#: ../libpurple/protocols/msn/error.c:174
+msgid "Error creating connection"
+msgstr "Chyba vytváření spojení"
 
-#: ../src/gtkprefs.c:1583
-msgid "Sounds when conversation has _focus"
-msgstr "Zvuky, když je okno konverzace _aktivní"
+#: ../libpurple/protocols/msn/error.c:179
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "Parametry CVR nejsou známy nebo nejsou povoleny"
 
-#: ../src/gtkprefs.c:1585
-msgid "_Sounds while away"
-msgstr "Z_vuky při nepřítomnosti"
+#: ../libpurple/protocols/msn/error.c:183
+msgid "Unable to write"
+msgstr "Nemohu zapisovat"
 
-#: ../src/gtkprefs.c:1592
-msgid "Volume:"
-msgstr "Hlasitost:"
+#: ../libpurple/protocols/msn/error.c:186
+msgid "Session overload"
+msgstr "Sezení přetíženo"
 
-#: ../src/gtkprefs.c:1620
-msgid "Sound Events"
-msgstr "Události zvuků"
+#: ../libpurple/protocols/msn/error.c:190
+msgid "User is too active"
+msgstr "Uživatel je příliš aktivní"
 
-#: ../src/gtkprefs.c:1671
-msgid "Play"
-msgstr "Přehrát"
+#: ../libpurple/protocols/msn/error.c:193
+msgid "Too many sessions"
+msgstr "Příliš mnoho sezení"
 
-#: ../src/gtkprefs.c:1678
-msgid "Event"
-msgstr "Událost"
+#: ../libpurple/protocols/msn/error.c:196
+msgid "Passport not verified"
+msgstr "Passport nebyl ověřen"
 
-#: ../src/gtkprefs.c:1697
-msgid "Test"
-msgstr "Otestovat"
+#: ../libpurple/protocols/msn/error.c:199
+msgid "Bad friend file"
+msgstr "Špatný soubor přátel"
 
-#: ../src/gtkprefs.c:1701
-msgid "Reset"
-msgstr "Vymazat"
+#: ../libpurple/protocols/msn/error.c:203
+msgid "Not expected"
+msgstr "Neočekáváno"
 
-#: ../src/gtkprefs.c:1705
-msgid "Choose..."
-msgstr "Vybrat..."
+#: ../libpurple/protocols/msn/error.c:209
+msgid "Friendly name changes too rapidly"
+msgstr "Přátelské jméno se mění příliš rychle"
 
-#: ../src/gtkprefs.c:1747
-msgid "_Report idle time:"
-msgstr "_Hlásit čas nečinnosti:"
+#: ../libpurple/protocols/msn/error.c:218
+msgid "Server too busy"
+msgstr "Server je příliš zaneprázdněn"
 
-#: ../src/gtkprefs.c:1750
-msgid "From last sent message"
-msgstr "Od naposledy odeslané zprávy"
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+msgid "Authentication failed"
+msgstr "Autentizace selhala"
 
-#: ../src/gtkprefs.c:1752
-msgid "Based on keyboard or mouse use"
-msgstr "Podle používání klávesnice nebo myši"
+#: ../libpurple/protocols/msn/error.c:225
+msgid "Not allowed when offline"
+msgstr "Nedovoleno při odpojení"
 
-#: ../src/gtkprefs.c:1761
-msgid "_Auto-reply:"
-msgstr "_Automatická odpověď:"
+#: ../libpurple/protocols/msn/error.c:233
+msgid "Not accepting new users"
+msgstr "Nepřijímám nové uživatele"
 
-#: ../src/gtkprefs.c:1765
-msgid "When both away and idle"
-msgstr "Při nepřítomnosti a nečinnosti"
+#: ../libpurple/protocols/msn/error.c:237
+msgid "Kids Passport without parental consent"
+msgstr "Passport dítěte bez souhlasu rodiče"
 
-#. Auto-away stuff
-#: ../src/gtkprefs.c:1771
-msgid "Auto-away"
-msgstr "Automatická nepřítomnost"
+#: ../libpurple/protocols/msn/error.c:241
+msgid "Passport account not yet verified"
+msgstr "Účet passport ještě nebyl ověřen"
 
-#: ../src/gtkprefs.c:1773
-msgid "Change status when _idle"
-msgstr "Změnit stav _při nečinnosti"
+#: ../libpurple/protocols/msn/error.c:244
+msgid "Bad ticket"
+msgstr "Špatný lístek"
 
-#: ../src/gtkprefs.c:1777
-msgid "_Minutes before changing status:"
-msgstr "_Minuty před změnou stavu:"
+#: ../libpurple/protocols/msn/error.c:249
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "Neznámý kód chyby %d"
 
-#: ../src/gtkprefs.c:1785
-msgid "Change _status to:"
-msgstr "Změnit _stav na:"
+#: ../libpurple/protocols/msn/error.c:263
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "Chyba MSN: %s\n"
 
-#. Signon status stuff
-#: ../src/gtkprefs.c:1806
-msgid "Status at startup"
-msgstr "Stav při spuštění"
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr ""
 
-#: ../src/gtkprefs.c:1808
-msgid "Use status from last _exit at startup"
-msgstr "Používat při spouštění stav podle posledního _ukončení"
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr ""
 
-#: ../src/gtkprefs.c:1814
-msgid "Status to a_pply at startup:"
-msgstr "Stav, který použít při _spouštění:"
+#: ../libpurple/protocols/msn/msn.c:133
+#, fuzzy
+msgid "Nudging"
+msgstr "Pager"
 
-#: ../src/gtkprefs.c:1865
-msgid "Smiley Themes"
-msgstr "Témata smajlíků"
+#: ../libpurple/protocols/msn/msn.c:157
+msgid "You have just sent a Nudge!"
+msgstr "Právě jste odeslali šťouchnutí!"
 
-#: ../src/gtkprefs.c:1866
-msgid "Sounds"
-msgstr "Zvuky"
+#: ../libpurple/protocols/msn/msn.c:183
+msgid "Your new MSN friendly name is too long."
+msgstr "Vaše nové přátelské jméno MSN je příliš dlouhé."
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
-msgid "Network"
-msgstr "Síť"
+#: ../libpurple/protocols/msn/msn.c:291
+msgid "Set your friendly name."
+msgstr "Nastavit vaše přátelské jméno"
 
-#: ../src/gtkprefs.c:1872
-msgid "Browser"
-msgstr "Prohlížeč"
+#: ../libpurple/protocols/msn/msn.c:292
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "Toto je jméno, pod kterým vás budou vidět ostatní kamarádi MSN."
 
-#: ../src/gtkprefs.c:1876
-msgid "Away / Idle"
-msgstr "Pryč / nečinný"
+#: ../libpurple/protocols/msn/msn.c:310
+msgid "Set your home phone number."
+msgstr "Nastavte své domácí telefonní číslo."
 
-#: ../src/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Povolit všem uživatelům kontaktovat mě"
+#: ../libpurple/protocols/msn/msn.c:327
+msgid "Set your work phone number."
+msgstr "Nastavte své pracovní telefonní číslo."
 
-#: ../src/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Povolit jen uživatelům na mém seznamu kamarádů"
+#: ../libpurple/protocols/msn/msn.c:344
+msgid "Set your mobile phone number."
+msgstr "Nastavte své mobilní telefonní číslo."
 
-#: ../src/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Povolit jen uživatelům níže"
+#: ../libpurple/protocols/msn/msn.c:359
+msgid "Allow MSN Mobile pages?"
+msgstr "Povolit stránky MSN Mobile?"
 
-#: ../src/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Blokovat všechny uživatele"
+#: ../libpurple/protocols/msn/msn.c:360
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"Chcete povolit nebo zakázat lidem na svém seznamu kamarádů posílat vám "
+"stránky MSN Mobile na váš mobilní telefon nebo jiné mobilní zařízení?"
 
-#: ../src/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Blokovat jen uživatele níže"
+#: ../libpurple/protocols/msn/msn.c:366
+msgid "Allow"
+msgstr "Povolit"
 
-#: ../src/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Soukromí"
+#: ../libpurple/protocols/msn/msn.c:367
+msgid "Disallow"
+msgstr "Zakázat"
 
-#: ../src/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Změny v nastavení soukromí mají okamžitý efekt."
+#: ../libpurple/protocols/msn/msn.c:383
+msgid "This Hotmail account may not be active."
+msgstr "Tento účet Hotmail možná není aktivní."
 
-#. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Nastavit soukromí pro:"
+#: ../libpurple/protocols/msn/msn.c:409
+msgid "Send a mobile message."
+msgstr "Odeslat mobilní zprávu."
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
-msgid "Permit User"
-msgstr "Povolit uživateli"
+#: ../libpurple/protocols/msn/msn.c:411
+msgid "Page"
+msgstr "Stránka"
 
-#: ../src/gtkprivacy.c:563
-msgid "Type a user you permit to contact you."
-msgstr "Zadejte uživatele, kterému povolujete vás kontaktovat."
+#: ../libpurple/protocols/msn/msn.c:558
+msgid "Has you"
+msgstr "Má vás"
 
-#: ../src/gtkprivacy.c:564
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Zadejte prosím jméno uživatele, o kterém chcete, aby vás mohl kontaktovat."
+#: ../libpurple/protocols/msn/msn.c:588 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
+msgid "Be Right Back"
+msgstr "Hned budu zpátky"
 
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
-msgid "_Permit"
-msgstr "_Povolit"
+#: ../libpurple/protocols/msn/msn.c:592 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
+msgid "Busy"
+msgstr "Zaneprázdněn"
 
-#: ../src/gtkprivacy.c:572
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Povolit %s kontaktovat vás?"
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
+msgid "On the Phone"
+msgstr "Telefonuji"
 
-#: ../src/gtkprivacy.c:574
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Opravdu chcete povolit %s kontaktovat vás?"
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
+msgid "Out to Lunch"
+msgstr "Na obědě"
 
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
-msgid "Block User"
-msgstr "Blokovat uživatele"
+#: ../libpurple/protocols/msn/msn.c:628
+msgid "Set Friendly Name..."
+msgstr "Nastavit přátelské jméno..."
 
-#: ../src/gtkprivacy.c:602
-msgid "Type a user to block."
-msgstr "Zadejte uživatele, kterého blokovat."
+#: ../libpurple/protocols/msn/msn.c:633
+msgid "Set Home Phone Number..."
+msgstr "Nastavit domácí telefonní číslo..."
 
-#: ../src/gtkprivacy.c:603
-msgid "Please enter the name of the user you wish to block."
-msgstr "Zadejte prosím jméno uživatele, kterého chcete blokovat."
+#: ../libpurple/protocols/msn/msn.c:637
+msgid "Set Work Phone Number..."
+msgstr "Nastavit pracovní telefonní číslo..."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
-msgid "_Block"
-msgstr "_Blokovat"
+#: ../libpurple/protocols/msn/msn.c:641
+msgid "Set Mobile Phone Number..."
+msgstr "Nastavit mobilní telefonní číslo..."
 
-#: ../src/gtkprivacy.c:610
-#, c-format
-msgid "Block %s?"
-msgstr "Blokovat %s?"
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Povolit/zakázat mobilní zařízení..."
 
-#: ../src/gtkprivacy.c:612
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Opravdu chcete blokovat %s?"
+#: ../libpurple/protocols/msn/msn.c:652
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Povolit/zakázat mobilní stránky..."
 
-#: ../src/gtkrequest.c:273 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Ano"
+#: ../libpurple/protocols/msn/msn.c:663
+msgid "Open Hotmail Inbox"
+msgstr "Otevřít Příchozí poštu Hotmailu"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Ne"
+#: ../libpurple/protocols/msn/msn.c:687
+msgid "Send to Mobile"
+msgstr "Odeslat na mobil"
 
-#: ../src/gtkrequest.c:277
-msgid "Apply"
-msgstr "Použít"
+#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/novell/novell.c:3408
+msgid "Initiate _Chat"
+msgstr "Začít _chat"
 
-#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
-msgid "Close"
-msgstr "Zavřít"
+#: ../libpurple/protocols/msn/msn.c:735
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu SSL."
 
-#: ../src/gtkrequest.c:1473
-msgid "That file already exists"
-msgstr "Tento soubor již existuje"
+#: ../libpurple/protocols/msn/msn.c:760
+msgid "Failed to connect to server."
+msgstr "Nemohu se připojit k serveru."
 
-#: ../src/gtkrequest.c:1474
-msgid "Would you like to overwrite it?"
-msgstr "Chcete jej přepsat?"
+#: ../libpurple/protocols/msn/msn.c:1516 ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
+msgid "Error retrieving profile"
+msgstr "Chyba při získávání profilu"
 
-#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "Uložit soubor..."
+#: ../libpurple/protocols/msn/msn.c:1587 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
+msgid "General"
+msgstr "Obecné"
 
-#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "Otevřít soubor..."
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3748
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+msgid "Age"
+msgstr "Věk"
 
-#: ../src/gtkroomlist.c:287
-msgid "_Add"
-msgstr "_Přidat"
+#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+msgid "Occupation"
+msgstr "Zaměstnání"
 
-#: ../src/gtkroomlist.c:354
-msgid "Room List"
-msgstr "Seznam místností"
+#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
+msgid "Location"
+msgstr "Umístění"
 
-#. list button
-#: ../src/gtkroomlist.c:424
-msgid "_Get List"
-msgstr "_Získat seznam"
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800 ../libpurple/protocols/msn/msn.c:1807
+msgid "Hobbies and Interests"
+msgstr "Koníčky a zájmy"
 
-#. add button
-#: ../src/gtkroomlist.c:432
-msgid "_Add Chat"
-msgstr "_Přidat chat"
+#: ../libpurple/protocols/msn/msn.c:1608 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749 ../libpurple/protocols/msn/msn.c:1756
+msgid "A Little About Me"
+msgstr "Něco o mě"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
-msgid "Title"
-msgstr "Titul"
+#: ../libpurple/protocols/msn/msn.c:1625
+msgid "Social"
+msgstr "Společenské"
 
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "Typ"
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+msgid "Marital Status"
+msgstr "Stav"
 
-#. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
-#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
-msgid "Message"
-msgstr "Zpráva"
+#: ../libpurple/protocols/msn/msn.c:1628
+msgid "Interests"
+msgstr "Zájmy"
+
+#: ../libpurple/protocols/msn/msn.c:1629
+msgid "Pets"
+msgstr "Zvířata"
+
+#: ../libpurple/protocols/msn/msn.c:1630
+msgid "Hometown"
+msgstr "Domovské město"
+
+#: ../libpurple/protocols/msn/msn.c:1631
+#, fuzzy
+msgid "Places Lived"
+msgstr "Místo uzavřeno"
 
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "Uložené stavy"
+#: ../libpurple/protocols/msn/msn.c:1632
+msgid "Fashion"
+msgstr "Móda"
+
+#: ../libpurple/protocols/msn/msn.c:1633
+msgid "Humor"
+msgstr "Humor"
+
+#: ../libpurple/protocols/msn/msn.c:1634
+msgid "Music"
+msgstr "Hudba"
+
+#: ../libpurple/protocols/msn/msn.c:1635 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+msgid "Favorite Quote"
+msgstr "Oblíbený citát"
 
-#. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
-msgid "_Use"
-msgstr "_Použít"
+#: ../libpurple/protocols/msn/msn.c:1652
+msgid "Contact Info"
+msgstr "Kontaktní informace"
+
+#: ../libpurple/protocols/msn/msn.c:1653
+msgid "Personal"
+msgstr "Osobní"
+
+#: ../libpurple/protocols/msn/msn.c:1656
+msgid "Significant Other"
+msgstr "Partner"
+
+#: ../libpurple/protocols/msn/msn.c:1657
+msgid "Home Phone"
+msgstr "Domácí telefon"
+
+#: ../libpurple/protocols/msn/msn.c:1658
+msgid "Home Phone 2"
+msgstr "Domácí telefon 2"
 
-#: ../src/gtksavedstatuses.c:695
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Název se již používá. Musíte zvolit jedinečný název."
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3786
+msgid "Home Address"
+msgstr "Domácí adresa"
 
-#: ../src/gtksavedstatuses.c:879
-msgid "Different"
-msgstr "Různé"
+#: ../libpurple/protocols/msn/msn.c:1660
+msgid "Personal Mobile"
+msgstr "Osobní mobil"
+
+#: ../libpurple/protocols/msn/msn.c:1661
+msgid "Home Fax"
+msgstr "Osobní fax"
+
+#: ../libpurple/protocols/msn/msn.c:1662
+msgid "Personal E-Mail"
+msgstr "Osobní e-mail"
+
+#: ../libpurple/protocols/msn/msn.c:1663
+msgid "Personal IM"
+msgstr "Osobní IM"
+
+#: ../libpurple/protocols/msn/msn.c:1665
+msgid "Anniversary"
+msgstr "Výročí"
+
+#. Business
+#: ../libpurple/protocols/msn/msn.c:1681
+msgid "Work"
+msgstr "Práce"
+
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
+msgid "Job Title"
+msgstr "Název zaměstnání"
 
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2881
-msgid "Status"
-msgstr "Stav"
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3807
+msgid "Company"
+msgstr "Společnost"
 
-#: ../src/gtksavedstatuses.c:1073
-msgid "_Title:"
-msgstr "_Název:"
+#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Oddělení"
 
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
-msgid "_Status:"
-msgstr "_Stav:"
+#: ../libpurple/protocols/msn/msn.c:1686
+msgid "Profession"
+msgstr "Zaměstnání"
 
-#. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
-msgid "Use a _different status for some accounts"
-msgstr "Používat _jiný stav pro některé účty"
+#: ../libpurple/protocols/msn/msn.c:1687
+msgid "Work Phone"
+msgstr "Pracovní telefon"
+
+#: ../libpurple/protocols/msn/msn.c:1688
+msgid "Work Phone 2"
+msgstr "Pracovní telefon 2"
 
-#. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
-msgid "Sa_ve & Use"
-msgstr "Uložit _a použít"
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3799
+msgid "Work Address"
+msgstr "Pracovní adresa"
 
-#: ../src/gtksavedstatuses.c:1394
-#, c-format
-msgid "Status for %s"
-msgstr "Stav pro %s"
+#: ../libpurple/protocols/msn/msn.c:1690
+msgid "Work Mobile"
+msgstr "Pracovní mobil"
+
+#: ../libpurple/protocols/msn/msn.c:1691
+msgid "Work Pager"
+msgstr "Pracovní pager"
+
+#: ../libpurple/protocols/msn/msn.c:1692
+msgid "Work Fax"
+msgstr "Pracovní fax"
+
+#: ../libpurple/protocols/msn/msn.c:1693
+msgid "Work E-Mail"
+msgstr "Pracovní e-mail"
+
+#: ../libpurple/protocols/msn/msn.c:1694
+msgid "Work IM"
+msgstr "Pracovní IM"
+
+#: ../libpurple/protocols/msn/msn.c:1695
+#, fuzzy
+msgid "Start Date"
+msgstr "Stát"
 
-#: ../src/gtksound.c:61
-msgid "Buddy logs in"
-msgstr "Kamarád se přihlásí"
+#: ../libpurple/protocols/msn/msn.c:1765 ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778 ../libpurple/protocols/msn/msn.c:1785
+msgid "Favorite Things"
+msgstr "Oblíbené věci"
 
-#: ../src/gtksound.c:62
-msgid "Buddy logs out"
-msgstr "Kamarád se odhlásí"
+#: ../libpurple/protocols/msn/msn.c:1830
+msgid "Last Updated"
+msgstr "Naposledy aktualizováno"
 
-#: ../src/gtksound.c:63
-msgid "Message received"
-msgstr "Zpráva přijata"
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
+msgid "Homepage"
+msgstr "Domovská stránka"
 
-#: ../src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Přijatá zpráva začíná konverzaci"
+#: ../libpurple/protocols/msn/msn.c:1865
+msgid "The user has not created a public profile."
+msgstr "Uživatel nevytvořit veřejný profil."
 
-#: ../src/gtksound.c:65
-msgid "Message sent"
-msgstr "Zpráva odeslána"
+#: ../libpurple/protocols/msn/msn.c:1866
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN oznámila, že nemůže najít profil uživatele. To znamená, že buď uživatel "
+"neexistuje, nebo že uživatel existuje, ale nevytvořil veřejný profil."
 
-#: ../src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "Osoba vstoupí do chatu"
+#: ../libpurple/protocols/msn/msn.c:1870
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr "Nemohu najít v profilu uživatele žádné informace. Uživatel pravděpodobně neexistuje."
 
-#: ../src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Osoba opustí chat"
+#: ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+msgid "Profile URL"
+msgstr "URL profilu"
 
-#: ../src/gtksound.c:68
-msgid "You talk in chat"
-msgstr "Vy mluvíte v chatu"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msn/msn.c:2169 ../libpurple/protocols/msn/msn.c:2171
+msgid "MSN Protocol Plugin"
+msgstr "Zásuvný modul protokolu MSN"
 
-#: ../src/gtksound.c:69
-msgid "Others talk in chat"
-msgstr "Jiní mluví v chatu"
+#: ../libpurple/protocols/msn/msn.c:2205
+msgid "Use HTTP Method"
+msgstr "Používat metodu HTTP"
 
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "Někdo v chatu řekne vaše jméno"
+#: ../libpurple/protocols/msn/msn.c:2210
+msgid "Show custom smileys"
+msgstr "Zobrazovat systémové smajlíky"
+
+#: ../libpurple/protocols/msn/msn.c:2218
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge: získat pozornost uživatele šťouchnutím"
+
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Nemohu se připojit"
 
-#: ../src/gtksound.c:489
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Nemohu přehrát zvuk, protože zvolený soubor (%s) neexistuje."
+msgid "%s is not a valid group."
+msgstr "%s není platná skupina."
 
-#: ../src/gtksound.c:505
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Nemohu přehrávat zvuk, protože byla zvolena metoda zvuku 'Příkaz', ale "
-"příkaz nebyl nastaven."
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:330
+msgid "Unknown error."
+msgstr "Neznámá chyba."
 
-#: ../src/gtksound.c:517
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Nemohu přehrávat zvuk, protože nastavený příkaz zvuku nemohl být spuštěn: %s"
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Píše"
+#: ../libpurple/protocols/msn/notification.c:498
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nemohu přidat uživatele do %s (%s)"
 
-#. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
-msgid "Connecting"
-msgstr "Připojuji se"
+#: ../libpurple/protocols/msn/notification.c:502
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nemohu zablokovat uživatele na %s (%s)"
 
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "_Alias"
+#: ../libpurple/protocols/msn/notification.c:506
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nemohu povolit uživatele na %s (%s)"
 
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "Zavřít _záložky"
+#: ../libpurple/protocols/msn/notification.c:514
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nelze přidat, protože váš seznam kamarádů je plný."
 
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "_Získat info"
+#: ../libpurple/protocols/msn/notification.c:523
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s není platný účet passport."
 
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "_Pozvat"
+#: ../libpurple/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Služba dočasně není k dispozici."
 
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "Z_měnit"
+#: ../libpurple/protocols/msn/notification.c:851
+msgid "Unable to rename group"
+msgstr "Nemohu přejmenovat skupinu"
 
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "_Otevřít poštu"
+#: ../libpurple/protocols/msn/notification.c:906
+msgid "Unable to delete group"
+msgstr "Nemohu odstranit skupinu"
 
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "Při načítání %s došlo k následující chybě: %s"
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+"Server MSN bude za %d minutu vypnut kvůli údržbě. Tehdy budete automaticky "
+"odhlášen. Dokončete prosím probíhající konverzace.\n"
+"\n"
+"Až bude údržba dokončena, budete se moci přihlásit."
+msgstr[1] ""
+"Server MSN bude za %d minuty vypnut kvůli údržbě. Tehdy budete automaticky "
+"odhlášen. Dokončete prosím probíhající konverzace.\n"
+"\n"
+"Až bude údržba dokončena, budete se moci přihlásit."
+msgstr[2] ""
+"Server MSN bude za %d minut vypnut kvůli údržbě. Tehdy budete automaticky "
+"odhlášen. Dokončete prosím probíhající konverzace.\n"
+"\n"
+"Až bude údržba dokončena, budete se moci přihlásit."
 
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
-msgid "Failed to load image"
-msgstr "Nemohu načíst obrázek"
+#: ../libpurple/protocols/msn/servconn.c:135
+msgid "Writing error"
+msgstr "Chyba zápisu"
 
-#: ../src/gtkutils.c:1408
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Nemohu odeslat složku %s."
+#: ../libpurple/protocols/msn/servconn.c:137
+msgid "Reading error"
+msgstr "Chyba čtení"
 
-#: ../src/gtkutils.c:1410
+#: ../libpurple/protocols/msn/servconn.c:144
+#, c-format
 msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "Gaim neumí přenést složku. Budete muset soubory v ní přenést po jednom"
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+"Chyba spojení od serveru %s:\n"
+"%s"
 
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
-msgid "You have dragged an image"
-msgstr "Přetáhli jste obrázek"
+#: ../libpurple/protocols/msn/session.c:299
+msgid "Our protocol is not supported by the server."
+msgstr "Server nepodporuje náš protokol."
 
-#: ../src/gtkutils.c:1439
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr "Můžete tento obrázek odeslat jako přenos souboru, vložit jej do zprávy, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+#: ../libpurple/protocols/msn/session.c:303
+msgid "Error parsing HTTP."
+msgstr "Chyba při zpracovávání HTTP."
 
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
-msgid "Set as buddy icon"
-msgstr "Nastavit jako ikonu kamaráda"
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
+msgid "You have signed on from another location."
+msgstr "Přihlásili jste se z jiného umístění."
 
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
-msgid "Send image file"
-msgstr "Odeslat soubor obrázku"
+#: ../libpurple/protocols/msn/session.c:310
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+"Servery MSN dočasně nejsou dostupné. Počkejte prosím a zkuste to znovu."
 
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
-msgid "Insert in message"
-msgstr "Vložit do zprávy"
+#: ../libpurple/protocols/msn/session.c:315
+msgid "The MSN servers are going down temporarily."
+msgstr "Servery MSN se dočasně vypínají."
 
-#: ../src/gtkutils.c:1448
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Chcete jej nastavit jako ikonu kamaráda pro tohoto uživatele?"
+#: ../libpurple/protocols/msn/session.c:320
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "Nemohu se autentizovat: %s"
 
-#: ../src/gtkutils.c:1453
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr "Můžete tento obrázek odeslat jako přenos souboru, vložit jej do této zprávy, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Váš seznam kamarádů MSN dočasně není k dispozici. Počkejte prosím a zkuste "
+"to znovu."
 
-#: ../src/gtkutils.c:1455
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr "Můžete tento obrázek vložit do této zprávy nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
+msgid "Handshaking"
+msgstr "Vyjednávám"
 
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../src/gtkutils.c:1509
-msgid "Cannot send launcher"
-msgstr "Nemohu odeslat spouštěč"
+#: ../libpurple/protocols/msn/session.c:349
+msgid "Starting authentication"
+msgstr "Spouštím autentizaci"
 
-#: ../src/gtkutils.c:1509
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr "Přetáhli jste spouštěč pracovní plochy. Pravděpodobně jste chtěli odeslat, na co tento spouštěč ukazuje, místo přímo tohoto spouštěče."
+#: ../libpurple/protocols/msn/session.c:350
+msgid "Getting cookie"
+msgstr "Získávám cookie"
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "Odeslán požadavek o kreslení."
+#: ../libpurple/protocols/msn/session.c:352
+msgid "Sending cookie"
+msgstr "Odesílám cookie"
 
-#: ../src/log.c:167
-msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">Zaznamenávač nemá funkci read</font></b>"
+#: ../libpurple/protocols/msn/session.c:353
+msgid "Retrieving buddy list"
+msgstr "Získávám seznam kamarádů"
 
-#: ../src/log.c:549
-msgid "HTML"
-msgstr "HTML"
+#: ../libpurple/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Pryč od počítače"
 
-#: ../src/log.c:560
-msgid "Plain text"
-msgstr "Prostý text"
+#: ../libpurple/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Telefonuji"
 
-#: ../src/log.c:571
-msgid "Old Gaim"
-msgstr "Starý Gaim"
+#: ../libpurple/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Na obědě"
 
-#: ../src/log.c:666
-msgid "Logging of this conversation failed."
-msgstr "Zaznamenávání této konverzace selhalo."
+#: ../libpurple/protocols/msn/switchboard.c:400
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "Zpráva možná nebyla odeslána, protože vypršel čas:"
 
-#: ../src/log.c:1009
-msgid "XML"
-msgstr "XML"
+#: ../libpurple/protocols/msn/switchboard.c:408
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Zprávu nelze odeslat, není to povoleno, když jste neviditelní:"
 
-#: ../src/log.c:1077
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
+#: ../libpurple/protocols/msn/switchboard.c:412
+msgid "Message could not be sent because the user is offline:"
+msgstr "Zprávu nelze odeslat, protože uživatel je odpojen:"
 
-#: ../src/log.c:1079
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"ODPOVĚĎ&gt;:</b></font> %s<br/>\n"
+#: ../libpurple/protocols/msn/switchboard.c:416
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "Zprávu nelze odeslat, protože došlo k chybě spojení:"
 
-#: ../src/log.c:1136 ../src/log.c:1262
-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Nemohu najít cestu záznamu!</b></font>"
+#: ../libpurple/protocols/msn/switchboard.c:420
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Zprávu nelze odeslat, protože odesíláme příliš rychle:"
 
-#: ../src/log.c:1148 ../src/log.c:1276
-#, c-format
-msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>Nemohu přečíst soubor: %s</b></font>"
+#: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr "Zprávu nelze odeslat, protože jsme nemohli vytvořit sezení se serverem. To je pravděpodobně problém serveru, zkuste to za několik minut znovu:"
 
-#: ../src/log.c:1205
-#, c-format
-msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%s) %s <AUTO-ODPOVĚĎ>: %s\n"
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "Zprávu nelze odeslat, protože došlo k chybě s ústřednou:"
 
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
-msgid "Unknown error"
-msgstr "Neznámá chyba"
+#: ../libpurple/protocols/msn/switchboard.c:439
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě:"
 
-#: ../src/plugin.c:424
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
-msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Magie zásuvného modulu %d nesouhlasí (potřebuji %d)"
+msgid "%s just sent you a Nudge!"
+msgstr "%s vám právě poslal šťouchnutí!"
 
-#: ../src/plugin.c:441
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
-msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Verze ABI %d.%d.x nesouhlasí (potřebuji %d.%d.x)"
-
-#: ../src/plugin.c:458
-msgid "Plugin does not implement all required functions"
-msgstr "Zásuvný modul neimplementuje všechny vyžadované funkce"
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vás přidal do svého seznamu kamarádů."
 
-#: ../src/plugin.c:523
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"Vyžadovaný zásuvný modul %s nebyl nalezen. Nainstalujte prosím tento zásuvný "
-"modul a zkuste to znovu."
-
-#: ../src/plugin.c:528
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim se setkal s chybou při načítání zásuvného modulu."
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vás odstranil ze svého seznamu kamarádů."
 
-#: ../src/plugin.c:551
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
-msgid "The required plugin %s was unable to load."
-msgstr "Vyžadovaný zásuvný modul %s nebylo možné načíst."
-
-#: ../src/plugin.c:555
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim nemohl načíst váš zásuvný modul."
+msgid "Unable to add \"%s\"."
+msgstr "Nemohu přidat \"%s\"."
 
-#: ../src/plugin.c:657
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Závislý zásuvný modul %s nelze odebrat."
+#: ../libpurple/protocols/msn/userlist.c:645
+msgid "The screen name specified is invalid."
+msgstr "Zadané jméno uživatele není platné."
 
-#: ../src/plugin.c:662
-msgid "Gaim encountered errors unloading the plugin."
-msgstr "Gaim se setkal s chybou při odebírání zásuvného modulu."
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Chybějící šifra"
 
-#. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
-msgid "Unable to listen for incoming IM connections\n"
-msgstr "Nemohu poslouchat příchozí spojení IM\n"
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Šifra RC4 nebyla nalezena"
 
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Nemohu vytvořit spojení s místním serverem mDNS. Běží?"
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr "Aktualizujte na libpurple s podporou RC4 (>= 2.0.1). Zásuvný modul MySpaceIM nebude načten."
 
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
 msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr "\n<b>Stav</b>: %s"
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr "Lituji, MySpace nepodporuje hesla delší než %d znaků (vaše má %d)."
 
-#: ../src/protocols/bonjour/bonjour.c:339
-#, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr "\n<b>Zpráva:</b> %s"
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "Chyba MySpaceIM"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/bonjour/bonjour.c:433
-#: ../src/protocols/bonjour/bonjour.c:435
-msgid "Bonjour Protocol Plugin"
-msgstr "Zásuvný modul protokolu Bonjour"
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Čtu výzvu"
 
-#: ../src/protocols/bonjour/bonjour.c:471
-#: ../src/protocols/bonjour/bonjour.c:479
-#: ../src/protocols/bonjour/bonjour.c:537
-msgid "Gaim User"
-msgstr "Uživatel Gaim"
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Neočekávaná délka výzvy od serveru"
 
-#. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
-msgid "Hostname"
-msgstr "Jméno počítače"
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Přihlašování"
 
-#. Creating the options for the protocol
-#. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
-msgid "Port"
-msgstr "Port"
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Připojení k serveru ztraceno (za %d sekund nebyla přijata žádná data)"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
-msgid "First name"
-msgstr "Křestní jméno"
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Zprávy o nové poště"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
-msgid "Last name"
-msgstr "Příjmení"
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Nové komentáře v blogu"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
-msgstr "Email"
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Nové komentáře v profilu"
 
-#: ../src/protocols/bonjour/jabber.c:357
-#, c-format
-msgid "%s has closed the conversation."
-msgstr "%s zavřel konverzaci."
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nové žádosti o přátelství!"
 
-#: ../src/protocols/bonjour/jabber.c:439
-msgid "Cannot open socket"
-msgstr "Nemohu otevřít socket"
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nové poznámky o obrázku"
 
-#: ../src/protocols/bonjour/jabber.c:447
-msgid "Error setting socket options"
-msgstr "Chyba při nastavování možností socketu"
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
-msgstr "Nemohu připojit socket k portu"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Připojen"
 
-#: ../src/protocols/bonjour/jabber.c:465
-msgid "Cannot listen on socket"
-msgstr "Nemohu poslouchat na socketu"
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Nenastaveno jméno uživatele"
 
-#: ../src/protocols/bonjour/jabber.c:559
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr "Jděte prosím na http://editprofile.myspace.com/index.cfm?fuseaction=profile.username, zvolte jméno uživatele, a zkuste se přihlásit znovu."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
-msgid "Token Error"
-msgstr "Chyba tokenu"
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Chyba protokolu, kód %d: %s"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
-msgid "Unable to fetch the token.\n"
-msgstr "Nemohu získat token.\n"
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Nemohu přidat kamaráda"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
-msgid "Save Buddylist..."
-msgstr "Uložit seznam kamarádů..."
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "Příkaz 'addbuddy' selhal."
 
-#: ../src/protocols/gg/gg.c:227
-msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Váš seznam kamarádů je prázdný, do souboru nebylo nic zapsáno."
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "Příkaz persist selhal"
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
-msgid "Couldn't open file"
-msgstr "Nemohu otevřít soubor"
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Takový uživatel neexistuje: %s"
 
-#: ../src/protocols/gg/gg.c:246
-msgid "Buddylist saved successfully!"
-msgstr "Seznam kamarádů úspěšně uložen!"
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Vyhledávání uživatele"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
-msgid "Couldn't load buddylist"
-msgstr "Nemohu načíst seznam kamarádů"
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Nemohu odstranit kamaráda"
 
-#: ../src/protocols/gg/gg.c:281
-msgid "Load Buddylist..."
-msgstr "Načíst seznam kamarádů..."
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "Příkaz 'delbuddy' selhal"
 
-#: ../src/protocols/gg/gg.c:282
-msgid "Buddylist loaded successfully!"
-msgstr "Seznam kamarádů úspěšně načten!"
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "Příkaz blocklist selhal"
 
-#: ../src/protocols/gg/gg.c:293
-msgid "Save buddylist..."
-msgstr "Uložit seznam kamarádů..."
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Neplatný stav vstupu"
 
-#: ../src/protocols/gg/gg.c:337
-msgid "Fill in the registration fields."
-msgstr "Vyplňte pole pro registraci."
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Vyrovnávací paměť čtení plná"
 
-#: ../src/protocols/gg/gg.c:342
-msgid "Passwords do not match."
-msgstr "Hesla nesouhlasí."
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Nezpracovatelná zpráva"
 
-#: ../src/protocols/gg/gg.c:351
-msgid "Unable to register new account. Error occurred.\n"
-msgstr "Nemohu zaregistrovat nový účet. Došlo k chybě.\n"
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Nemohu se připojit k počítači: %s (%d)"
 
-#: ../src/protocols/gg/gg.c:364
-msgid "New Gadu-Gadu Account Registered"
-msgstr "Nový účet Gadu-Gadu zaregistrován"
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Přátelé IM"
 
-#: ../src/protocols/gg/gg.c:365
-msgid "Registration completed successfully!"
-msgstr "Registrace úspěšně dokončena!"
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "%d kamarádů bylo přidáno nebo aktualizováno ze serveru (včetně kamarádů, kteří již jsou na seznamu na serveru)"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "Email"
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Přidat kontakty ze serveru"
 
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
-msgid "Password"
-msgstr "Heslo"
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Přidat kamarády z MySpace.com"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
-msgid "Password (retype)"
-msgstr "Heslo (znovu)"
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Import přátel selhal"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
-msgid "Enter current token"
-msgstr "Zadejte aktuální token"
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Hledat lidi..."
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
-msgid "Current token"
-msgstr "Aktuální token"
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Změnit jméno IM..."
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
-msgid "Register New Gadu-Gadu Account"
-msgstr "Zaregistrovat nový účet Gadu-Gadu"
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "Obsluha URL myim"
 
-#: ../src/protocols/gg/gg.c:452
-msgid "Please, fill in the following fields"
-msgstr "Vyplňte prosím následující pole"
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Nebyl nalezen žádný vhodný účet MySpaceIM, kterým otevřít toto URL myim."
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
-msgid "Unable to initiate a new search"
-msgstr "Nemohu začít nové hledání"
-
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "Probíhá pro vás hledání. Počkejte prosím, než skončí."
-
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
-msgid "Nickname"
-msgstr "Přezdívka"
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Povolte správný účet MySpaceIM a zkuste to znovu."
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
-msgid "City"
-msgstr "Město"
+#: ../libpurple/protocols/myspace/myspace.c:3280
+msgid "Show display name in status text"
+msgstr "Zobrazovat v textu stavu jméno pro zobrazování"
 
-#: ../src/protocols/gg/gg.c:577
-msgid "Year of birth"
-msgstr "Rok narození"
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Zobrazovat v textu stavu nadpis"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
-msgid "Gender"
-msgstr "Pohlaví"
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Odesílat emotikony"
 
-#: ../src/protocols/gg/gg.c:581
-msgid "Male or female"
-msgstr "Muž nebo žena"
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Rozlišení obrazovky (bodů na palec)"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
-msgid "Male"
-msgstr "Muž"
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Základní velikost písma (body)"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
-msgid "Female"
-msgstr "Žena"
+#: ../libpurple/protocols/novell/nmuser.c:1864
+msgid "Required parameters not passed in"
+msgstr "Nezadány vyžadované parametry"
 
-#: ../src/protocols/gg/gg.c:587
-msgid "Only online"
-msgstr "Jen připojené"
+#: ../libpurple/protocols/novell/nmuser.c:1867
+msgid "Unable to write to network"
+msgstr "Nemohu zapisovat na síť"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
-msgid "Find buddies"
-msgstr "Hledat kamarády"
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "Nemohu číst ze sítě"
 
-#: ../src/protocols/gg/gg.c:593
-msgid "Please, enter your search criteria below"
-msgstr "Zadejte prosím podmínky hledání níže"
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "Chyba při komunikaci se serverem"
 
-#: ../src/protocols/gg/gg.c:630
-msgid "Fill in the fields."
-msgstr "Vyplňte tato pole."
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "Konference nenalezena"
 
-#: ../src/protocols/gg/gg.c:642
-msgid "Your current password is different from the one that you specified."
-msgstr "Vaše aktuální heslo je jiné než to, které jste zadali."
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "Konference neexistuje"
 
-#: ../src/protocols/gg/gg.c:656
-msgid "Unable to change password. Error occured.\n"
-msgstr "Nemohu změnit heslo. Došlo k chybě.\n"
+#: ../libpurple/protocols/novell/nmuser.c:1884
+msgid "A folder with that name already exists"
+msgstr "Složka s tímto názvem již existuje"
 
-#: ../src/protocols/gg/gg.c:665
-msgid "Change password for the Gadu-Gadu account"
-msgstr "Změnit heslo pro účet Gadu-Gadu"
+#: ../libpurple/protocols/novell/nmuser.c:1887
+msgid "Not supported"
+msgstr "Nepodporováno"
 
-#: ../src/protocols/gg/gg.c:666
-msgid "Password was changed successfully!"
-msgstr "Heslo bylo úspěšně změněno!"
+#: ../libpurple/protocols/novell/nmuser.c:1891
+msgid "Password has expired"
+msgstr "Heslo vypršelo"
 
-#: ../src/protocols/gg/gg.c:699
-msgid "Current password"
-msgstr "Aktuální heslo"
+#: ../libpurple/protocols/novell/nmuser.c:1894
+msgid "Incorrect password"
+msgstr "Nesprávné heslo"
 
-#: ../src/protocols/gg/gg.c:724
-msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Zadejte prosím své aktuální a nové heslo pro UIN: "
+#: ../libpurple/protocols/novell/nmuser.c:1897
+msgid "User not found"
+msgstr "Uživatel nenalezen"
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
-msgid "Change Gadu-Gadu Password"
-msgstr "Změnit heslo Gadu-Gadu"
+#: ../libpurple/protocols/novell/nmuser.c:1900
+msgid "Account has been disabled"
+msgstr "Účet byl zakázán"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
-#, c-format
-msgid "Select a chat for buddy: %s"
-msgstr "Vyberte chat pro kamaráda: %s"
+#: ../libpurple/protocols/novell/nmuser.c:1903
+msgid "The server could not access the directory"
+msgstr "Server nemohl přistupovat k adresáři"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
-msgid "Add to chat..."
-msgstr "Přidat k chatu..."
+#: ../libpurple/protocols/novell/nmuser.c:1906
+msgid "Your system administrator has disabled this operation"
+msgstr "Váš správce systému tuto operaci zakázal"
 
-#: ../src/protocols/gg/gg.c:950
-msgid "No matching users found"
-msgstr "Nenalezen žádný odpovídající uživatel"
+#: ../libpurple/protocols/novell/nmuser.c:1909
+msgid "The server is unavailable; try again later"
+msgstr "Server není k dispozici; zkuste to později"
 
-#: ../src/protocols/gg/gg.c:951
-msgid "There are no users matching your search criteria."
-msgstr "Neexistuje žádný uživatel odpovídající vašim podmínkám hledání."
+#: ../libpurple/protocols/novell/nmuser.c:1912
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Nemohu přidat kontakt dvakrát do téže složky"
 
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/oscar/oscar.c:6329
-msgid "Unable to display the search results."
-msgstr "Nemohu zobrazit výsledky hledání."
+#: ../libpurple/protocols/novell/nmuser.c:1915
+msgid "Cannot add yourself"
+msgstr "Nemohu vás přidat"
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
-msgid "UIN"
-msgstr "UIN"
+#: ../libpurple/protocols/novell/nmuser.c:1918
+msgid "Master archive is misconfigured"
+msgstr "Hlavní archiv není správně nastaven"
 
-#: ../src/protocols/gg/gg.c:980
-msgid "Birth year"
-msgstr "Rok narození"
+#: ../libpurple/protocols/novell/nmuser.c:1922
+msgid "Incorrect screen name or password"
+msgstr "Nesprávná přezdívka nebo heslo"
 
-#: ../src/protocols/gg/gg.c:1020
-msgid "Gadu-Gadu Public Directory"
-msgstr "Veřejný adresář Gadu-Gadu"
-
-#: ../src/protocols/gg/gg.c:1021
-msgid "Search results"
-msgstr "Výsledky hledání"
+#: ../libpurple/protocols/novell/nmuser.c:1925
+msgid "Could not recognize the host of the screen name you entered"
+msgstr "Nemohu rozpoznat počítač ve jménu uživatele, které jste zadali"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
-msgid "Unable to read socket"
-msgstr "Nemohu číst ze socketu"
+#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr "Váš účet byl zakázán, protože bylo zadáno příliš mnoho neplatných hesel"
 
-#: ../src/protocols/gg/gg.c:1201
-msgid "Buddy list downloaded"
-msgstr "Seznam kamarádů stažen"
+#: ../libpurple/protocols/novell/nmuser.c:1931
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Nemůžete jednu osobu přidat do konverzace dvakrát"
 
-#: ../src/protocols/gg/gg.c:1202
-msgid "Your buddy list was downloaded from the server."
-msgstr "Váš seznam kamarádů byl stažen ze serveru."
+#: ../libpurple/protocols/novell/nmuser.c:1935
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Dosáhli jste vašeho limitu pro počet povolených kontaktů"
 
-#: ../src/protocols/gg/gg.c:1209
-msgid "Buddy list uploaded"
-msgstr "Seznam kamarádů odeslán"
+#: ../libpurple/protocols/novell/nmuser.c:1938
+msgid "You have entered an incorrect screen name"
+msgstr "Zadali jste neplatné jméno uživatele"
 
-#: ../src/protocols/gg/gg.c:1210
-msgid "Your buddy list was stored on the server."
-msgstr "Váš seznam kamarádů byl uložen na serveru."
+#: ../libpurple/protocols/novell/nmuser.c:1941
+msgid "An error occurred while updating the directory"
+msgstr "Při aktualizaci adresáře došlo k chybě."
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
-msgid "Connection failed."
-msgstr "Spojení selhalo."
+#: ../libpurple/protocols/novell/nmuser.c:1944
+msgid "Incompatible protocol version"
+msgstr "Nekompatibilní verze protokolu"
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
-msgid "Blocked"
-msgstr "Zablokován"
+#: ../libpurple/protocols/novell/nmuser.c:1947
+msgid "The user has blocked you"
+msgstr "Uživatel vás zablokoval"
 
-#: ../src/protocols/gg/gg.c:1468
-msgid "Add to chat"
-msgstr "Přidat k chatu"
+#: ../libpurple/protocols/novell/nmuser.c:1950
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "Tato demoverze nedovoluje přihlášení více než deseti uživatelů zároveň"
 
-#: ../src/protocols/gg/gg.c:1477
-msgid "Unblock"
-msgstr "Odblokovat"
+#: ../libpurple/protocols/novell/nmuser.c:1953
+msgid "The user is either offline or you are blocked"
+msgstr "Buď je uživatel odpojen, nebo jste blokováni"
 
-#: ../src/protocols/gg/gg.c:1481
-msgid "Block"
-msgstr "Blokovat"
+#: ../libpurple/protocols/novell/nmuser.c:1956
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Neznámá chyba: 0x%X"
 
-#: ../src/protocols/gg/gg.c:1498
-msgid "Chat _name:"
-msgstr "_Název chatu:"
+#: ../libpurple/protocols/novell/novell.c:124
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Přihlášení selhalo (%s)."
 
-#: ../src/protocols/gg/gg.c:1724
-msgid "Chat error"
-msgstr "Chyba chatu"
+#: ../libpurple/protocols/novell/novell.c:247
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "Nemohu odeslat zprávu. Nemohu získat detaily o uživateli (%s)."
 
-#: ../src/protocols/gg/gg.c:1725
-msgid "This chat name is already in use"
-msgstr "Tento název chatu se již používá"
+#: ../libpurple/protocols/novell/novell.c:396
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
 
-#: ../src/protocols/gg/gg.c:1808
-msgid "Not connected to the server."
-msgstr "Nepřipojen k serveru."
+#. TODO: Improve this! message to who or for what conference?
+#: ../libpurple/protocols/novell/novell.c:422
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Nemohu odeslat zprávu (%s)."
 
-#: ../src/protocols/gg/gg.c:1831
-msgid "Find buddies..."
-msgstr "Hledat kamarády..."
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Nemohu pozvat uživatele (%s)."
 
-#: ../src/protocols/gg/gg.c:1837
-msgid "Change password..."
-msgstr "Změnit heslo..."
+#: ../libpurple/protocols/novell/novell.c:532
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "Nemohu poslat zprávu %s. Nemohu vytvořit konferenci (%s)."
 
-#: ../src/protocols/gg/gg.c:1843
-msgid "Upload buddylist to Server"
-msgstr "Odeslat seznam kamarádů na server"
+#: ../libpurple/protocols/novell/novell.c:537
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Nemohu odeslat zprávu. Nemohu vytvořit konferenci (%s)."
 
-#: ../src/protocols/gg/gg.c:1847
-msgid "Download buddylist from Server"
-msgstr "Stáhnout seznam kamarádů ze serveru"
+#: ../libpurple/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Nemohu přesunout uživatele %s do složky %s v seznamu na serveru. Chyba při "
+"vytváření složky (%s)."
 
-#: ../src/protocols/gg/gg.c:1851
-msgid "Delete buddylist from Server"
-msgstr "Odstranit seznam kamarádů ze serveru"
+#: ../libpurple/protocols/novell/novell.c:632
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Nemohu přidat %s do vašeho seznamu kamarádů. Chyba při vytváření složky v "
+"seznamu na serveru (%s)."
 
-#: ../src/protocols/gg/gg.c:1855
-msgid "Save buddylist to file..."
-msgstr "Uložit seznam kamarádů do souboru..."
+#: ../libpurple/protocols/novell/novell.c:705
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Nemohu získat detaily o uživateli %s (%s)."
 
-#: ../src/protocols/gg/gg.c:1859
-msgid "Load buddylist from file..."
-msgstr "Načíst seznam kamarádů ze serveru..."
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Nemohu přidat uživatele do seznamu soukromí (%s)."
 
-#. magic
-#. major_version
-#. minor_version
-#. plugin type
-#. ui_requirement
-#. flags
-#. dependencies
-#. priority
-#. id
-#. name
-#. version
-#: ../src/protocols/gg/gg.c:1955
-msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Zásuvný modul protokolu Gadu-Gadu"
+#: ../libpurple/protocols/novell/novell.c:798
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Nemohu přidat %s do seznamu zakázaných (%s)."
 
-#. summary
-#: ../src/protocols/gg/gg.c:1956
-msgid "Polish popular IM"
-msgstr "Populární polský IM"
+#: ../libpurple/protocols/novell/novell.c:851
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Nemohu přidat %s do seznamu povolených (%s)."
 
-#: ../src/protocols/gg/gg.c:2004
-msgid "Gadu-Gadu User"
-msgstr "Uživatel Gadu-Gadu"
+#: ../libpurple/protocols/novell/novell.c:919
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
-msgid "Unknown command: %s"
-msgstr "Neznámý příkaz: %s"
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Nemohu změnit nastavení soukromí na straně serveru (%s)."
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
-msgid "current topic is: %s"
-msgstr "aktuální téma je: %s"
+msgid "Unable to create conference (%s)."
+msgstr "Nemohu vytvořit konferenci (%s)."
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
-msgid "No topic is set"
-msgstr "Nenastaveno žádné téma"
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
+msgid "Error communicating with server. Closing connection."
+msgstr "Chyba při komunikaci se serverem. Zavírám spojení."
 
-#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
-#: ../src/protocols/yahoo/yahoo_filexfer.c:252
-#: ../src/protocols/yahoo/yahoo_filexfer.c:261
-#: ../src/protocols/yahoo/yahoo_filexfer.c:270
-msgid "File Transfer Failed"
-msgstr "Přenos souborů selhal"
+#: ../libpurple/protocols/novell/novell.c:1476
+msgid "Telephone Number"
+msgstr "Telefonní číslo"
 
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
-msgid "Gaim could not open a listening port."
-msgstr "Gaim nemohl otevřít poslouchající port."
+#: ../libpurple/protocols/novell/novell.c:1482
+msgid "Personal Title"
+msgstr "Osobní titul"
 
-#: ../src/protocols/irc/irc.c:78
-msgid "Error displaying MOTD"
-msgstr "Chyba při zobrazování MOTD"
+#: ../libpurple/protocols/novell/novell.c:1486
+msgid "Mailstop"
+msgstr "Poštovní schránka"
 
-#: ../src/protocols/irc/irc.c:78
-msgid "No MOTD available"
-msgstr "MOTD není k dispozici"
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
+msgid "User ID"
+msgstr "ID uživatele"
 
-#: ../src/protocols/irc/irc.c:79
-msgid "There is no MOTD associated with this connection."
-msgstr "S tímto spojením není asociována MOTD."
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+#: ../libpurple/protocols/novell/novell.c:1515
+msgid "Full name"
+msgstr "Celé jméno"
 
-#: ../src/protocols/irc/irc.c:82
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
-msgid "MOTD for %s"
-msgstr "MOTD pro %s"
+msgid "GroupWise Conference %d"
+msgstr "Konference GroupWise %d"
 
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
-msgid "Server has disconnected"
-msgstr "Server se odpojil"
+#: ../libpurple/protocols/novell/novell.c:1668
+msgid "Unable to make SSL connection to server."
+msgstr "Nemohu vytvořit připojení SSL k serveru."
 
-#: ../src/protocols/irc/irc.c:242
-msgid "View MOTD"
-msgstr "Zobrazit MOTD"
+#: ../libpurple/protocols/novell/novell.c:1720
+msgid "Authenticating..."
+msgstr "Autentizuji..."
 
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
-msgid "_Channel:"
-msgstr "_Kanál:"
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "Nemohu se připojit k serveru."
 
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
-msgid "_Password:"
-msgstr "_Heslo:"
+#: ../libpurple/protocols/novell/novell.c:1735
+msgid "Waiting for response..."
+msgstr "Čekám na odpověď..."
 
-#: ../src/protocols/irc/irc.c:292
-msgid "IRC nicks may not contain whitespace"
-msgstr "Přezdívky IRC nemohou obsahovat mezery"
+#: ../libpurple/protocols/novell/novell.c:1870
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s byl pozván do této konverzace."
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
-msgid "SSL support unavailable"
-msgstr "Podpora SSL není k dispozici"
+#: ../libpurple/protocols/novell/novell.c:1898
+msgid "Invitation to Conversation"
+msgstr "Pozvání ke konverzaci"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
-msgid "Couldn't create socket"
-msgstr "Nemohu vytvořit socket"
+#: ../libpurple/protocols/novell/novell.c:1899
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"Pozvání od: %s\n"
+"\n"
+"Odesláno: %s"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
-msgid "Couldn't connect to host"
-msgstr "Nemohu se připojit k hostiteli"
+#: ../libpurple/protocols/novell/novell.c:1901
+msgid "Would you like to join the conversation?"
+msgstr "Chcete se připojit k této konverzaci?"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
-msgid "Connection Failed"
-msgstr "Spojení selhalo"
+#. we don't want to reconnect in this case
+#: ../libpurple/protocols/novell/novell.c:2012
+msgid "You have been logged out because you logged in at another workstation."
+msgstr ""
+"Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
-msgid "SSL Handshake Failed"
-msgstr "Vyjednávání SSL selhalo"
+#: ../libpurple/protocols/novell/novell.c:2069
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s je zřejmě odpojen a nedostal zprávu, kterou jste právě odeslali."
 
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
-msgid "Read error"
-msgstr "Chyba čtení"
+#. TODO: Would be nice to prompt if not set!
+#. *  purple_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: ../libpurple/protocols/novell/novell.c:2167
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
+"chcete připojit."
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
-#: ../src/protocols/yahoo/yahoochat.c:1430
-msgid "Users"
-msgstr "Uživatelé"
+#: ../libpurple/protocols/novell/novell.c:2195
+msgid "Error. SSL support is not installed."
+msgstr "Chyba. Není nainstalována podpora SSL."
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1439
-msgid "Topic"
-msgstr "Téma"
+#: ../libpurple/protocols/novell/novell.c:2504
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
 
 #. *< type
 #. *< ui_requirement
@@ -5850,5391 +6868,9031 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/irc/irc.c:877
-msgid "IRC Protocol Plugin"
-msgstr "Zásuvný modul protokolu IRC"
-
 #. *  summary
-#: ../src/protocols/irc/irc.c:878
-msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Zásuvný modul protokolu IRC, který není tak špatný"
+#. *  description
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Zásuvný modul protokolu Novell GroupWise Messenger"
 
-#. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
-msgid "Server"
-msgstr "Server"
+#: ../libpurple/protocols/novell/novell.c:3545
+msgid "Server address"
+msgstr "Adresa serveru"
 
-#: ../src/protocols/irc/irc.c:903
-msgid "Encodings"
-msgstr "Kódování"
+#: ../libpurple/protocols/novell/novell.c:3549
+msgid "Server port"
+msgstr "Port serveru"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:933
-msgid "Username"
-msgstr "Jméno uživatele"
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+msgid "Server closed the connection."
+msgstr "Server zavřel spojení."
+
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Ztraceno spojení se serverem:\n"
+"%s"
 
-#: ../src/protocols/irc/irc.c:909
-msgid "Real name"
-msgstr "Skutečné jméno"
+#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
+msgid "Received invalid data on connection with server."
+msgstr "Na spojení se serverem přijata neplatná data."
 
-#.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
-#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-#.
-#: ../src/protocols/irc/irc.c:917
-msgid "Use SSL"
-msgstr "Používat SSL"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
+msgid "AIM Protocol Plugin"
+msgstr "Zásuvný modul protokolu AIM"
 
-#: ../src/protocols/irc/msgs.c:103
-msgid "Bad mode"
-msgstr "Špatný tah"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
+msgid "ICQ Protocol Plugin"
+msgstr "Zásuvný modul protokolu ICQ"
+
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
+msgid "Encoding"
+msgstr "Kódování"
 
-#: ../src/protocols/irc/msgs.c:114
-#, c-format
-msgid "You are banned from %s."
-msgstr "Byl vám zakázán vstup do %s."
+#: ../libpurple/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "Vzdálený uživatel zavřel konverzaci."
 
-#: ../src/protocols/irc/msgs.c:115
-msgid "Banned"
-msgstr "Zakázán"
+#: ../libpurple/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "Vzdálený uživatel odmítl váš požadavek."
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
-msgid "Cannot ban %s: banlist is full"
-msgstr "Nemohu zakázat %s: seznam zakázaných je plný"
+msgid "Lost connection with the remote user:<br>%s"
+msgstr "Ztraceno spojení se vzdáleným uživatelem:<br>%s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr "<b>%s:</b> %s"
+#: ../libpurple/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr "Při spojení se vzdáleným uživatelem přijata neplatná data."
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
-#: ../src/protocols/silc/ops.c:1412
-msgid "Nick"
-msgstr "Přezdívka"
+#: ../libpurple/protocols/oscar/odc.c:49
+msgid "Could not establish a connection with the remote user."
+msgstr "Nemohu navázat spojení se vzdáleným uživatelem."
 
-#: ../src/protocols/irc/msgs.c:214
-msgid " <i>(ircop)</i>"
-msgstr " <i>(ircop)</i>"
+#: ../libpurple/protocols/oscar/odc.c:560
+msgid "Direct IM established"
+msgstr "Přímé IM navázáno"
 
-#: ../src/protocols/irc/msgs.c:215
-msgid " <i>(identified)</i>"
-msgstr " <i>(identifikován)</i>"
+#: ../libpurple/protocols/oscar/oft.c:656
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr "Soubor %s je %s, což je větší než maximální velikost %s."
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
-#: ../src/protocols/yahoo/yahoo_profile.c:691
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "Skutečné jméno"
+#: ../libpurple/protocols/oscar/oscar.c:115
+msgid "Invalid error"
+msgstr "Neplatná chyba"
 
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
-msgid "Currently on"
-msgstr "Momentálně na"
+#: ../libpurple/protocols/oscar/oscar.c:116
+msgid "Invalid SNAC"
+msgstr "Neplatné SNAC"
 
-#: ../src/protocols/irc/msgs.c:242
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Nečinný:</b> %s<br>"
+#: ../libpurple/protocols/oscar/oscar.c:117
+msgid "Rate to host"
+msgstr "Rychlost k hostiteli"
 
-#: ../src/protocols/irc/msgs.c:244
-msgid "Online since"
-msgstr "Připojen od"
+#: ../libpurple/protocols/oscar/oscar.c:118
+msgid "Rate to client"
+msgstr "Rychlost ke klientovi"
 
-#: ../src/protocols/irc/msgs.c:248
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr "<br><b>Definující přídavné jméno:</b> Skvělý<br>"
+#: ../libpurple/protocols/oscar/oscar.c:120
+msgid "Service unavailable"
+msgstr "Služba nedostupná"
 
-#: ../src/protocols/irc/msgs.c:318
-#, c-format
-msgid "%s has changed the topic to: %s"
-msgstr "%s změnil téma na: %s"
+#: ../libpurple/protocols/oscar/oscar.c:121
+msgid "Service not defined"
+msgstr "Služba nedefinována"
 
-#: ../src/protocols/irc/msgs.c:325
-#, c-format
-msgid "The topic for %s is: %s"
-msgstr "Téma pro %s je: %s"
+#: ../libpurple/protocols/oscar/oscar.c:122
+msgid "Obsolete SNAC"
+msgstr "Zastaralé SNAC"
 
-#: ../src/protocols/irc/msgs.c:343
-#, c-format
-msgid "Unknown message '%s'"
-msgstr "Neznámá zpráva '%s'"
+#: ../libpurple/protocols/oscar/oscar.c:123
+msgid "Not supported by host"
+msgstr "Nepodporováno hostitelem"
 
-#: ../src/protocols/irc/msgs.c:344
-msgid "Unknown message"
-msgstr "Neznámá zpráva"
+#: ../libpurple/protocols/oscar/oscar.c:124
+msgid "Not supported by client"
+msgstr "Nepodporováno klientem"
 
-#: ../src/protocols/irc/msgs.c:344
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim odeslal zprávu, které IRC server nerozuměl."
+#: ../libpurple/protocols/oscar/oscar.c:125
+msgid "Refused by client"
+msgstr "Odmítnuto klientem"
 
-#: ../src/protocols/irc/msgs.c:367
-#, c-format
-msgid "Users on %s: %s"
-msgstr "Uživatelé na %s: %s"
+#: ../libpurple/protocols/oscar/oscar.c:126
+msgid "Reply too big"
+msgstr "Odpověď příliš velká"
 
-#: ../src/protocols/irc/msgs.c:495
-msgid "Time Response"
-msgstr "Odpověď s časem"
+#: ../libpurple/protocols/oscar/oscar.c:127
+msgid "Responses lost"
+msgstr "Odpovědi ztraceny"
 
-#: ../src/protocols/irc/msgs.c:496
-msgid "The IRC server's local time is:"
-msgstr "Místní čas IRC serveru je:"
+#: ../libpurple/protocols/oscar/oscar.c:128
+msgid "Request denied"
+msgstr "Požadavek zamítnut"
 
-#: ../src/protocols/irc/msgs.c:507
-msgid "No such channel"
-msgstr "Takový kanál neexistuje"
+#: ../libpurple/protocols/oscar/oscar.c:129
+msgid "Busted SNAC payload"
+msgstr "Poškozená data SNAC"
 
-#. does this happen?
-#: ../src/protocols/irc/msgs.c:518
-msgid "no such channel"
-msgstr "Takový kanál neexistuje"
+#: ../libpurple/protocols/oscar/oscar.c:130
+msgid "Insufficient rights"
+msgstr "Nedostatečná oprávnění"
 
-#: ../src/protocols/irc/msgs.c:521
-msgid "User is not logged in"
-msgstr "Uživatel není přihlášen"
+#: ../libpurple/protocols/oscar/oscar.c:131
+msgid "In local permit/deny"
+msgstr "V místním povolit/zakázat"
 
-#: ../src/protocols/irc/msgs.c:526
-msgid "No such nick or channel"
-msgstr "Taková přezdívka nebo kanál neexistuje"
+#: ../libpurple/protocols/oscar/oscar.c:132
+msgid "Too evil (sender)"
+msgstr "Příliš zlý (odesílatel)"
 
-#: ../src/protocols/irc/msgs.c:546
-msgid "Could not send"
-msgstr "Nemohu odeslat"
+#: ../libpurple/protocols/oscar/oscar.c:133
+msgid "Too evil (receiver)"
+msgstr "Příliš zlý (příjemce)"
 
-#: ../src/protocols/irc/msgs.c:602
-#, c-format
-msgid "Joining %s requires an invitation."
-msgstr "Připojení se k %s vyžaduje pozvání."
+#: ../libpurple/protocols/oscar/oscar.c:134
+msgid "User temporarily unavailable"
+msgstr "Uživatel dočasně nedostupný"
 
-#: ../src/protocols/irc/msgs.c:603
-msgid "Invitation only"
-msgstr "Jen pro pozvané"
+#: ../libpurple/protocols/oscar/oscar.c:135
+msgid "No match"
+msgstr "Žádná shoda"
 
-#: ../src/protocols/irc/msgs.c:704
-#, c-format
-msgid "You have been kicked by %s: (%s)"
-msgstr "Byli jste vykopnuti z %s: (%s)"
+#: ../libpurple/protocols/oscar/oscar.c:136
+msgid "List overflow"
+msgstr "Přetečení seznamu"
 
-#. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
-#, c-format
-msgid "Kicked by %s (%s)"
-msgstr "Vykopnut od %s: (%s)"
+#: ../libpurple/protocols/oscar/oscar.c:137
+msgid "Request ambiguous"
+msgstr "Požadavek nejednoznačný"
 
-#: ../src/protocols/irc/msgs.c:732
-#, c-format
-msgid "mode (%s %s) by %s"
-msgstr "režim (%s %s) od %s"
+#: ../libpurple/protocols/oscar/oscar.c:138
+msgid "Queue full"
+msgstr "Fronta plná"
 
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
-msgid "Invalid nickname"
-msgstr "Neplatná přezdívka"
+#: ../libpurple/protocols/oscar/oscar.c:139
+msgid "Not while on AOL"
+msgstr "Ne když na AOL"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr "Vámi zvolená přezdívka byla serverem odmítnuta. Pravděpodobně obsahuje neplatné znaky."
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr "(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, pravděpodobně používá neočekávané kódování. Pokud víte, které kódování používá, můžete to zadat v pokročilých možnostech svého účtu AIM/ICQ.)"
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/oscar/oscar.c:456
+#, c-format
 msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Vámi zvolený název účtu byl serverem odmítnut. Pravděpodobně obsahuje "
-"neplatné znaky."
-
-#: ../src/protocols/irc/msgs.c:863
-msgid "Cannot change nick"
-msgstr "Nemohu změnit přezdívku"
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr "(Při přijímání této zprávy došlo k chybě. Buď máte vy a %s zvolena jiná kódování, nebo má %s klienta s chybami.)"
 
-#: ../src/protocols/irc/msgs.c:863
-msgid "Could not change nick"
-msgstr "Nemohu změnit přezdívku"
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+msgid "Buddy Icon"
+msgstr "Ikona kamaráda"
 
-#: ../src/protocols/irc/msgs.c:884
-#, c-format
-msgid "You have parted the channel%s%s"
-msgstr "Opustili jste kanál%s%s"
+#: ../libpurple/protocols/oscar/oscar.c:641
+msgid "Voice"
+msgstr "Hlas"
 
-#: ../src/protocols/irc/msgs.c:926
-msgid "Error: invalid PONG from server"
-msgstr "Chyba: neplatný PONG od serveru"
+#: ../libpurple/protocols/oscar/oscar.c:644
+msgid "AIM Direct IM"
+msgstr "AIM Přímé IM"
 
-#: ../src/protocols/irc/msgs.c:928
-#, c-format
-msgid "PING reply -- Lag: %lu seconds"
-msgstr "Odpověď na PING -- zpoždění: %lu sekund"
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "Chat"
 
-#: ../src/protocols/irc/msgs.c:1003
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Nemohu se připojit k %s:"
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
+msgid "Get File"
+msgstr "Získat soubor"
 
-#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
-msgid "Cannot join channel"
-msgstr "Nemohu se připojit ke kanálu"
+#: ../libpurple/protocols/oscar/oscar.c:657
+msgid "Games"
+msgstr "Hry"
 
-#: ../src/protocols/irc/msgs.c:1038
-msgid "Nick or channel is temporarily unavailable."
-msgstr "Přezdívka nebo kanál je dočasně nedostupná."
+#: ../libpurple/protocols/oscar/oscar.c:660
+msgid "Add-Ins"
+msgstr "Přídavky"
 
-#: ../src/protocols/irc/msgs.c:1050
-#, c-format
-msgid "Wallops from %s"
-msgstr "Wallops od %s"
+#: ../libpurple/protocols/oscar/oscar.c:663
+msgid "Send Buddy List"
+msgstr "Odeslat seznam kamarádů"
 
-#: ../src/protocols/irc/parse.c:114
-msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;akce, kterou provést&gt;: Provést akci."
+#: ../libpurple/protocols/oscar/oscar.c:666
+msgid "ICQ Direct Connect"
+msgstr "Přímé spojení ICQ"
 
-#: ../src/protocols/irc/parse.c:115
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [zpráva]: Nastavit zprávu o nepřítomnosti, nebo nepoužijte žádnou "
-"zprávu pro návrat z nepřítomnosti."
+#: ../libpurple/protocols/oscar/oscar.c:669
+msgid "AP User"
+msgstr "Uživatel AP"
 
-#: ../src/protocols/irc/parse.c:116
-msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Odeslat příkaz chanservu"
+#: ../libpurple/protocols/oscar/oscar.c:672
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
 
-#: ../src/protocols/irc/parse.c:117
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;přezd1&gt; [přezd2] ...:  Odejmout někomu stav operátora kanálu. "
-"Abyste to mohli udělat, musíte být operátor kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:675
+msgid "Nihilist"
+msgstr "Nihilist"
 
-#: ../src/protocols/irc/parse.c:118
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;přezd1&gt; [přezd2] ...: Odejmout někomu stav hlasu v kanálu, "
-"což mu brání mluvit, pokud je kanál moderován (+m). Abyste to mohli udělat, "
-"musíte být operátor kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:678
+msgid "ICQ Server Relay"
+msgstr "Relay ICQ serveru"
 
-#: ../src/protocols/irc/parse.c:119
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;přezd&gt; [místnost]: Pozvat někoho, aby se k vám přidal v "
-"určeném nebo aktuálním kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:681
+msgid "Old ICQ UTF8"
+msgstr "Staré ICQ UTF8"
 
-#: ../src/protocols/irc/parse.c:120
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
-"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
-"vyžadováno."
+#: ../libpurple/protocols/oscar/oscar.c:684
+msgid "Trillian Encryption"
+msgstr "Šifrování Trillian"
 
-#: ../src/protocols/irc/parse.c:121
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;místnost1&gt;[,místnost1][,...] [klíč1[,klíč2][,...]]: Vstoupit do "
-"jednoho nebo více kanálů, nepovinně s poskytnutím klíče kanálu, je-li to "
-"vyžadováno."
+#: ../libpurple/protocols/oscar/oscar.c:687
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
 
-#: ../src/protocols/irc/parse.c:122
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;přezdívka&gt; [zpráva]: Odstranit někoho z kanálu. Abyste to mohli "
-"udělat, musíte být operátor kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:690
+msgid "Hiptop"
+msgstr "Hiptop"
 
-#: ../src/protocols/irc/parse.c:123
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list: Zobrazit seznam místností chatu na síti. <i>Varování, některé servery "
-"vás za to mohou odpojit.</i>"
+#: ../libpurple/protocols/oscar/oscar.c:693
+msgid "Security Enabled"
+msgstr "Zabezpečení povoleno"
 
-#: ../src/protocols/irc/parse.c:124
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;akce, kterou provést&gt;: Provést akci."
+#: ../libpurple/protocols/oscar/oscar.c:696
+msgid "Video Chat"
+msgstr "Video Chat"
 
-#: ../src/protocols/irc/parse.c:125
-msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Odeslat příkaz memoservu"
+#: ../libpurple/protocols/oscar/oscar.c:700
+msgid "iChat AV"
+msgstr "iChat AV"
 
-#: ../src/protocols/irc/parse.c:126
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;přezdívka|kanál&gt;: Nastavit nebo zrušit režim kanálu nebo uživatele."
+#: ../libpurple/protocols/oscar/oscar.c:703
+msgid "Live Video"
+msgstr "Živé video"
 
-#: ../src/protocols/irc/parse.c:127
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Poslat soukromou zprávu uživateli (ne "
-"kanálu)."
+#: ../libpurple/protocols/oscar/oscar.c:706
+msgid "Camera"
+msgstr "Kamera"
 
-#: ../src/protocols/irc/parse.c:128
-msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [kanál]: Vypsat uživatele momentálně v kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
+msgid "Free For Chat"
+msgstr "Volný pro chat"
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
-msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;nová přezdívka&gt;: Změnit vaši přezdívku."
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
+msgid "Not Available"
+msgstr "Nejsem k dispozici"
 
-#: ../src/protocols/irc/parse.c:130
-msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Odeslat příkaz nickservu"
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
+msgid "Occupied"
+msgstr "Zaměstnán"
 
-#: ../src/protocols/irc/parse.c:131
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav operátora kanálu. Abyste "
-"to mohli udělat, musíte být operátor kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:734
+msgid "Web Aware"
+msgstr "Ví o WWW"
 
-#: ../src/protocols/irc/parse.c:132
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
-"použít."
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
+msgid "Invisible"
+msgstr "Neviditelný"
 
-#: ../src/protocols/irc/parse.c:133
-msgid "operserv: Send a command to operserv"
-msgstr "operserv: Odeslat příkaz operservu"
+#: ../libpurple/protocols/oscar/oscar.c:738
+msgid "Online"
+msgstr "Připojen"
 
-#: ../src/protocols/irc/parse.c:134
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [místnost] [zpráva]: Opustit aktuální nebo určený kanál s nepovinnou "
-"zprávou."
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
+msgid "IP Address"
+msgstr "IP adresa"
+
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
+msgid "Warning Level"
+msgstr "Úroveň varování"
+
+#: ../libpurple/protocols/oscar/oscar.c:854
+msgid "Buddy Comment"
+msgstr "Poznámka o kamarádovi"
 
-#: ../src/protocols/irc/parse.c:135
+#: ../libpurple/protocols/oscar/oscar.c:994
+#, c-format
 msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
+"Could not connect to authentication server:\n"
+"%s"
 msgstr ""
-"ping [přezdívka]: Zjišťuje, jaké zpoždění má uživatel (nebo server, pokud "
-"není určen uživatel)."
+"Nemohu se připojit k autentizačnímu serveru:\n"
+"%s"
 
-#: ../src/protocols/irc/parse.c:136
+#: ../libpurple/protocols/oscar/oscar.c:1002
+#, c-format
 msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
+"Could not connect to BOS server:\n"
+"%s"
 msgstr ""
-"query &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat soukromou zprávu uživateli "
-"(ne kanálu)."
+"Nemohu se připojit k serveru BOS:\n"
+"%s"
 
-#: ../src/protocols/irc/parse.c:137
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [zpráva]: Odpojit se od serveru s nepovinnou zprávou."
+#: ../libpurple/protocols/oscar/oscar.c:1042
+msgid "Screen name sent"
+msgstr "Jméno uživatele odesláno"
 
-#: ../src/protocols/irc/parse.c:138
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]: Poslat serveru nezpracovaný příkaz."
+#: ../libpurple/protocols/oscar/oscar.c:1047
+msgid "Connection established, cookie sent"
+msgstr "Spojení navázáno, cookie odesláno"
 
-#: ../src/protocols/irc/parse.c:139
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;přezdívka&gt; [zpráva]: Odstranit někoho z místnosti. Abyste to "
-"mohli udělat, musíte být operátor kanálu."
+#. TODO: Don't call this with ssi
+#: ../libpurple/protocols/oscar/oscar.c:1076
+msgid "Finalizing connection"
+msgstr "Dokončuji spojení"
 
-#: ../src/protocols/irc/parse.c:140
-msgid "time: Displays the current local time at the IRC server."
-msgstr "time: Zobrazí momentální místní čas na IRC serveru."
+#: ../libpurple/protocols/oscar/oscar.c:1258
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele není platné. Jméno uživatele musí být platná e-mailová adresa nebo začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo obsahovat jen číslice."
+
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
+msgid "Invalid screen name."
+msgstr "Neplatné jméno uživatele."
 
-#: ../src/protocols/irc/parse.c:141
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [nové téma]: Zobrazit nebo změnit téma kanálu."
+#: ../libpurple/protocols/oscar/oscar.c:1350
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
+msgid "Incorrect password."
+msgstr "Nesprávné heslo."
 
-#: ../src/protocols/irc/parse.c:142
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Nastavit nebo zrušit režim uživatele."
+#: ../libpurple/protocols/oscar/oscar.c:1355
+msgid "Your account is currently suspended."
+msgstr "Váš účet je momentálně suspendován."
 
-#: ../src/protocols/irc/parse.c:143
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;přezd1&gt; [přezd2] ...: Udělit někomu stav hlasu v kanálu. Abyste "
-"to mohli udělat, musíte být operátor kanálu."
+#. service temporarily unavailable
+#: ../libpurple/protocols/oscar/oscar.c:1359
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
 
-#: ../src/protocols/irc/parse.c:144
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"wallops &lt;zpráva&gt;: Pokud nevíte, co to je, pravděpodobně to nemůžete "
-"použít."
-
-#: ../src/protocols/irc/parse.c:145
-msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [server] &lt;přezdívka&gt;: Získat informace o uživateli."
+"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
+"to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
 
-#: ../src/protocols/irc/parse.c:439
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
-msgid "Reply time from %s: %lu seconds"
-msgstr "Čas odpovědi z %s: %lu sekund"
-
-#: ../src/protocols/irc/parse.c:440
-msgid "PONG"
-msgstr "PONG"
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"Verze klienta, kterou používáte, je příliš stará. Aktualizujte prosím na %s"
 
-#: ../src/protocols/irc/parse.c:440
-msgid "CTCP PING reply"
-msgstr "Odpověď na CTCP PING"
+#: ../libpurple/protocols/oscar/oscar.c:1408
+msgid "Could Not Connect"
+msgstr "Nemohu se připojit"
 
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
-msgid "Disconnected."
-msgstr "Odpojen."
+#: ../libpurple/protocols/oscar/oscar.c:1412
+msgid "Received authorization"
+msgstr "Přijata autorizace"
 
-#: ../src/protocols/jabber/auth.c:51
-msgid ""
-"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-"account properties"
-msgstr ""
-"Server pro přihlášení vyžaduje TLS/SSL. Zvolte \"Používat TLS, pokud je k "
-"dispozici\" ve vlastnostech účtu"
+#: ../libpurple/protocols/oscar/oscar.c:1434
+msgid "The SecurID key entered is invalid."
+msgstr "Zadaný klíč SecurID není platný."
 
-#: ../src/protocols/jabber/auth.c:53
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
+#: ../libpurple/protocols/oscar/oscar.c:1447
+msgid "Enter SecurID"
+msgstr "Zadejte SecurID"
 
-#: ../src/protocols/jabber/auth.c:114
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
+#: ../libpurple/protocols/oscar/oscar.c:1448
+msgid "Enter the 6 digit number from the digital display."
+msgstr "Zadejte šesticiferné číslo z digitálního displeje."
 
-#: ../src/protocols/jabber/auth.c:234
-msgid "Server couldn't authenticate you without a password"
-msgstr "Server vás nemohl bez hesla autentizovat"
-
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
-msgid "Plaintext Authentication"
-msgstr "Textová autentizace"
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+msgid "_OK"
+msgstr "_Budiž"
 
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
+#, c-format
 msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
 msgstr ""
-"Tento server vyžaduje textovou autentizaci přes nešifrované spojení. Povolit "
-"a pokračovat v autentizaci?"
+"Možná budete brzo odpojen. Možná budete chtít používat TOC, dokud toto není "
+"opraveno. Hledejte aktualizace na %s."
 
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
-msgid "Server does not use any supported authentication method"
-msgstr "Server nepoužívá žádnou podporovanou metodu autentizace"
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nemohu získat platný přihlašovací hash AIM."
 
-#. This should never happen!
-#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Neplatná odpověď od serveru."
+#: ../libpurple/protocols/oscar/oscar.c:1620
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Možná budete brzo odpojen. Hledejte aktualizace na %s."
 
-#: ../src/protocols/jabber/auth.c:632
-msgid "Invalid challenge from server"
-msgstr "Neplatná výzva od serveru"
+#: ../libpurple/protocols/oscar/oscar.c:1623
+msgid "Unable to get a valid login hash."
+msgstr "Nemohu získat platný přihlašovací hash."
 
-#: ../src/protocols/jabber/auth.c:719
-msgid "SASL error"
-msgstr "Chyba SASL"
+#: ../libpurple/protocols/oscar/oscar.c:1652
+msgid "Password sent"
+msgstr "Heslo odesláno"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
-#: ../src/protocols/silc/ops.c:1020
-msgid "Full Name"
-msgstr "Celé jméno"
+#: ../libpurple/protocols/oscar/oscar.c:1708
+msgid "Unable to initialize connection"
+msgstr "Nemohu inicializovat spojení"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
-#: ../src/protocols/silc/ops.c:1032
-msgid "Family Name"
-msgstr "Příjmení"
+#: ../libpurple/protocols/oscar/oscar.c:2195
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+"Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
-msgid "Given Name"
-msgstr "Křestní jméno"
+#: ../libpurple/protocols/oscar/oscar.c:2223
+msgid "Authorization Request Message:"
+msgstr "Zpráva požadavku na autorizaci"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
-msgid "URL"
-msgstr "URL"
+#: ../libpurple/protocols/oscar/oscar.c:2224
+msgid "Please authorize me!"
+msgstr "Autorizujte mě prosím!"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
-msgid "Street Address"
-msgstr "Adresa ulice"
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+msgid "No reason given."
+msgstr "Neudán žádný důvod."
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
-msgid "Extended Address"
-msgstr "Rozšířená adresa"
+#: ../libpurple/protocols/oscar/oscar.c:2272
+msgid "Authorization Denied Message:"
+msgstr "Zpráva odmítnutí autorizace:"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
-msgid "Locality"
-msgstr "Lokalita"
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"Uživatel %u odmítl váš požadavek přidat jej do vašeho seznamu kamarádů z "
+"následujícího důvodu:\n"
+"%s"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
-msgid "Region"
-msgstr "Region"
+#: ../libpurple/protocols/oscar/oscar.c:2401
+msgid "ICQ authorization denied."
+msgstr "Autorizace ICQ odepřena."
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
-msgid "Postal Code"
-msgstr "PSČ"
+#. Someone has granted you authorization
+#: ../libpurple/protocols/oscar/oscar.c:2408
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+"Uživatel %u splnil váš požadavek na jeho přidání do vašeho seznamu kamarádů."
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:943
-msgid "Country"
-msgstr "Země"
-
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
-msgid "Telephone"
-msgstr "Telefon"
+#: ../libpurple/protocols/oscar/oscar.c:2416
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"Přijali jste speciální zprávu\n"
+"\n"
+"Od: %s [%s]\n"
+"%s"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
-msgid "Organization Name"
-msgstr "Název organizace"
+#: ../libpurple/protocols/oscar/oscar.c:2424
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"Přijali jste page ICQ\n"
+"\n"
+"Od: %s [%s]\n"
+"%s"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
-msgid "Organization Unit"
-msgstr "Jednotka organizace"
+#: ../libpurple/protocols/oscar/oscar.c:2432
+#, c-format
+msgid ""
+"You have received an ICQ e-mail from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"Přijali jste e-mail ICQ od %s [%s]\n"
+"\n"
+"Zpráva je:\n"
+"%s"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
-msgid "Role"
-msgstr "Role"
+#: ../libpurple/protocols/oscar/oscar.c:2453
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "Uživatel ICQ %u vám poslal kamaráda: %s (%s)"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
-msgid "Birthday"
-msgstr "Datum narození"
+#: ../libpurple/protocols/oscar/oscar.c:2459
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "Chcete přidat tohoto kamaráda do svého seznamu kamarádů?"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Upravit vCard Jabberu"
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Přidat"
 
-#: ../src/protocols/jabber/buddy.c:569
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Všechny údaje níže jsou nepovinné. Zadejte jen ty informace, které chcete."
+#: ../libpurple/protocols/oscar/oscar.c:2465
+msgid "_Decline"
+msgstr "_Odmítnout"
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
-msgid "Resource"
-msgstr "Zdroj"
+#: ../libpurple/protocols/oscar/oscar.c:2589
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] "Přišli jste o %hu zprávu od %s, protože byla neplatná."
+msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly neplatné."
+msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly neplatné."
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
-msgid "Middle Name"
-msgstr "Prostřední jméno"
+#: ../libpurple/protocols/oscar/oscar.c:2598
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] "Přišli jste o %hu zprávu od %s, protože byla příliš velká."
+msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly příliš velké."
+msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly příliš velké."
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
-#: ../src/protocols/silc/ops.c:1064
-msgid "Address"
-msgstr "Adresa"
+#: ../libpurple/protocols/oscar/oscar.c:2607
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"Přišli jste o %hu zprávu od %s, protože limit rychlosti byl překročen."
+msgstr[1] ""
+"Přišli jste o %hu zprávy od %s, protože limit rychlosti byl překročen."
+msgstr[2] ""
+"Přišli jste o %hu zpráv od %s, protože limit rychlosti byl překročen."
 
-#: ../src/protocols/jabber/buddy.c:725
-msgid "P.O. Box"
-msgstr "P.O. Box"
+#: ../libpurple/protocols/oscar/oscar.c:2616
+#, c-format
+msgid "You missed %hu message from %s because he/she was too evil."
+msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgstr[0] "Přišli jste o %hu zprávu od %s, protože byli příliš zlí."
+msgstr[1] "Přišli jste o %hu zprávy od %s, protože byli příliš zlí."
+msgstr[2] "Přišli jste o %hu zpráv od %s, protože byli příliš zlí."
 
-#: ../src/protocols/jabber/buddy.c:839
-msgid "Photo"
-msgstr "Foto"
+#: ../libpurple/protocols/oscar/oscar.c:2625
+#, c-format
+msgid "You missed %hu message from %s because you are too evil."
+msgid_plural "You missed %hu messages from %s because you are too evil."
+msgstr[0] "Přišli jste o %hu zprávu od %s, protože jste velmi zlí."
+msgstr[1] "Přišli jste o %hu zprávy od %s, protože jste velmi zlí."
+msgstr[2] "Přišli jste o %hu zpráv od %s, protože jste velmi zlí."
 
-#: ../src/protocols/jabber/buddy.c:839
-msgid "Logo"
-msgstr "Logo"
+#: ../libpurple/protocols/oscar/oscar.c:2634
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] "Přišli jste o %hu zprávu od %s z neznámého důvodu."
+msgstr[1] "Přišli jste o %hu zprávy od %s z neznámého důvodu."
+msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
 
-#: ../src/protocols/jabber/buddy.c:1042
-msgid "Un-hide From"
-msgstr "Zrušit skrytí Od"
+#. Data is assumed to be the destination sn
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nemohu odeslat zprávu: %s"
 
-#: ../src/protocols/jabber/buddy.c:1046
-msgid "Temporarily Hide From"
-msgstr "Dočasně skrýt Od"
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
+msgid "Unknown reason."
+msgstr "Neznámý důvod."
 
-#. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
-msgid "Cancel Presence Notification"
-msgstr "Zrušit upozornění na přítomnosti"
+#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/sametime/sametime.c:2409
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Nemohu odeslat zprávu k %s:"
 
-#: ../src/protocols/jabber/buddy.c:1061
-msgid "(Re-)Request authorization"
-msgstr "(Znovu) vyžádat autorizaci"
+#: ../libpurple/protocols/oscar/oscar.c:2858
+#, c-format
+msgid "User information not available: %s"
+msgstr "Informace o uživateli nejsou k dispozici: %s"
 
-#. if(NOT ME)
-#. shouldn't this just happen automatically when the buddy is
-#. removed?
-#: ../src/protocols/jabber/buddy.c:1070
-msgid "Unsubscribe"
-msgstr "Odhlásit"
+#: ../libpurple/protocols/oscar/oscar.c:2889
+msgid "Online Since"
+msgstr "Odpojen od"
 
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "Chyba"
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+msgid "Member Since"
+msgstr "Člen od"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
-msgid "Chatty"
-msgstr "Chatty"
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Schopnosti"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
-msgid "Extended Away"
-msgstr "Pryč na dlouho"
+#: ../libpurple/protocols/oscar/oscar.c:2929
+msgid "Available Message"
+msgstr "Zpráva o dostupnosti"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
-#: ../src/protocols/sametime/sametime.c:3285
-msgid "Do Not Disturb"
-msgstr "Nerušit"
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Profil"
 
-#: ../src/protocols/jabber/buddy.c:1289
-msgid "The following are the results of your search"
-msgstr "Výsledky vašeho hledání jsou následující"
+#: ../libpurple/protocols/oscar/oscar.c:3037
+msgid "Your AIM connection may be lost."
+msgstr "Vaše spojení AIM může být přerušeno."
 
-#: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Vyplňte jedno nebo více polí pro hledání odpovídajících uživatelů Jabberu."
+#. The conversion failed!
+#: ../libpurple/protocols/oscar/oscar.c:3225
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
+"znaky.]"
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "Křestní jméno"
+#: ../libpurple/protocols/oscar/oscar.c:3389
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
+"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to znovu."
 
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
-msgid "Last Name"
-msgstr "Příjmení"
+#: ../libpurple/protocols/oscar/oscar.c:3472
+#: ../libpurple/protocols/toc/toc.c:977
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Byl jste odpojen z místnosti chatu %s."
 
-#: ../src/protocols/jabber/buddy.c:1407
-msgid "E-Mail Address"
-msgstr "E-mailová adresa"
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
+msgid "Mobile Phone"
+msgstr "Mobilní telefon"
 
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
-msgid "Search for Jabber users"
-msgstr "Hledat uživatele Jabberu"
+#: ../libpurple/protocols/oscar/oscar.c:3752
+msgid "Personal Web Page"
+msgstr "Osobní WWW stránka"
 
-#: ../src/protocols/jabber/buddy.c:1431
-msgid "Invalid Directory"
-msgstr "Neplatný adresář"
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/qq/buddy_info.c:40
+msgid "Additional Information"
+msgstr "Přídavné informace"
 
-#: ../src/protocols/jabber/buddy.c:1448
-msgid "Enter a User Directory"
-msgstr "Zadejte adresář uživatelů"
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
+msgid "Zip Code"
+msgstr "PSČ"
 
-#: ../src/protocols/jabber/buddy.c:1449
-msgid "Select a user directory to search"
-msgstr "Zvolte adresář uživatelů, ve kterém hledat"
+#: ../libpurple/protocols/oscar/oscar.c:3808
+msgid "Division"
+msgstr "Oddělení"
 
-#: ../src/protocols/jabber/buddy.c:1452
-msgid "Search Directory"
-msgstr "Hledat v adresáři"
+#: ../libpurple/protocols/oscar/oscar.c:3809
+msgid "Position"
+msgstr "Pozice"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
-#: ../src/protocols/yahoo/yahoochat.c:998
-msgid "_Room:"
-msgstr "_Místnost:"
+#: ../libpurple/protocols/oscar/oscar.c:3811
+msgid "Web Page"
+msgstr "WWW stránka"
 
-#: ../src/protocols/jabber/chat.c:47
-msgid "_Server:"
-msgstr "_Server:"
+#: ../libpurple/protocols/oscar/oscar.c:3814
+msgid "Work Information"
+msgstr "Pracovní informace"
 
-#: ../src/protocols/jabber/chat.c:53
-msgid "_Handle:"
-msgstr "_Přezdívka:"
+#: ../libpurple/protocols/oscar/oscar.c:3870
+msgid "Pop-Up Message"
+msgstr "Vyskakovací zpráva"
 
-#: ../src/protocols/jabber/chat.c:223
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
-msgid "%s is not a valid room name"
-msgstr "%s není platný název místnosti"
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "Následující jméno uživatele je asociováno s %s"
+msgstr[1] "Následující jména uživatele jsou asociována s %s"
+msgstr[2] "Následující jména uživatele jsou asociována s %s"
 
-#: ../src/protocols/jabber/chat.c:224
-msgid "Invalid Room Name"
-msgstr "Neplatný název místnosti"
+#: ../libpurple/protocols/oscar/oscar.c:3915
+msgid "Screen name"
+msgstr "Jméno uživatele"
 
-#: ../src/protocols/jabber/chat.c:229
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
-msgid "%s is not a valid server name"
-msgstr "%s není platný název serveru"
-
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
-msgid "Invalid Server Name"
-msgstr "Neplatný název serveru"
+msgid "No results found for e-mail address %s"
+msgstr "Pro e-mailovou adresu %s nebyly nalezeny žádné výsledky"
 
-#: ../src/protocols/jabber/chat.c:235
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
-msgid "%s is not a valid room handle"
-msgstr "%s není platná přezdívka místnosti"
+msgid "You should receive an e-mail asking to confirm %s."
+msgstr "Měli byste dostat e-mail žádající o potvrzení %s."
 
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
-msgid "Invalid Room Handle"
-msgstr "Neplatná přezdívka místnosti"
+#: ../libpurple/protocols/oscar/oscar.c:3964
+msgid "Account Confirmation Requested"
+msgstr "Požadováno potvrzení účtu"
 
-#: ../src/protocols/jabber/chat.c:395
-msgid "Configuration error"
-msgstr "Chyba nastavení"
+#: ../libpurple/protocols/oscar/oscar.c:3995
+msgid "Error Changing Account Info"
+msgstr "Chyba při změně informací o účtu"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
-msgid "Unable to configure"
-msgstr "Nemohu nastavit"
+#: ../libpurple/protocols/oscar/oscar.c:3998
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+"Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
+"uživatele se liší od původního."
 
-#: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "Chyba nastavení místnosti"
+#: ../libpurple/protocols/oscar/oscar.c:4001
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr ""
+"Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože není platné."
 
-#: ../src/protocols/jabber/chat.c:421
-msgid "This room is not capable of being configured"
-msgstr "Tuto místnost není možné nastavovat"
-
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
-msgid "Registration error"
-msgstr "Chyba registrace"
+#: ../libpurple/protocols/oscar/oscar.c:4004
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
+"uživatele je příliš dlouhé."
 
-#: ../src/protocols/jabber/chat.c:628
-msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Změna přezdívky není podporována v ne-MUC místnostech"
+#: ../libpurple/protocols/oscar/oscar.c:4007
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože pro toto jméno "
+"uživatele již existuje požadavek."
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error retrieving room list"
-msgstr "Chyba při získávání seznamu místností"
+#: ../libpurple/protocols/oscar/oscar.c:4010
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa má "
+"asociováno příliš mnoho jmen uživatelů."
 
-#: ../src/protocols/jabber/chat.c:737
-msgid "Invalid Server"
-msgstr "Neplatný server"
+#: ../libpurple/protocols/oscar/oscar.c:4013
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa je "
+"neplatná."
 
-#: ../src/protocols/jabber/chat.c:775
-msgid "Enter a Conference Server"
-msgstr "Zadejte server konference"
+#: ../libpurple/protocols/oscar/oscar.c:4016
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "Chyba 0x%04x: Neznámá chyba."
 
-#: ../src/protocols/jabber/chat.c:776
-msgid "Select a conference server to query"
-msgstr "Zvolte server konference, kterého se ptát"
+#: ../libpurple/protocols/oscar/oscar.c:4026
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr "Emailová adresa pro %s je %s"
 
-#: ../src/protocols/jabber/chat.c:779
-msgid "Find Rooms"
-msgstr "Hledat místnosti"
+#: ../libpurple/protocols/oscar/oscar.c:4028
+msgid "Account Info"
+msgstr "Informace o účtu"
 
-#: ../src/protocols/jabber/jabber.c:79
-msgid "Error initializing session"
-msgstr "Chyba při inicializaci sezení"
+#: ../libpurple/protocols/oscar/oscar.c:4211
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Váš IM Image nebyl odeslán. Pro odesílání IM Image musíte být připojen přímo."
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
-msgid "Write error"
-msgstr "Chyba zápisu"
+#: ../libpurple/protocols/oscar/oscar.c:4482
+msgid "Unable to set AIM profile."
+msgstr "Nemohu nastavit profil AIM."
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
-msgid "Read Error"
-msgstr "Chyba čtení"
+#: ../libpurple/protocols/oscar/oscar.c:4483
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"Pravděpodobně jste požádali o nastavení svého profilu před dokončením "
+"procedury přihlášení. Váš profil zůstává nenastaven; zkuste jej nastavit "
+"znovu, až budete úplně připojeni."
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
-msgid "Unable to create socket"
-msgstr "Nemohu vytvořit socket"
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "Maximální délka profilu %d bajt byla překročena. Byl pro vás zkrácen."
+msgstr[1] "Maximální délka profilu %d bajty byla překročena. Byl pro vás zkrácen."
+msgstr[2] "Maximální délka profilu %d bajtů byla překročena. Byl pro vás zkrácen."
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
-msgstr "Neplatné ID Jabberu"
+#: ../libpurple/protocols/oscar/oscar.c:4502
+msgid "Profile too long."
+msgstr "Profil příliš dlouhý"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
-msgid "Registration of %s@%s successful"
-msgstr "Registrace %s@%s úspěšná"
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "Maximální délka zprávy o nepřítomnosti %d bajt byla překročena. Byla pro vás zkrácena."
+msgstr[1] "Maximální délka zprávy o nepřítomnosti %d bajty byla překročena. Byla pro vás zkrácena."
+msgstr[2] "Maximální délka zprávy o nepřítomnosti %d bajtů byla překročena. Byla pro vás zkrácena."
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
-msgid "Registration Successful"
-msgstr "Registrace úspěšná"
+#: ../libpurple/protocols/oscar/oscar.c:4552
+msgid "Away message too long."
+msgstr "Zpráva o nepřítomnosti příliš dlouhá."
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
-msgid "Unknown Error"
-msgstr "Neznámá chyba"
+#: ../libpurple/protocols/oscar/oscar.c:4621
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr "Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jméno uživatele musí být platná e-mailová adresa, nebo začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo obsahovat jen číslice."
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
-msgid "Registration Failed"
-msgstr "Registrace selhala"
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
+msgid "Unable To Add"
+msgstr "Nemohu přidat"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
-msgid "Already Registered"
-msgstr "Již zaregistrován"
+#: ../libpurple/protocols/oscar/oscar.c:4732
+msgid "Unable To Retrieve Buddy List"
+msgstr "Nemohu získat seznam kamarádů"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
-msgid "State"
-msgstr "Stát"
+#: ../libpurple/protocols/oscar/oscar.c:4733
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr "Servery AIM dočasně nemohl odeslat váš seznam kamarádů. Váš seznam kamarádů není ztracen a pravděpodobně bude k dispozici za několik hodin."
+
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
+msgid "Orphans"
+msgstr "Sirotci"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
-msgid "Phone"
-msgstr "Telefon"
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"Nemohu přidat kamaráda %s, protože ve svém seznamu máte příliš mnoho "
+"kamarádů. Odstraňte prosím jednoho a zkuste to znovu."
 
-#: ../src/protocols/jabber/jabber.c:810
-msgid "Date"
-msgstr "Datum"
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
+msgid "(no name)"
+msgstr "(žádné jméno)"
 
-#: ../src/protocols/jabber/jabber.c:818
-msgid "Please fill out the information below to register your new account."
-msgstr "Pro zaregistrování vašeho nového účtu prosím vyplňte informace níže."
+#: ../libpurple/protocols/oscar/oscar.c:5068
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Nemohhu přidat kamaráda %s z neznámého důvodu."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "Zaregistrovat nový účet Jabber"
+#: ../libpurple/protocols/oscar/oscar.c:5162
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"Uživatel %s vám povolil přidat jej do vašeho seznamu kamarádů. Chcete jej "
+"přidat?"
 
-#: ../src/protocols/jabber/jabber.c:983
-msgid "Initializing Stream"
-msgstr "Inicializuji proud"
+#: ../libpurple/protocols/oscar/oscar.c:5170
+msgid "Authorization Given"
+msgstr "Autorizace udělena"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
-msgid "Authenticating"
-msgstr "Autentizuji"
+#. Granted
+#: ../libpurple/protocols/oscar/oscar.c:5243
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+"Uživatel %s vyhověl vašemu požadavku přidat jej do vašeho seznamu kamarádů."
 
-#: ../src/protocols/jabber/jabber.c:998
-msgid "Re-initializing Stream"
-msgstr "Reinicializuji proud"
+#: ../libpurple/protocols/oscar/oscar.c:5244
+msgid "Authorization Granted"
+msgstr "Autorizace udělena"
 
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
-msgid "Not Authorized"
-msgstr "Neautorizován"
+#. Denied
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"Uživatel %s zamítl váš požadavek přidat jej do vašeho seznamu kamarádů z "
+"následujícího důvodu:\n"
+"%s"
 
-#: ../src/protocols/jabber/jabber.c:1110
-msgid "Both"
-msgstr "Obojí"
+#: ../libpurple/protocols/oscar/oscar.c:5248
+msgid "Authorization Denied"
+msgstr "Autorizace zamítnuta"
 
-#: ../src/protocols/jabber/jabber.c:1112
-msgid "From (To pending)"
-msgstr "Z (do čeká)"
+#: ../libpurple/protocols/oscar/oscar.c:5284
+#: ../libpurple/protocols/toc/toc.c:1371
+msgid "_Exchange:"
+msgstr "_Výměna:"
 
-#: ../src/protocols/jabber/jabber.c:1117
-msgid "To"
-msgstr "Do"
+#: ../libpurple/protocols/oscar/oscar.c:5324
+msgid "Invalid chat name specified."
+msgstr "Zadán neplatný název chatu."
 
-#: ../src/protocols/jabber/jabber.c:1119
-msgid "None (To pending)"
-msgstr "Žádné (do čeká)"
+#: ../libpurple/protocols/oscar/oscar.c:5393
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "Váš IM Image nebyl odeslán. Nemůžete odesílat IM Image v chatech AIM."
 
-#: ../src/protocols/jabber/jabber.c:1123
-msgid "Subscription"
-msgstr "Přihlášení"
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
+msgid "Away Message"
+msgstr "Zpráva o nepřítomnosti"
 
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
-msgid "Priority"
-msgstr "Priorita"
+#: ../libpurple/protocols/oscar/oscar.c:5558
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(stahuji)</i>"
 
-#: ../src/protocols/jabber/jabber.c:1249
-msgid "Password Changed"
-msgstr "Heslo změněno"
+#: ../libpurple/protocols/oscar/oscar.c:5758
+msgid "iTunes Music Store Link"
+msgstr "Odkaz na iTunes Music Store"
 
-#: ../src/protocols/jabber/jabber.c:1250
-msgid "Your password has been changed."
-msgstr "Vaše heslo bylo změněno."
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "Poznámka o kamarádovi %s"
 
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
-msgid "Error changing password"
-msgstr "Chyba při změně hesla"
+#: ../libpurple/protocols/oscar/oscar.c:5867
+msgid "Buddy Comment:"
+msgstr "Poznámka o kamarádovi:"
 
-#: ../src/protocols/jabber/jabber.c:1311
-msgid "Password (again)"
-msgstr "Heslo (znovu)"
+#: ../libpurple/protocols/oscar/oscar.c:5914
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Rozhodli jste se otevřít Přímé IM spojení s %s."
 
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
-msgid "Change Jabber Password"
-msgstr "Změnit heslo Jabberu"
+#: ../libpurple/protocols/oscar/oscar.c:5918
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr "Protože to odkryje vaši IP adresu, dá se to považovat za riziko pro soukromí. Chcete pokračovat?"
 
-#: ../src/protocols/jabber/jabber.c:1317
-msgid "Please enter your new password"
-msgstr "Zadejte prosím své nové heslo"
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
+msgid "C_onnect"
+msgstr "_Připojit"
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
-#: ../src/protocols/silc/silc.c:1023
-msgid "Set User Info..."
-msgstr "Nastavit informace o uživateli..."
+#: ../libpurple/protocols/oscar/oscar.c:5959
+msgid "Get AIM Info"
+msgstr "Zíslat informace AIM"
 
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
-#: ../src/protocols/silc/silc.c:1019
-msgid "Change Password..."
-msgstr "Změnit heslo..."
+#: ../libpurple/protocols/oscar/oscar.c:5965
+msgid "Edit Buddy Comment"
+msgstr "Upravit poznámku o kamarádovi"
 
-#. }
-#: ../src/protocols/jabber/jabber.c:1337
-msgid "Search for Users..."
-msgstr "Hledat uživatele..."
+#: ../libpurple/protocols/oscar/oscar.c:5973
+msgid "Get Status Msg"
+msgstr "Získat zprávu o stavu"
 
-#: ../src/protocols/jabber/jabber.c:1413
-msgid "Bad Request"
-msgstr "Špatný požadavek"
+#: ../libpurple/protocols/oscar/oscar.c:5986
+msgid "Direct IM"
+msgstr "Přímé IM"
 
-#: ../src/protocols/jabber/jabber.c:1415
-msgid "Conflict"
-msgstr "Konflikt"
+#: ../libpurple/protocols/oscar/oscar.c:6008
+msgid "Re-request Authorization"
+msgstr "Znovu požádat o autorizaci"
 
-#: ../src/protocols/jabber/jabber.c:1417
-msgid "Feature Not Implemented"
-msgstr "Funkce neimplementována"
+#: ../libpurple/protocols/oscar/oscar.c:6067
+msgid "Require authorization"
+msgstr "Požadovat autorizaci"
 
-#: ../src/protocols/jabber/jabber.c:1419
-msgid "Forbidden"
-msgstr "Zakázáno"
+#: ../libpurple/protocols/oscar/oscar.c:6070
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr "Ví o WWW (povolení tohoto způsobí, že budete dostávat SPAM!)"
 
-#: ../src/protocols/jabber/jabber.c:1421
-msgid "Gone"
-msgstr "Pryč"
+#: ../libpurple/protocols/oscar/oscar.c:6075
+msgid "ICQ Privacy Options"
+msgstr "Možnosti soukromí ICQ"
 
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
-msgid "Internal Server Error"
-msgstr "Interní chyba serveru"
+#: ../libpurple/protocols/oscar/oscar.c:6094
+msgid "The new formatting is invalid."
+msgstr "Nové formátování je neplatné."
 
-#: ../src/protocols/jabber/jabber.c:1425
-msgid "Item Not Found"
-msgstr "Položka nenalezena"
+#: ../libpurple/protocols/oscar/oscar.c:6095
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr "Formátování jména uživatele může změnit jen velikost písmen a mezery."
 
-#: ../src/protocols/jabber/jabber.c:1427
-msgid "Malformed Jabber ID"
-msgstr "Neplatné ID Jabberu"
+#: ../libpurple/protocols/oscar/oscar.c:6148
+msgid "Change Address To:"
+msgstr "Změnit adresu na:"
 
-#: ../src/protocols/jabber/jabber.c:1429
-msgid "Not Acceptable"
-msgstr "Nepřijatelné"
+#: ../libpurple/protocols/oscar/oscar.c:6194
+msgid "<i>you are not waiting for authorization</i>"
+msgstr "<i>nečekáte na autorizaci</i>"
 
-#: ../src/protocols/jabber/jabber.c:1431
-msgid "Not Allowed"
-msgstr "Nepovoleno"
+#: ../libpurple/protocols/oscar/oscar.c:6197
+msgid "You are awaiting authorization from the following buddies"
+msgstr "Čekáte na autorizaci od následujících kamarádů:"
 
-#: ../src/protocols/jabber/jabber.c:1435
-msgid "Payment Required"
-msgstr "Je vyžadována platba"
+#: ../libpurple/protocols/oscar/oscar.c:6198
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
+"tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
 
-#: ../src/protocols/jabber/jabber.c:1437
-msgid "Recipient Unavailable"
-msgstr "Příjemce nedostupný"
+#: ../libpurple/protocols/oscar/oscar.c:6215
+msgid "Find Buddy by E-Mail"
+msgstr "Hledat kamaráda podle e-mailu"
 
-#: ../src/protocols/jabber/jabber.c:1441
-msgid "Registration Required"
-msgstr "Je vyžadována registrace"
+#: ../libpurple/protocols/oscar/oscar.c:6216
+msgid "Search for a buddy by e-mail address"
+msgstr "Hledat kamaráda podle e-mailové adresy"
 
-#: ../src/protocols/jabber/jabber.c:1443
-msgid "Remote Server Not Found"
-msgstr "Vzdálený server nenalezen"
+#: ../libpurple/protocols/oscar/oscar.c:6217
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "Zadejte e-mailovou adresu kamaráda, kterého hledáte."
 
-#: ../src/protocols/jabber/jabber.c:1445
-msgid "Remote Server Timeout"
-msgstr "Vzdálenému serveru vypršel čas"
+#: ../libpurple/protocols/oscar/oscar.c:6220
+msgid "_Search"
+msgstr "_Hledat"
 
-#: ../src/protocols/jabber/jabber.c:1447
-msgid "Server Overloaded"
-msgstr "Server přetížen"
+#: ../libpurple/protocols/oscar/oscar.c:6378
+msgid "Set User Info (URL)..."
+msgstr "Nastavit informace o uživateli (URL)..."
 
-#: ../src/protocols/jabber/jabber.c:1449
-msgid "Service Unavailable"
-msgstr "Služba nedostupná"
+#: ../libpurple/protocols/oscar/oscar.c:6389
+msgid "Change Password (URL)"
+msgstr "Změnit heslo (URL)"
 
-#: ../src/protocols/jabber/jabber.c:1451
-msgid "Subscription Required"
-msgstr "Vyžadováno přihlášení"
+#: ../libpurple/protocols/oscar/oscar.c:6393
+msgid "Configure IM Forwarding (URL)"
+msgstr "Nastavit předávání IM (URL)"
 
-#: ../src/protocols/jabber/jabber.c:1453
-msgid "Unexpected Request"
-msgstr "Neočekávaný požadavek"
+#. ICQ actions
+#: ../libpurple/protocols/oscar/oscar.c:6403
+msgid "Set Privacy Options..."
+msgstr "Nastavit možnosti soukromí..."
 
-#: ../src/protocols/jabber/jabber.c:1460
-msgid "Authorization Aborted"
-msgstr "Autorizace přerušena"
+#. AIM actions
+#: ../libpurple/protocols/oscar/oscar.c:6410
+msgid "Confirm Account"
+msgstr "Potvrdit účet"
 
-#: ../src/protocols/jabber/jabber.c:1462
-msgid "Incorrect encoding in authorization"
-msgstr "Neplatné kódování v autorizaci"
+#: ../libpurple/protocols/oscar/oscar.c:6414
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Zobrazit momentálně zaregistrovanou e-mailovou adresu"
+
+#: ../libpurple/protocols/oscar/oscar.c:6418
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Změnit momentálně zaregistrovanou e-mailovou adresu..."
 
-#: ../src/protocols/jabber/jabber.c:1465
-msgid "Invalid authzid"
-msgstr "Neplatné autzid"
+#: ../libpurple/protocols/oscar/oscar.c:6425
+msgid "Show Buddies Awaiting Authorization"
+msgstr "Zobrazit kamarády čekající na autorizaci"
 
-#: ../src/protocols/jabber/jabber.c:1468
-msgid "Invalid Authorization Mechanism"
-msgstr "Neplatný mechanismus autorizace"
+#: ../libpurple/protocols/oscar/oscar.c:6431
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Hledat kamaráda podle e-mailové adresy..."
 
-#: ../src/protocols/jabber/jabber.c:1471
-msgid "Authorization mechanism too weak"
-msgstr "Mechanismus autorizace příliš slabý"
+#: ../libpurple/protocols/oscar/oscar.c:6436
+msgid "Search for Buddy by Information"
+msgstr "Hledat kamaráda podle informací"
 
-#: ../src/protocols/jabber/jabber.c:1476
-msgid "Temporary Authentication Failure"
-msgstr "Dočasné selhání autentizace"
+#: ../libpurple/protocols/oscar/oscar.c:6504
+msgid "Use recent buddies group"
+msgstr "Používat skupinu nedávných kamarádů"
 
-#: ../src/protocols/jabber/jabber.c:1479
-msgid "Authentication Failure"
-msgstr "Selhání autentizace"
+#: ../libpurple/protocols/oscar/oscar.c:6507
+msgid "Show how long you have been idle"
+msgstr "Zobrazovat, jak dlouho jste byli nečinní"
 
-#: ../src/protocols/jabber/jabber.c:1483
-msgid "Bad Format"
-msgstr "Špatný formát"
+#: ../libpurple/protocols/oscar/oscar.c:6662
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Vždy pro přenosy souborů používat proxy server ICQ\n"
+"(pomalejší, ale neodkryje vaši IP adresu)"
 
-#: ../src/protocols/jabber/jabber.c:1485
-msgid "Bad Namespace Prefix"
-msgstr "Špatná předpona prostoru jmen"
+#: ../libpurple/protocols/oscar/peer.c:697
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Žádám %s, aby se k nám připojili na %s:%hu pro přímé IM."
 
-#: ../src/protocols/jabber/jabber.c:1488
-msgid "Resource Conflict"
-msgstr "Konflikt zdrojů"
+#: ../libpurple/protocols/oscar/peer.c:782
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Pokouším se připojit k %s:%hu."
 
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
-msgid "Connection Timeout"
-msgstr "Spojení vypršel čas"
+#: ../libpurple/protocols/oscar/peer.c:856
+msgid "Attempting to connect via proxy server."
+msgstr "Pokouším se připojit přes proxy server."
 
-#: ../src/protocols/jabber/jabber.c:1492
-msgid "Host Gone"
-msgstr "Počítač zmizel"
+#: ../libpurple/protocols/oscar/peer.c:1033
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s právě požádal o přímé spojení s %s"
 
-#: ../src/protocols/jabber/jabber.c:1494
-msgid "Host Unknown"
-msgstr "Neznámý počítač"
+#: ../libpurple/protocols/oscar/peer.c:1037
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"To vyžaduje přímé spojení mezi danými dvěma počítači a je potřeba pro IM "
+"Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
+"pro soukromí."
 
-#: ../src/protocols/jabber/jabber.c:1496
-msgid "Improper Addressing"
-msgstr "Nesprávné adresování"
+#: ../libpurple/protocols/qq/buddy_info.c:39
+msgid "Primary Information"
+msgstr "Primární informace"
+
+#: ../libpurple/protocols/qq/buddy_info.c:41
+msgid "Personal Introduction"
+msgstr "Osobní představení"
+
+#: ../libpurple/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr "Číslo QQ"
+
+#: ../libpurple/protocols/qq/buddy_info.c:47
+msgid "Country/Region"
+msgstr "Země/Region"
+
+#: ../libpurple/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr "Provincie/Stát"
+
+#: ../libpurple/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr "Symbol horoskopu"
+
+#: ../libpurple/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr "Symbol zvěrokruhu"
+
+#: ../libpurple/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr "Krevní skupina"
+
+#: ../libpurple/protocols/qq/buddy_info.c:54
+msgid "College"
+msgstr "Vysoká škola"
 
-#: ../src/protocols/jabber/jabber.c:1500
-msgid "Invalid ID"
-msgstr "Neplatné ID"
+#: ../libpurple/protocols/qq/buddy_info.c:55
+msgid "Email"
+msgstr "E-mail"
 
-#: ../src/protocols/jabber/jabber.c:1502
-msgid "Invalid Namespace"
-msgstr "Neplatný prostor jmen"
+#: ../libpurple/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "PSČ"
 
-#: ../src/protocols/jabber/jabber.c:1504
-msgid "Invalid XML"
-msgstr "Neplatné XML"
+#: ../libpurple/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "Číslo na mobil"
 
-#: ../src/protocols/jabber/jabber.c:1506
-msgid "Non-matching Hosts"
-msgstr "Neodpovídající počítače"
+#: ../libpurple/protocols/qq/buddy_info.c:59
+msgid "Phone Number"
+msgstr "Telefonní číslo"
 
-#: ../src/protocols/jabber/jabber.c:1510
-msgid "Policy Violation"
-msgstr "Porušení pravidel"
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr "Vodnář"
 
-#: ../src/protocols/jabber/jabber.c:1512
-msgid "Remote Connection Failed"
-msgstr "Selhalo vzdálené připojení"
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Pisces"
+msgstr "Ryby"
 
-#: ../src/protocols/jabber/jabber.c:1514
-msgid "Resource Constraint"
-msgstr "Omezení zdrojů"
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Aries"
+msgstr "Beran"
 
-#: ../src/protocols/jabber/jabber.c:1516
-msgid "Restricted XML"
-msgstr "Omezené XML"
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Taurus"
+msgstr "Býk"
 
-#: ../src/protocols/jabber/jabber.c:1518
-msgid "See Other Host"
-msgstr "Zobrazit druhý počítač"
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Gemini"
+msgstr "Blíženci"
 
-#: ../src/protocols/jabber/jabber.c:1520
-msgid "System Shutdown"
-msgstr "Vypnutí systému"
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Cancer"
+msgstr "Rak"
 
-#: ../src/protocols/jabber/jabber.c:1522
-msgid "Undefined Condition"
-msgstr "Nedefinovaná podmínka"
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr "Lev"
 
-#: ../src/protocols/jabber/jabber.c:1524
-msgid "Unsupported Encoding"
-msgstr "Nepodporované kódování"
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr "Panna"
 
-#: ../src/protocols/jabber/jabber.c:1526
-msgid "Unsupported Stanza Type"
-msgstr "Nepodporovaný typ stanza"
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr "Váhy"
 
-#: ../src/protocols/jabber/jabber.c:1528
-msgid "Unsupported Version"
-msgstr "Nepodporovaná verze"
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Scorpio"
+msgstr "Štír"
 
-#: ../src/protocols/jabber/jabber.c:1530
-msgid "XML Not Well Formed"
-msgstr "XML není well-formed"
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr "Střelec"
 
-#: ../src/protocols/jabber/jabber.c:1532
-msgid "Stream Error"
-msgstr "Chyba proudu"
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr "Kozoroh"
 
-#: ../src/protocols/jabber/jabber.c:1599
-#, c-format
-msgid "Unable to ban user %s"
-msgstr "Nemohu zakázat uživatele %s"
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Rat"
+msgstr "Krysa"
 
-#: ../src/protocols/jabber/jabber.c:1619
-#, c-format
-msgid "Unknown affiliation: \"%s\""
-msgstr "Neznámý vztah: \"%s\""
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr "Vůl"
 
-#: ../src/protocols/jabber/jabber.c:1624
-#, c-format
-msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Nemohu nastavit vztah uživatele %s na \"%s\""
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Tiger"
+msgstr "Tygr"
 
-#: ../src/protocols/jabber/jabber.c:1643
-#, c-format
-msgid "Unknown role: \"%s\""
-msgstr "Neznámá role: \"%s\""
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr "Králík"
 
-#: ../src/protocols/jabber/jabber.c:1650
-#, c-format
-msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Nemohu nastavit roli \"%s\" uživateli: %s"
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr "Drak"
 
-#: ../src/protocols/jabber/jabber.c:1703
-#, c-format
-msgid "Unable to kick user %s"
-msgstr "Nemohu vykopnout uživatele %s"
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Snake"
+msgstr "Had"
 
-#: ../src/protocols/jabber/jabber.c:1734
-msgid "config:  Configure a chat room."
-msgstr "config: Nastavit místnost chatu."
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Horse"
+msgstr "Kůň"
 
-#: ../src/protocols/jabber/jabber.c:1738
-msgid "configure:  Configure a chat room."
-msgstr "configure: Nastavit místnost chatu."
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr "Koza"
 
-#: ../src/protocols/jabber/jabber.c:1747
-msgid "part [room]:  Leave the room."
-msgstr "part [místnost]: Opustit místnost."
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Monkey"
+msgstr "Opice"
 
-#: ../src/protocols/jabber/jabber.c:1752
-msgid "register:  Register with a chat room."
-msgstr "register: Zaregistrovat se u místnosti chatu."
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Rooster"
+msgstr "Kohout"
 
-#: ../src/protocols/jabber/jabber.c:1758
-msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [nové téma]: Zobrazit nebo změnit téma."
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr "Pes"
 
-#: ../src/protocols/jabber/jabber.c:1764
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr ""
-"ban &lt;uživatel&gt; [místnost]: Zakázat uživateli přístup do místnosti."
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Pig"
+msgstr "Prase"
 
-#: ../src/protocols/jabber/jabber.c:1770
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr "affiliate &lt;uživatel&gt; &lt;owner|admin|member|outcast|none&gt;: Nastavit uživatelův vztah k místnosti."
+#: ../libpurple/protocols/qq/buddy_info.c:78
+msgid "Other"
+msgstr "Jiné"
+
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
+msgid "Modify my information"
+msgstr "Upravit informace o mě"
+
+#: ../libpurple/protocols/qq/buddy_info.c:483
+msgid "Update my information"
+msgstr "Aktualizovat informace o mě"
+
+#: ../libpurple/protocols/qq/buddy_info.c:507
+msgid "Your information has been updated"
+msgstr "Informace o vás byly aktualizovány"
 
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr "role &lt;uživatel&gt; &lt;moderator|participant|visitor|none&gt;: Nastavit uživatelovu roli v místnosti."
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr "Nastavování vlastních obrázků momentálně není podporováno. Zvolte prosím obrázek z %s."
 
-#: ../src/protocols/jabber/jabber.c:1782
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;uživatel&gt; [zpráva]: Pozvat uživatele do místnosti."
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
+msgid "Invalid QQ Face"
+msgstr "Neplatný obrázek QQ"
 
-#: ../src/protocols/jabber/jabber.c:1788
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;místnost&gt; [server]: Připojit se k diskusi na tomto serveru."
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:136
+#, c-format
+msgid "You rejected %d's request"
+msgstr "Odmítli jste požadavek od %d."
 
-#: ../src/protocols/jabber/jabber.c:1794
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;uživatel&gt; [místnost]: Vykopnout uživatele z místnosti."
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+msgid "Input your reason:"
+msgstr "Zadejte váš důvod:"
 
-#: ../src/protocols/jabber/jabber.c:1799
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;uživatel&gt; &lt;zpráva&gt;: Poslat soukromou zprávu jinému "
-"uživateli."
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+msgid "Reject request"
+msgstr "Odmítnout požadavek"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
-msgid "Jabber Protocol Plugin"
-msgstr "Zásuvný modul protokolu Jabber"
-
-#: ../src/protocols/jabber/jabber.c:1910
-msgid "Use TLS if available"
-msgstr "Používat TLS, pokud je k dispozici"
-
-#: ../src/protocols/jabber/jabber.c:1915
-msgid "Require TLS"
-msgstr "Vyžadovat TLS"
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:141
+msgid "Sorry, you are not my type..."
+msgstr "Lituji, nejste můj typ..."
 
-#: ../src/protocols/jabber/jabber.c:1918
-msgid "Force old (port 5223) SSL"
-msgstr "Vnutit staré SSL (port 5223)"
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Odmítnout"
 
-#: ../src/protocols/jabber/jabber.c:1923
-msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Povolit textovou autentizaci po nešifrovaných proudech"
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+msgid "Add buddy with auth request failed"
+msgstr "Požadavek přidání kamaráda s autentizací zamítnut"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
-msgid "Connect port"
-msgstr "Port spojení"
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
+msgid "You have successfully removed a buddy"
+msgstr "Úspěšně jste odstranili kamaráda"
 
-#. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
-msgid "Connect server"
-msgstr "Server spojení"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Úspěšně jste se odstranili ze seznamu kamarádů svého přítele"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
-msgid "Message from %s"
-msgstr "Zpráva od %s"
+msgid "User %d needs authentication"
+msgstr "Uživatel %d potřebuje autentizaci"
 
-#: ../src/protocols/jabber/message.c:178
-#, c-format
-msgid "%s has set the topic to: %s"
-msgstr "%s změnil téma na: %s"
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+msgid "Input request here"
+msgstr "Sem zadejte požadavek"
 
-#: ../src/protocols/jabber/message.c:180
-#, c-format
-msgid "The topic is: %s"
-msgstr "Téma je: %s"
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
+msgid "Would you be my friend?"
+msgstr "Chcete být můj přítel?"
+
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
+msgid "Send"
+msgstr "Odeslat"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "Message delivery to %s failed: %s"
-msgstr "Doručení zprávy pro %s selhalo: %s"
+msgid "You have added %d to buddy list"
+msgstr "Přidali jste %d do seznamu kamarádů"
 
-#: ../src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Chyba zprávy Jabberu"
+#: ../libpurple/protocols/qq/buddy_opt.c:515
+msgid "QQid Error"
+msgstr "Chyba QQid"
 
-#: ../src/protocols/jabber/message.c:300
-#, c-format
-msgid " (Code %s)"
-msgstr " (Kód %s)"
+#: ../libpurple/protocols/qq/buddy_opt.c:516
+msgid "Invalid QQid"
+msgstr "Neplatné QQid"
 
-#: ../src/protocols/jabber/parser.c:131
-msgid "XML Parse error"
-msgstr "Chyba zpracování XML"
+#: ../libpurple/protocols/qq/group.c:65
+msgid "ID: "
+msgstr "ID: "
 
-#: ../src/protocols/jabber/presence.c:309
-msgid "Unknown Error in presence"
-msgstr "Neznámá chyba v přítomnosti"
+#: ../libpurple/protocols/qq/group.c:98
+msgid "Group ID"
+msgstr "ID Skupiny"
 
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
+#: ../libpurple/protocols/qq/group.c:100
+msgid "Creator"
+msgstr "Tvůrce"
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
-msgid "_Authorize"
-msgstr "_Autorizovat"
-
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
-msgid "_Deny"
-msgstr "_Zamítnout"
+#: ../libpurple/protocols/qq/group.c:103
+msgid "Group Description"
+msgstr "Popis skupiny"
 
-#: ../src/protocols/jabber/presence.c:380
-#: ../src/protocols/jabber/presence.c:381
-msgid "Create New Room"
-msgstr "Vytvořit novou místnost"
+#: ../libpurple/protocols/qq/group.c:109
+msgid "Auth"
+msgstr "Autentizace"
 
-#: ../src/protocols/jabber/presence.c:382
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Vytváříte novou místnost. Chcete ji nastavit nebo použít implicitní "
-"nastavení?"
+#: ../libpurple/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr "QQ Qun"
 
-#: ../src/protocols/jabber/presence.c:384
-msgid "_Configure Room"
-msgstr "_Nastavit místnost"
+#: ../libpurple/protocols/qq/group.c:120
+msgid "Please enter external group ID"
+msgstr "Zadejte externí ID skupiny"
 
-#: ../src/protocols/jabber/presence.c:386
-msgid "_Accept Defaults"
-msgstr "_Přijmout implicitní"
+#: ../libpurple/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr "Můžete hledat jen trvalé skupiny QQ\n"
 
-#: ../src/protocols/jabber/presence.c:423
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chatu %s"
+msgid "User %d requested to join group %d"
+msgstr "Uživatel %d požádal o vstup do skupiny %d"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
-msgid "Error joining chat %s"
-msgstr "Chyba při připojování k chatu %s"
+msgid "Reason: %s"
+msgstr "Důvod: %s"
 
-#: ../src/protocols/jabber/si.c:726
-#, c-format
-msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Nemohu odeslat soubor %s, uživatel nepodporuje přenosy souborů"
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
+msgid "QQ Qun Operation"
+msgstr "Operace QQ Qun"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
-msgid "File Send Failed"
-msgstr "Odeslání souboru selhalo"
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
+msgid "Approve"
+msgstr "Schválit"
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problém se synchronizací seznamu kamarádů v %s (%s)"
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr "Váš požadavek vstoupit do skupiny %d byl zamítnut správcem %d"
 
-#: ../src/protocols/msn/dialog.c:98
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s na místním seznamu je ve skupině \"%s\", ale ne v seznamu na serveru. "
-"Chcete přidat tohoto kamaráda?"
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr "Váš požadavek vstoupit do skupiny %d byl schválen správcem %d"
 
-#: ../src/protocols/msn/dialog.c:106
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s je na místním seznamu, ale ne v seznamu na serveru. Chcete přidat tohoto "
-"kamaráda?"
+msgid "You [%d] have left group \"%d\""
+msgstr "Vy [%d] jste opustili skupinu \"%d\""
 
-#: ../src/protocols/msn/error.c:35
-msgid "Unable to parse message"
-msgstr "Nemohu zpracovat zprávu"
+#: ../libpurple/protocols/qq/group_im.c:291
+#, c-format
+msgid "You [%d] have been added to group \"%d\""
+msgstr "Vy [%d] jste byli přidáno do skupiny \"%d\""
 
-#: ../src/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Syntaktická chyba (pravděpodobně chyba v Gaim)"
+#: ../libpurple/protocols/qq/group_im.c:292
+msgid "This group has been added to your buddy list"
+msgstr "Tato skupina byla přidána do vašeho seznamu kamarádů"
 
-#: ../src/protocols/msn/error.c:42
-msgid "Invalid e-mail address"
-msgstr "Neplatná e-mailová adresa"
+#: ../libpurple/protocols/qq/group_internal.c:41
+msgid "I am not a member"
+msgstr "Nejsem člen"
 
-#: ../src/protocols/msn/error.c:45
-msgid "User does not exist"
-msgstr "Uživatel neexistuje"
+#: ../libpurple/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr "Jsem člen"
 
-#: ../src/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
-msgstr "Chybí plně kvalifikovaný název domény"
+#: ../libpurple/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr "Žádám o přidání"
 
-#: ../src/protocols/msn/error.c:52
-msgid "Already Logged In"
-msgstr "Již přihlášen"
+#: ../libpurple/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr "Jsem správce"
 
-#: ../src/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "Neplatné jméno uživatele"
+#: ../libpurple/protocols/qq/group_internal.c:53
+msgid "Unknown status"
+msgstr "Neznámý stav"
 
-#: ../src/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
-msgstr "Neplatné přátelské jméno"
+#: ../libpurple/protocols/qq/group_join.c:82
+msgid "This group does not allow others to join"
+msgstr "Tato skupina nedovoluje ostatním připojit se"
 
-#: ../src/protocols/msn/error.c:61
-msgid "List Full"
-msgstr "Seznam plný"
-
-#: ../src/protocols/msn/error.c:64
-msgid "Already there"
-msgstr "Již tam"
-
-#: ../src/protocols/msn/error.c:67
-msgid "Not on list"
-msgstr "Ne na seznamu"
-
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
-msgid "User is offline"
-msgstr "Uživatel je odpojen"
-
-#: ../src/protocols/msn/error.c:73
-msgid "Already in the mode"
-msgstr "Již v daném režimu"
-
-#: ../src/protocols/msn/error.c:76
-msgid "Already in opposite list"
-msgstr "Již v opačném seznamu"
+#: ../libpurple/protocols/qq/group_join.c:233
+msgid "You have successfully left the group"
+msgstr "Úspěšně jste opustili skupinu"
 
-#: ../src/protocols/msn/error.c:79
-msgid "Too many groups"
-msgstr "Příliš mnoho skupin"
+#: ../libpurple/protocols/qq/group_join.c:257
+msgid "QQ Group Auth"
+msgstr "Autentizace skupiny QQ"
 
-#: ../src/protocols/msn/error.c:82
-msgid "Invalid group"
-msgstr "Neplatná skupina"
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "Váš požadavek na autorizaci byl serverem QQ přijat"
 
-#: ../src/protocols/msn/error.c:85
-msgid "User not in group"
-msgstr "Uživatel není ve skupině"
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered a group ID outside the acceptable range"
+msgstr "Zadali jste ID skupiny mimo přijatelný rozsah"
 
-#: ../src/protocols/msn/error.c:88
-msgid "Group name too long"
-msgstr "Název skupiny příliš dlouhý"
+#: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Opravdu chcete opustit tento Qun?"
 
-#: ../src/protocols/msn/error.c:91
-msgid "Cannot remove group zero"
-msgstr "Nemohu odstranit skupinu nula"
+#: ../libpurple/protocols/qq/group_join.c:362
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+"Poznámka, jste-li tvůrce, \n"
+"tato operace časem tento Qun odstraní."
 
-#: ../src/protocols/msn/error.c:95
-msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Pokus přidat uživatele do skupiny, která neexistuje"
+#: ../libpurple/protocols/qq/group_network.c:92
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Kód [0x%02X]: %s"
 
-#: ../src/protocols/msn/error.c:99
-msgid "Switchboard failed"
-msgstr "Ústředna selhala"
+#: ../libpurple/protocols/qq/group_network.c:93
+msgid "Group Operation Error"
+msgstr "Chyba operace se skupinou"
 
-#: ../src/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
-msgstr "Přenos upozornění selhal"
+#. we want to see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
+msgstr "Chcete tento požadavek schválit?"
 
-#: ../src/protocols/msn/error.c:106
-msgid "Required fields missing"
-msgstr "Vyžadovaná pole chybí"
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Zadejte svůj důvod:"
 
-#: ../src/protocols/msn/error.c:109
-msgid "Too many hits to a FND"
-msgstr "Příliš mnoho výsledků FND"
+#: ../libpurple/protocols/qq/group_opt.c:235
+msgid "You have successfully modified Qun member"
+msgstr "Úspěšně jste upravili člena Qun"
 
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
-msgid "Not logged in"
-msgstr "Nepřihlášen."
+#: ../libpurple/protocols/qq/group_opt.c:305
+msgid "You have successfully modified Qun information"
+msgstr "Úspěšně jste upravili informace o Qun"
 
-#: ../src/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
-msgstr "Služba momentálně není k dispozici"
+#: ../libpurple/protocols/qq/group_opt.c:392
+msgid "You have successfully created a Qun"
+msgstr "Úspěšně jste vytvořili Qun"
 
-#: ../src/protocols/msn/error.c:119
-msgid "Database server error"
-msgstr "Chyba databázového serveru"
+#: ../libpurple/protocols/qq/group_opt.c:394
+msgid "Would you like to set up the Qun details now?"
+msgstr "Chcete nyní nastavit podrobnosti o Qun?"
 
-#: ../src/protocols/msn/error.c:122
-msgid "Command disabled"
-msgstr "Příkaz zakázán"
+#: ../libpurple/protocols/qq/group_opt.c:398
+msgid "Setup"
+msgstr "Nastavit"
 
-#: ../src/protocols/msn/error.c:125
-msgid "File operation error"
-msgstr "Chyba práce se soubory"
+#: ../libpurple/protocols/qq/im.c:432
+msgid "System Message"
+msgstr "Zpráva systému"
 
-#: ../src/protocols/msn/error.c:128
-msgid "Memory allocation error"
-msgstr "Chyba alokace paměti"
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Nemohu odeslat IM."
 
-#: ../src/protocols/msn/error.c:131
-msgid "Wrong CHL value sent to server"
-msgstr "Serveru odeslána špatná hodnota CHL"
+#: ../libpurple/protocols/qq/keep_alive.c:87
+msgid "Keep alive error"
+msgstr "Chyba při udržování naživu"
 
-#: ../src/protocols/msn/error.c:135
-msgid "Server busy"
-msgstr "Server zaneprázdněn"
+#: ../libpurple/protocols/qq/login_logout.c:408
+msgid "Error requesting login token"
+msgstr "Chyba při žádání o přihlašovací token"
 
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
-msgid "Server unavailable"
-msgstr "Server nedostupný"
+#: ../libpurple/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr "Nemohu se přihlásit, zkontrolujte ladicí výpis"
 
-#: ../src/protocols/msn/error.c:141
-msgid "Peer Notification server down"
-msgstr "Server upozornění na partnera nedostupný"
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/ycht.c:549
+msgid "Unable to connect."
+msgstr "Nemohu se připojit."
 
-#: ../src/protocols/msn/error.c:144
-msgid "Database connect error"
-msgstr "Chyba připojení k databázi"
+#: ../libpurple/protocols/qq/qq.c:186
+#, c-format
+msgid "Unknown-%d"
+msgstr "Neznámé-%d"
 
-#: ../src/protocols/msn/error.c:148
-msgid "Server is going down (abandon ship)"
-msgstr "Server se vypíná (opusťte loď)"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP adresa"
 
-#: ../src/protocols/msn/error.c:155
-msgid "Error creating connection"
-msgstr "Chyba vytváření spojení"
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP adresa"
 
-#: ../src/protocols/msn/error.c:159
-msgid "CVR parameters are either unknown or not allowed"
-msgstr "Parametry CVR nejsou známy nebo nejsou povoleny"
+#: ../libpurple/protocols/qq/qq.c:242
+msgid "Level"
+msgstr "Úroveň"
 
-#: ../src/protocols/msn/error.c:162
-msgid "Unable to write"
-msgstr "Nemohu zapisovat"
+#: ../libpurple/protocols/qq/qq.c:373
+msgid "Invalid name"
+msgstr "Neplatné jméno"
 
-#: ../src/protocols/msn/error.c:165
-msgid "Session overload"
-msgstr "Sezení přetíženo"
+#: ../libpurple/protocols/qq/qq.c:439
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Momentálně online</b>: %d<br>\n"
 
-#: ../src/protocols/msn/error.c:168
-msgid "User is too active"
-msgstr "Uživatel je příliš aktivní"
+#: ../libpurple/protocols/qq/qq.c:440
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Poslední obnovení</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:171
-msgid "Too many sessions"
-msgstr "Příliš mnoho sezení"
+#: ../libpurple/protocols/qq/qq.c:444
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Režim připojení</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:174
-msgid "Passport not verified"
-msgstr "Passport nebyl ověřen"
+#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>IP serveru</b>: %s: %d<br>\n"
 
-#: ../src/protocols/msn/error.c:177
-msgid "Bad friend file"
-msgstr "Špatný soubor přátel"
+#: ../libpurple/protocols/qq/qq.c:446
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Má veřejná IP</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:180
-msgid "Not expected"
-msgstr "Neočekáváno"
+#: ../libpurple/protocols/qq/qq.c:451
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Čas přihlášení</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:185
-msgid "Friendly name changes too rapidly"
-msgstr "Přátelské jméno se mění příliš rychle"
+#: ../libpurple/protocols/qq/qq.c:452
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>IP posledního přihlášení</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:194
-msgid "Server too busy"
-msgstr "Server je příliš zaneprázdněn"
+#: ../libpurple/protocols/qq/qq.c:453
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Čas posledního přihlášení</b>: %s<br>\n"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
-msgid "Authentication failed"
-msgstr "Autentizace selhala"
+#: ../libpurple/protocols/qq/qq.c:457
+msgid "Login Information"
+msgstr "Informace o přihlášení"
 
-#: ../src/protocols/msn/error.c:201
-msgid "Not allowed when offline"
-msgstr "Nedovoleno při odpojení"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Nastavit informace o mě"
 
-#: ../src/protocols/msn/error.c:209
-msgid "Not accepting new users"
-msgstr "Nepřijímám nové uživatele"
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+msgid "Change Password"
+msgstr "Změnit heslo"
 
-#: ../src/protocols/msn/error.c:213
-msgid "Kids Passport without parental consent"
-msgstr "Passport dítěte bez souhlasu rodiče"
+#: ../libpurple/protocols/qq/qq.c:539
+msgid "Show Login Information"
+msgstr "Zobrazit informace o přihlášení"
+
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Opustit tento QQ Qun"
+
+#: ../libpurple/protocols/qq/qq.c:584
+msgid "Block this buddy"
+msgstr "Zablokovat tohoto kamaráda"
 
-#: ../src/protocols/msn/error.c:217
-msgid "Passport account not yet verified"
-msgstr "Účet passport ještě nebyl ověřen"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+msgid "QQ Protocol\tPlugin"
+msgstr "Zásuvný modul\tprotokolu QQ"
+
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Připojit se pomocí TCP"
+
+#: ../libpurple/protocols/qq/recv_core.c:309
+msgid "Socket error"
+msgstr "Chyba socketu"
 
-#: ../src/protocols/msn/error.c:220
-msgid "Bad ticket"
-msgstr "Špatný lístek"
+#: ../libpurple/protocols/qq/recv_core.c:319
+msgid "Unable to read from socket"
+msgstr "Nemohu číst ze socketu"
 
-#: ../src/protocols/msn/error.c:224
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
-msgid "Unknown Error Code %d"
-msgstr "Neznámý kód chyby %d"
+msgid "%d has declined the file %s"
+msgstr "%d odmítl soubor %s"
+
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
+msgid "File Send"
+msgstr "Odeslání souboru"
 
-#: ../src/protocols/msn/error.c:236
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
-msgid "MSN Error: %s\n"
-msgstr "Chyba MSN: %s\n"
+msgid "%d canceled the transfer of %s"
+msgstr "%d zrušil přenos %s"
 
-#: ../src/protocols/msn/msn.c:113
-msgid "You have just sent a Nudge!"
-msgstr "Právě jste odeslali šťouchnutí!"
+#: ../libpurple/protocols/qq/sendqueue.c:123
+msgid "Connection lost"
+msgstr "Spojení ztraceno"
 
-#: ../src/protocols/msn/msn.c:138
-msgid "Your new MSN friendly name is too long."
-msgstr "Vaše nové přátelské jméno MSN je příliš dlouhé."
+#. cancel login progress
+#: ../libpurple/protocols/qq/sendqueue.c:131
+msgid "Login failed, no reply"
+msgstr "Přihlášení selhalo, žádná odpověď"
 
-#: ../src/protocols/msn/msn.c:246
-msgid "Set your friendly name."
-msgstr "Nastavit vaše přátelské jméno"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "Chcete přidat tohoto kamaráda?"
 
-#: ../src/protocols/msn/msn.c:247
-msgid "This is the name that other MSN buddies will see you as."
-msgstr "Toto je jméno, pod kterým vás budou vidět ostatní kamarádi MSN."
+#. only need to get value
+#: ../libpurple/protocols/qq/sys_msg.c:166
+#, c-format
+msgid "You have been added by %s"
+msgstr "Byli jste přidáni uživatelem %s"
 
-#: ../src/protocols/msn/msn.c:263
-msgid "Set your home phone number."
-msgstr "Nastavte své domácí telefonní číslo."
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
+msgstr "Chcete jej přidat?"
 
-#: ../src/protocols/msn/msn.c:278
-msgid "Set your work phone number."
-msgstr "Nastavte své pracovní telefonní číslo."
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s přidal vás [%s] do svého seznamu kamarádů"
 
-#: ../src/protocols/msn/msn.c:293
-msgid "Set your mobile phone number."
-msgstr "Nastavte své mobilní telefonní číslo."
+#: ../libpurple/protocols/qq/sys_msg.c:192
+#, c-format
+msgid "User %s rejected your request"
+msgstr "Uživatel %s odmítl váš požadavek"
 
-#: ../src/protocols/msn/msn.c:306
-msgid "Allow MSN Mobile pages?"
-msgstr "Povolit stránky MSN Mobile?"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
+msgstr "Uživatel %s schválil váš požadavek"
 
-#: ../src/protocols/msn/msn.c:307
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Chcete povolit nebo zakázat lidem na svém seznamu kamarádů posílat vám "
-"stránky MSN Mobile na váš mobilní telefon nebo jiné mobilní zařízení?"
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s chce přidat vás [%s] jako přítele"
 
-#: ../src/protocols/msn/msn.c:311
-msgid "Allow"
-msgstr "Povolit"
+#: ../libpurple/protocols/qq/sys_msg.c:239
+#, c-format
+msgid "Message: %s"
+msgstr "Zpráva: %s"
 
-#: ../src/protocols/msn/msn.c:312
-msgid "Disallow"
-msgstr "Zakázat"
+#: ../libpurple/protocols/qq/sys_msg.c:261
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s není ve vašem seznamu kamarádů"
 
-#: ../src/protocols/msn/msn.c:328
-msgid "This Hotmail account may not be active."
-msgstr "Tento účet Hotmail možná není aktivní."
+#: ../libpurple/protocols/sametime/sametime.c:417
+msgid "Connection closed (writing)"
+msgstr "Spojení uzavřeno (zápis)"
 
-#: ../src/protocols/msn/msn.c:354
-msgid "Send a mobile message."
-msgstr "Odeslat mobilní zprávu."
+#: ../libpurple/protocols/sametime/sametime.c:1290
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Název skupiny:</b> %s<br>"
 
-#: ../src/protocols/msn/msn.c:356
-msgid "Page"
-msgstr "Stránka"
+#: ../libpurple/protocols/sametime/sametime.c:1291
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>ID skupiny v Notes:</b> %s<br>"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
+msgid "Info for Group %s"
+msgstr "Informace o skupině %s"
 
-#: ../src/protocols/msn/msn.c:557
-msgid "Has you"
-msgstr "Má vás"
+#: ../libpurple/protocols/sametime/sametime.c:1295
+msgid "Notes Address Book Information"
+msgstr "Informace adresáře Notes"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
-msgid "Be Right Back"
-msgstr "Hned budu zpátky"
+#: ../libpurple/protocols/sametime/sametime.c:1327
+msgid "Invite Group to Conference..."
+msgstr "Pozvat skupinu ke konferenci..."
 
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
-msgid "Busy"
-msgstr "Zaneprázdněn"
+#: ../libpurple/protocols/sametime/sametime.c:1337
+msgid "Get Notes Address Book Info"
+msgstr "Získat informace adresáře Notes"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
-msgid "On the Phone"
-msgstr "Telefonuji"
+#: ../libpurple/protocols/sametime/sametime.c:1504
+msgid "Sending Handshake"
+msgstr "Odesílám pozdrav"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
-msgid "Out to Lunch"
-msgstr "Na obědě"
+#: ../libpurple/protocols/sametime/sametime.c:1509
+msgid "Waiting for Handshake Acknowledgement"
+msgstr "Čekám na potvrzení pozdravu"
 
-#: ../src/protocols/msn/msn.c:623
-msgid "Set Friendly Name..."
-msgstr "Nastavit přátelské jméno..."
+#: ../libpurple/protocols/sametime/sametime.c:1514
+msgid "Handshake Acknowledged, Sending Login"
+msgstr "Pozdrav potvrzen, odesílám přihlášení"
 
-#: ../src/protocols/msn/msn.c:628
-msgid "Set Home Phone Number..."
-msgstr "Nastavit domácí telefonní číslo..."
+#: ../libpurple/protocols/sametime/sametime.c:1519
+msgid "Waiting for Login Acknowledgement"
+msgstr "Čekám na potvrzení přihlášení"
 
-#: ../src/protocols/msn/msn.c:632
-msgid "Set Work Phone Number..."
-msgstr "Nastavit pracovní telefonní číslo..."
+#: ../libpurple/protocols/sametime/sametime.c:1524
+msgid "Login Redirected"
+msgstr "Přihlášení přesměrováno"
 
-#: ../src/protocols/msn/msn.c:636
-msgid "Set Mobile Phone Number..."
-msgstr "Nastavit mobilní telefonní číslo..."
+#: ../libpurple/protocols/sametime/sametime.c:1530
+msgid "Forcing Login"
+msgstr "Vynucuji přihlášení"
 
-#: ../src/protocols/msn/msn.c:642
-msgid "Enable/Disable Mobile Devices..."
-msgstr "Povolit/zakázat mobilní zařízení..."
+#: ../libpurple/protocols/sametime/sametime.c:1534
+msgid "Login Acknowledged"
+msgstr "Přihlášení potvrzeno"
 
-#: ../src/protocols/msn/msn.c:647
-msgid "Allow/Disallow Mobile Pages..."
-msgstr "Povolit/zakázat mobilní stránky..."
+#: ../libpurple/protocols/sametime/sametime.c:1539
+msgid "Starting Services"
+msgstr "Spouštím služby"
 
-#: ../src/protocols/msn/msn.c:657
-msgid "Open Hotmail Inbox"
-msgstr "Otevřít Příchozí poštu Hotmailu"
+#: ../libpurple/protocols/sametime/sametime.c:1645
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr "Správce Sametime vydal na serveru %s následující oznámení"
 
-#: ../src/protocols/msn/msn.c:681
-msgid "Send to Mobile"
-msgstr "Odeslat na mobil"
+#: ../libpurple/protocols/sametime/sametime.c:1650
+msgid "Sametime Administrator Announcement"
+msgstr "Oznámení správce Sametime"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
-msgid "Initiate _Chat"
-msgstr "Začít _chat"
+#: ../libpurple/protocols/sametime/sametime.c:1702
+msgid "Connection reset"
+msgstr "Spojení přerušeno"
 
-#: ../src/protocols/msn/msn.c:729
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu "
-"SSL. Pro více informací viz http://gaim.sf.net/faq-ssl.php ."
+#: ../libpurple/protocols/sametime/sametime.c:1709
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Chyba při čtení ze socketu: %s"
 
-#: ../src/protocols/msn/msn.c:757
-msgid "Failed to connect to server."
-msgstr "Nemohu se připojit k serveru."
+#. this is a regular connect, error out
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
+msgid "Unable to connect to host"
+msgstr "Nemohu se připojit k počítači"
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>Alias:</b> %s<br>"
+msgid "Announcement from %s"
+msgstr "Oznámení od %s"
 
-#. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
+#: ../libpurple/protocols/sametime/sametime.c:1944
+msgid "Conference Closed"
+msgstr "Konference uzavřena"
 
-#: ../src/protocols/msn/msn.c:1456
-msgid "MSN Profile"
-msgstr "Profil MSN"
+#: ../libpurple/protocols/sametime/sametime.c:2403
+msgid "Unable to send message: "
+msgstr "Nemohu odeslat zprávu: "
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
-#: ../src/protocols/yahoo/yahoo_profile.c:795
-msgid "Error retrieving profile"
-msgstr "Chyba při získávání profilu"
+#: ../libpurple/protocols/sametime/sametime.c:2959
+msgid "Place Closed"
+msgstr "Místo uzavřeno"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
-msgid "Age"
-msgstr "Věk"
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr "Mikrofon"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
-msgid "Occupation"
-msgstr "Zaměstnání"
+#: ../libpurple/protocols/sametime/sametime.c:3230
+msgid "Speakers"
+msgstr "Reproduktory"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
-msgid "Location"
-msgstr "Umístění"
+#: ../libpurple/protocols/sametime/sametime.c:3231
+msgid "Video Camera"
+msgstr "Videokamera"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
-msgid "Hobbies and Interests"
-msgstr "Koníčky a zájmy"
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Přenos souborů"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
-msgid "A Little About Me"
-msgstr "Něco o mě"
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
+msgid "Supports"
+msgstr "Podporuje"
+
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
+msgid "External User"
+msgstr "Externí uživatel"
 
-#. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
-msgid "Marital Status"
-msgstr "Stav"
+#: ../libpurple/protocols/sametime/sametime.c:3380
+msgid "Create conference with user"
+msgstr "Vytvořit konferenci s uživatelem"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
-msgid "Favorite Quote"
-msgstr "Oblíbený citát"
+#: ../libpurple/protocols/sametime/sametime.c:3381
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr "Zadejte prosím téma nové konference a zvací zprávu, kterou poslat %s"
 
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
-msgid "Favorite Things"
-msgstr "Oblíbené věci"
+#: ../libpurple/protocols/sametime/sametime.c:3385
+msgid "New Conference"
+msgstr "Nová konference"
 
-#: ../src/protocols/msn/msn.c:1765
-msgid "Last Updated"
-msgstr "Naposledy aktualizováno"
+#: ../libpurple/protocols/sametime/sametime.c:3387
+msgid "Create"
+msgstr "Vytvořit"
 
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
-msgid "Homepage"
-msgstr "Domovská stránka"
+#: ../libpurple/protocols/sametime/sametime.c:3452
+msgid "Available Conferences"
+msgstr "Dostupné konference"
 
-#: ../src/protocols/msn/msn.c:1802
-msgid "The user has not created a public profile."
-msgstr "Uživatel nevytvořit veřejný profil."
+#: ../libpurple/protocols/sametime/sametime.c:3458
+msgid "Create New Conference..."
+msgstr "Vytvořit novou konferenci..."
 
-#: ../src/protocols/msn/msn.c:1803
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN oznámila, že nemůže najít profil uživatele. To znamená, že buď uživatel "
-"neexistuje, nebo že uživatel existuje, ale nevytvořil veřejný profil."
+#: ../libpurple/protocols/sametime/sametime.c:3465
+msgid "Invite user to a conference"
+msgstr "Pozvat uživatele ke konferenci"
 
-#: ../src/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/sametime/sametime.c:3466
+#, c-format
 msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
 msgstr ""
-"Gaim nemohl najít v profilu uživatele žádné informace. Uživatel "
-"pravděpodobně neexistuje."
+"Odešlete pozvánku uživateli %s zvolením konference ze seznamu níže. Zvolte "
+"\"Vytvořit novou konferenci\", pokud chcete vytvořit novou konferenci, do "
+"které pozvat tohoto uživatele."
 
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
-msgid "Profile URL"
-msgstr "URL profilu"
+#: ../libpurple/protocols/sametime/sametime.c:3471
+msgid "Invite to Conference"
+msgstr "Pozvat ke konferenci"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
-msgid "MSN Protocol Plugin"
-msgstr "Zásuvný modul protokolu MSN"
+#: ../libpurple/protocols/sametime/sametime.c:3562
+msgid "Invite to Conference..."
+msgstr "Pozvat ke konferenci..."
 
-#: ../src/protocols/msn/msn.c:2043
-msgid "Login server"
-msgstr "Přihlašovací server"
+#: ../libpurple/protocols/sametime/sametime.c:3567
+msgid "Send TEST Announcement"
+msgstr "Odeslat testovací oznámení"
 
-#: ../src/protocols/msn/msn.c:2052
-msgid "Use HTTP Method"
-msgstr "Používat metodu HTTP"
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
+msgid "Topic:"
+msgstr "Téma:"
 
-#: ../src/protocols/msn/msn.c:2057
-msgid "Show custom smileys"
-msgstr "Zobrazovat systémové smajlíky"
+#: ../libpurple/protocols/sametime/sametime.c:3614
+msgid "No Sametime Community Server specified"
+msgstr "Nezadán server komunity Sametime"
 
-#: ../src/protocols/msn/msn.c:2065
-msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: získat pozornost uživatele šťouchnutím"
+#: ../libpurple/protocols/sametime/sametime.c:3636
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Pro účet Meanwhile %s nebyl nastaven počítač ani IP adresa. Pro pokračování "
+"v přihlašování jej prosím zadejte níže."
 
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Unable to connect"
-msgstr "Nemohu se připojit"
+#: ../libpurple/protocols/sametime/sametime.c:3641
+msgid "Meanwhile Connection Setup"
+msgstr "Nastavení spojení Meanwhile"
 
-#: ../src/protocols/msn/notification.c:178
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s není platná skupina."
+#: ../libpurple/protocols/sametime/sametime.c:3642
+msgid "No Sametime Community Server Specified"
+msgstr "Nezadán server komunity Sametime"
 
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
-msgid "Unknown error."
-msgstr "Neznámá chyba."
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
+msgid "Connect"
+msgstr "Připojit"
 
-#: ../src/protocols/msn/notification.c:187
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
+msgid "Unknown (0x%04x)<br>"
+msgstr "Neznámé (0x%04x)<br>"
 
-#: ../src/protocols/msn/notification.c:498
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nemohu přidat uživatele do %s (%s)"
+#: ../libpurple/protocols/sametime/sametime.c:4137
+msgid "Last Known Client"
+msgstr "Poslední známý klient"
 
-#: ../src/protocols/msn/notification.c:502
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nemohu zablokovat uživatele na %s (%s)"
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
+msgid "User Name"
+msgstr "Jméno uživatele"
 
-#: ../src/protocols/msn/notification.c:506
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nemohu povolit uživatele na %s (%s)"
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
+msgid "Sametime ID"
+msgstr "ID Sametime"
 
-#: ../src/protocols/msn/notification.c:514
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nelze přidat, protože váš seznam kamarádů je plný."
+#: ../libpurple/protocols/sametime/sametime.c:4328
+msgid "An ambiguous user ID was entered"
+msgstr "Bylo zadáno nejednoznačné ID uživatele"
 
-#: ../src/protocols/msn/notification.c:523
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s není platný účet passport."
-
-#: ../src/protocols/msn/notification.c:528
-msgid "Service Temporarily Unavailable."
-msgstr "Služba dočasně není k dispozici."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Identifikátor '%s' se může odkazovat na libovolného z následujících "
+"uživatelů. Uživatele prosím přidejte do vašeho seznamu kamarádů zvolením "
+"správného uživatele ze seznamu níže."
 
-#: ../src/protocols/msn/notification.c:821
-msgid "Unable to rename group"
-msgstr "Nemohu přejmenovat skupinu"
+#: ../libpurple/protocols/sametime/sametime.c:4334
+msgid "Select User"
+msgstr "Vyberte uživatele"
 
-#: ../src/protocols/msn/notification.c:876
-msgid "Unable to delete group"
-msgstr "Nemohu odstranit skupinu"
+#: ../libpurple/protocols/sametime/sametime.c:4418
+msgid "Unable to add user: user not found"
+msgstr "Nemohu přidat uživatele: uživatel nenalezen"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgstr[0] ""
-"Server MSN bude za %d minutu vypnut kvůli údržbě. Tehdy budete automaticky "
-"odhlášen. Dokončete prosím probíhající konverzace.\n"
-"\n"
-"Až bude údržba dokončena, budete se moci přihlásit."
-msgstr[1] ""
-"Server MSN bude za %d minuty vypnut kvůli údržbě. Tehdy budete automaticky "
-"odhlášen. Dokončete prosím probíhající konverzace.\n"
-"\n"
-"Až bude údržba dokončena, budete se moci přihlásit."
-msgstr[2] ""
-"Server MSN bude za %d minut vypnut kvůli údržbě. Tehdy budete automaticky "
-"odhlášen. Dokončete prosím probíhající konverzace.\n"
-"\n"
-"Až bude údržba dokončena, budete se moci přihlásit."
-
-#: ../src/protocols/msn/servconn.c:135
-msgid "Writing error"
-msgstr "Chyba zápisu"
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime. "
+"Tato položka byla odstraněna z vašeho seznamu kamarádů."
 
-#: ../src/protocols/msn/servconn.c:137
-msgid "Reading error"
-msgstr "Chyba čtení"
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Nemohu přidat uživatele"
 
-#: ../src/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
-"Connection error from %s server:\n"
-"%s"
+"Error reading file %s: \n"
+"%s\n"
 msgstr ""
-"Chyba spojení od serveru %s:\n"
-"%s"
+"Chyba při čtení souboru %s: \n"
+"%s\n"
 
-#: ../src/protocols/msn/session.c:304
-msgid "Our protocol is not supported by the server."
-msgstr "Server nepodporuje náš protokol."
+#: ../libpurple/protocols/sametime/sametime.c:5146
+msgid "Remotely Stored Buddy List"
+msgstr "Vzdáleně uložený seznam kamarádů"
 
-#: ../src/protocols/msn/session.c:308
-msgid "Error parsing HTTP."
-msgstr "Chyba při zpracovávání HTTP."
+#: ../libpurple/protocols/sametime/sametime.c:5151
+msgid "Buddy List Storage Mode"
+msgstr "Režim ukládání seznamu kamarádů"
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
-msgid "You have signed on from another location."
-msgstr "Přihlásili jste se z jiného umístění."
+#: ../libpurple/protocols/sametime/sametime.c:5154
+msgid "Local Buddy List Only"
+msgstr "Jen místní seznam kamarádů"
 
-#: ../src/protocols/msn/session.c:315
-msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"Servery MSN dočasně nejsou dostupné. Počkejte prosím a zkuste to znovu."
+#: ../libpurple/protocols/sametime/sametime.c:5156
+msgid "Merge List from Server"
+msgstr "Sloučit seznam kamarádů ze serveru"
 
-#: ../src/protocols/msn/session.c:320
-msgid "The MSN servers are going down temporarily."
-msgstr "Servery MSN se dočasně vypínají."
+#: ../libpurple/protocols/sametime/sametime.c:5158
+msgid "Merge and Save List to Server"
+msgstr "Sloučit a uložit seznam na server"
 
-#: ../src/protocols/msn/session.c:324
+#: ../libpurple/protocols/sametime/sametime.c:5160
+msgid "Synchronize List with Server"
+msgstr "Synchronizovat seznam se serverem"
+
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
-msgid "Unable to authenticate: %s"
-msgstr "Nemohu se autentizovat: %s"
+msgid "Import Sametime List for Account %s"
+msgstr "Importovat seznam Sametime pro účet %s"
 
-#: ../src/protocols/msn/session.c:329
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Váš seznam kamarádů MSN dočasně není k dispozici. Počkejte prosím a zkuste "
-"to znovu."
+#: ../libpurple/protocols/sametime/sametime.c:5255
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr "Exportovat seznam Sametime pro účet %s"
 
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
-msgid "Handshaking"
-msgstr "Vyjednávám"
+#: ../libpurple/protocols/sametime/sametime.c:5309
+msgid "Unable to add group: group exists"
+msgstr "Nemohu přidat skupinu: skupina existuje"
 
-#: ../src/protocols/msn/session.c:351
-msgid "Transferring"
-msgstr "Přenáším"
+#: ../libpurple/protocols/sametime/sametime.c:5310
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr "Skupina nazvaná '%s' již ve vašem seznamu kamarádů existuje."
 
-#: ../src/protocols/msn/session.c:353
-msgid "Starting authentication"
-msgstr "Spouštím autentizaci"
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
+msgid "Unable to add group"
+msgstr "Nemohu přidat skupinu"
 
-#: ../src/protocols/msn/session.c:354
-msgid "Getting cookie"
-msgstr "Získávám cookie"
+#: ../libpurple/protocols/sametime/sametime.c:5372
+msgid "Possible Matches"
+msgstr "Možné výskyty"
 
-#: ../src/protocols/msn/session.c:356
-msgid "Sending cookie"
-msgstr "Odesílám cookie"
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr "Výsledky skupiny v adresáři Notes"
 
-#: ../src/protocols/msn/session.c:357
-msgid "Retrieving buddy list"
-msgstr "Získávám seznam kamarádů"
+#: ../libpurple/protocols/sametime/sametime.c:5389
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"Identifikátor '%s' se může odkazovat na libovolnou z následujících skupin "
+"adresáře Notes. Skupinu prosím přidejte do vašeho seznamu kamarádů správné "
+"skupiny ze seznamu níže."
 
-#: ../src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Pryč od počítače"
-
-#: ../src/protocols/msn/state.c:35
-msgid "On The Phone"
-msgstr "Telefonuji"
-
-#: ../src/protocols/msn/state.c:36
-msgid "Out To Lunch"
-msgstr "Na obědě"
-
-#: ../src/protocols/msn/switchboard.c:408
-msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Zpráva možná nebyla odeslána, protože vypršel čas:"
-
-#: ../src/protocols/msn/switchboard.c:416
-msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Zprávu nelze odeslat, není to povoleno, když jste neviditelní:"
+#: ../libpurple/protocols/sametime/sametime.c:5394
+msgid "Select Notes Address Book"
+msgstr "Zvolte adresář Notes"
 
-#: ../src/protocols/msn/switchboard.c:420
-msgid "Message could not be sent because the user is offline:"
-msgstr "Zprávu nelze odeslat, protože uživatel je odpojen:"
+#: ../libpurple/protocols/sametime/sametime.c:5437
+msgid "Unable to add group: group not found"
+msgstr "Nemohu přidat skupinu: skupina nenalezena"
 
-#: ../src/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "Zprávu nelze odeslat, protože došlo k chybě spojení:"
+#: ../libpurple/protocols/sametime/sametime.c:5439
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"Identifikátor '%s' neodpovídá žádné skupině adresáře Notes ve vaší komunitě "
+"Sametime."
 
-#: ../src/protocols/msn/switchboard.c:428
-msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Zprávu nelze odeslat, protože odesíláme příliš rychle:"
+#: ../libpurple/protocols/sametime/sametime.c:5480
+msgid "Notes Address Book Group"
+msgstr "Skupina adresáře Notes"
 
-#: ../src/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr "Zprávu nelze odeslat, protože došlo k chybě s ústřednou:"
-
-#: ../src/protocols/msn/switchboard.c:440
-msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě:"
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Skupinu a její členy přidáte do vašeho seznamu kamarádů zadáním názvu "
+"skupiny adresáře Notes do pole níže."
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vám právě poslal šťouchnutí!"
+msgid "Search results for '%s'"
+msgstr "Výsledky hledání '%s'"
 
-#: ../src/protocols/msn/userlist.c:96
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "Uživatel %s (%s) chce přidat %s do svého seznamu kamarádů."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"Identifikátor '%s' se může odkazovat na libovolného z následujících "
+"uživatelů. Tyto uživatele můžete přidat do vašeho seznamu kamarádů nebo jim "
+"odeslat zprávy tlačítky níže."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
-msgid "Authorize"
-msgstr "Autorizovat"
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
+msgid "Search Results"
+msgstr "Výsledky hledání"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
-msgid "Deny"
-msgstr "Zamítnout"
+#: ../libpurple/protocols/sametime/sametime.c:5563
+msgid "No matches"
+msgstr "Žádné shody"
 
-#: ../src/protocols/msn/userlist.c:286
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s vás přidal do svého seznamu kamarádů."
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+"Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime."
 
-#: ../src/protocols/msn/userlist.c:350
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vás odstranil ze svého seznamu kamarádů."
+#: ../libpurple/protocols/sametime/sametime.c:5568
+msgid "No Matches"
+msgstr "Žádné shody"
 
-#: ../src/protocols/msn/userlist.c:678
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Nemohu přidat \"%s\"."
+#: ../libpurple/protocols/sametime/sametime.c:5605
+msgid "Search for a user"
+msgstr "Hledat uživatele"
 
-#: ../src/protocols/msn/userlist.c:680
-msgid "The screen name specified is invalid."
-msgstr "Zadané jméno uživatele není platné."
+#: ../libpurple/protocols/sametime/sametime.c:5606
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Odpovídající uživatele ve vaší komunitě Sametime hledejte zadáním jména nebo "
+"částečného ID do pole níže."
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Nemohu číst hlavičku ze serveru"
+#: ../libpurple/protocols/sametime/sametime.c:5609
+msgid "User Search"
+msgstr "Hledání uživatele"
 
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "Nemohu číst zprávu ze serveru: %s. Příkaz je %hd, délka je %hd."
+#: ../libpurple/protocols/sametime/sametime.c:5622
+msgid "Import Sametime List..."
+msgstr "Importovat seznam Sametime..."
 
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Neznámá chyba serveru."
+#: ../libpurple/protocols/sametime/sametime.c:5626
+msgid "Export Sametime List..."
+msgstr "Exportovat seznam Sametime..."
 
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "uživatelé: %s, soubory: %s, velikost: %sGB"
+#: ../libpurple/protocols/sametime/sametime.c:5630
+msgid "Add Notes Address Book Group..."
+msgstr "Přidat skupinu adresáře Notes..."
 
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "Nemohu přidat \"%s\" do vašeho seznamu Napsteru"
+#: ../libpurple/protocols/sametime/sametime.c:5634
+msgid "User Search..."
+msgstr "Hledání uživatele..."
 
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s požádal o informace o vás"
+#: ../libpurple/protocols/sametime/sametime.c:5740
+msgid "Force login (ignore server redirects)"
+msgstr "Vnutit přihlášení (ignorovat přesměrování serveru)"
 
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s požádal o PING"
+#. pretend to be Sametime Connect
+#: ../libpurple/protocols/sametime/sametime.c:5750
+msgid "Hide client identity"
+msgstr "Skrýt identitu klienta"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr "Nemohu se připojit."
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "Uživatel %s není v síti přítomen"
 
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Skupina:"
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:119
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
+msgid "Key Agreement"
+msgstr "Výměna klíčů"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "Zásuvný modul protokolu NAPSTER"
+#: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
+msgid "Cannot perform the key agreement"
+msgstr "Nemohu provést výměnu klíčů"
 
-#: ../src/protocols/novell/nmuser.c:1868
-msgid "Required parameters not passed in"
-msgstr "Nezadány vyžadované parametry"
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
+msgid "Error occurred during key agreement"
+msgstr "Při výměně klíčů došlo k chybě"
 
-#: ../src/protocols/novell/nmuser.c:1871
-msgid "Unable to write to network"
-msgstr "Nemohu zapisovat na síť"
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+msgid "Key Agreement failed"
+msgstr "Výměna klíčů selhala"
 
-#: ../src/protocols/novell/nmuser.c:1874
-msgid "Unable to read from network"
-msgstr "Nemohu číst ze sítě"
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
+msgid "Timeout during key agreement"
+msgstr "Čas vypršel při výměně klíčů"
 
-#: ../src/protocols/novell/nmuser.c:1877
-msgid "Error communicating with server"
-msgstr "Chyba při komunikaci se serverem"
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Výměna klíčů byla přerušena"
 
-#: ../src/protocols/novell/nmuser.c:1881
-msgid "Conference not found"
-msgstr "Konference nenalezena"
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
+msgid "Key agreement is already started"
+msgstr "Výměna klíčů již byla spuštěna"
 
-#: ../src/protocols/novell/nmuser.c:1884
-msgid "Conference does not exist"
-msgstr "Konference neexistuje"
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
+msgid "Key agreement cannot be started with yourself"
+msgstr "Výměnu klíčů nemůžete spustit sami se sebou"
 
-#: ../src/protocols/novell/nmuser.c:1888
-msgid "A folder with that name already exists"
-msgstr "Složka s tímto názvem již existuje"
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
+msgid "The remote user is not present in the network any more"
+msgstr "Vzdálený uživatel již není v síti přítomen"
 
-#: ../src/protocols/novell/nmuser.c:1891
-msgid "Not supported"
-msgstr "Nepodporováno"
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Byl přijat požadavek na výměnu klíčů od %s. Chcete provést výměnu klíčů?"
 
-#: ../src/protocols/novell/nmuser.c:1895
-msgid "Password has expired"
-msgstr "Heslo vypršelo"
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"Vzdálený uživatel čeká na výměnu klíčů na:\n"
+"Vzdálený počítač: %s\n"
+"Vzdálený port: %d"
 
-#: ../src/protocols/novell/nmuser.c:1898
-msgid "Invalid password"
-msgstr "Neplatné heslo"
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
+msgid "Key Agreement Request"
+msgstr "Požadavek na výměnu klíčů"
 
-#: ../src/protocols/novell/nmuser.c:1901
-msgid "User not found"
-msgstr "Uživatel nenalezen"
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
+msgid "IM With Password"
+msgstr "IM s heslem"
 
-#: ../src/protocols/novell/nmuser.c:1904
-msgid "Account has been disabled"
-msgstr "Účet byl zakázán"
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
+msgid "Cannot set IM key"
+msgstr "Nemohu nastavit klíč IM"
 
-#: ../src/protocols/novell/nmuser.c:1907
-msgid "The server could not access the directory"
-msgstr "Server nemohl přistupovat k adresáři"
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
+msgid "Set IM Password"
+msgstr "Nastavit heslo IM"
 
-#: ../src/protocols/novell/nmuser.c:1910
-msgid "Your system administrator has disabled this operation"
-msgstr "Váš správce systému tuto operaci zakázal"
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
+msgid "Get Public Key"
+msgstr "Získat veřejný klíč"
 
-#: ../src/protocols/novell/nmuser.c:1913
-msgid "The server is unavailable; try again later"
-msgstr "Server není k dispozici; zkuste to později"
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
+msgid "Cannot fetch the public key"
+msgstr "Nemohu získat veřejný klíč"
 
-#: ../src/protocols/novell/nmuser.c:1916
-msgid "Cannot add a contact to the same folder twice"
-msgstr "Nemohu přidat kontakt dvakrát do téže složky"
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
+msgid "Show Public Key"
+msgstr "Zobrazit veřejný klíč"
 
-#: ../src/protocols/novell/nmuser.c:1919
-msgid "Cannot add yourself"
-msgstr "Nemohu vás přidat"
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
+msgid "Could not load public key"
+msgstr "Nemohu načíst veřejný klíč"
 
-#: ../src/protocols/novell/nmuser.c:1922
-msgid "Master archive is misconfigured"
-msgstr "Hlavní archiv není správně nastaven"
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
+msgid "User Information"
+msgstr "Informace o uživateli"
 
-#: ../src/protocols/novell/nmuser.c:1926
-msgid "Invalid username or password"
-msgstr "Neplatné jméno uživatele nebo heslo"
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
+msgid "Cannot get user information"
+msgstr "Nemohu získat informace o uživateli"
 
-#: ../src/protocols/novell/nmuser.c:1929
-msgid "Could not recognize the host of the username you entered"
-msgstr "Nemohu rozpoznat počítač ve jménu uživatele, které jste zadali"
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "Kamarádovi %s se nedůvěřuje"
 
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
-"Your account has been disabled because too many invalid passwords were "
-"entered"
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
 msgstr ""
-"Váš účet byl zakázán, protože bylo zadáno příliš mnoho neplatných hesel"
+"Nemůžete dostávat upozornění o kamarádovi, dokud neimportujete jeho/její "
+"veřejný klíč. Veřejný klíč můžete získat pomocí příkazu Získat veřejný klíč."
 
-#: ../src/protocols/novell/nmuser.c:1935
-msgid "You cannot add the same person twice to a conversation"
-msgstr "Nemůžete jednu osobu přidat do konverzace dvakrát"
+#. Open file selector to select the public key.
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
+msgid "Open..."
+msgstr "Otevřít..."
 
-#: ../src/protocols/novell/nmuser.c:1939
-msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Dosáhli jste vašeho limitu pro počet povolených kontaktů"
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "Kamarád %s není v síti přítomen"
 
-#: ../src/protocols/novell/nmuser.c:1942
-msgid "You have entered an invalid username"
-msgstr "Zadali jste neplatné jméno uživatele"
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Pro přidání kamaráda musíte importovat jeho/její veřejný klíč. Veřejný klíč "
+"importujete stisknutím Importovat."
 
-#: ../src/protocols/novell/nmuser.c:1945
-msgid "An error occurred while updating the directory"
-msgstr "Při aktualizaci adresáře došlo k chybě."
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
+msgid "_Import..."
+msgstr "_Importovat..."
 
-#: ../src/protocols/novell/nmuser.c:1948
-msgid "Incompatible protocol version"
-msgstr "Nekompatibilní verze protokolu"
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
+msgid "Select correct user"
+msgstr "Zvolte správného uživatele"
 
-#: ../src/protocols/novell/nmuser.c:1951
-msgid "The user has blocked you"
-msgstr "Uživatel vás zablokoval"
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Byl nalezen více než jeden uživatel se stejným veřejným klíčem. Vyberte ze "
+"seznamu uživatele, kterého přidat do seznamu kamarádů."
 
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
-msgstr "Tato demoverze nedovoluje přihlášení více než deseti uživatelů zároveň"
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Byl nalezen více než jeden uživatel se stejným jménem. Zvolte ze seznamu "
+"uživatele, kterého přidat do seznamu kamarádů."
 
-#: ../src/protocols/novell/nmuser.c:1957
-msgid "The user is either offline or you are blocked"
-msgstr "Buď je uživatel odpojen, nebo jste blokováni"
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
+msgid "Detached"
+msgstr "Odpojen"
 
-#: ../src/protocols/novell/nmuser.c:1960
-#, c-format
-msgid "Unknown error: 0x%X"
-msgstr "Neznámá chyba: 0x%X"
-
-#: ../src/protocols/novell/novell.c:124
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Přihlášení selhalo (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
+msgid "Indisposed"
+msgstr "Indisponován"
 
-#: ../src/protocols/novell/novell.c:247
-#, c-format
-msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Nemohu odeslat zprávu. Nemohu získat detaily o uživateli (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
+msgid "Wake Me Up"
+msgstr "Probuďte mě"
 
-#: ../src/protocols/novell/novell.c:396
-#, c-format
-msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
+msgid "Hyper Active"
+msgstr "Hyperaktivní"
 
-#. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
-#, c-format
-msgid "Unable to send message (%s)."
-msgstr "Nemohu odeslat zprávu (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
+msgid "Robot"
+msgstr "Robot"
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
-#, c-format
-msgid "Unable to invite user (%s)."
-msgstr "Nemohu pozvat uživatele (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
+msgid "Happy"
+msgstr "Šťastný"
 
-#: ../src/protocols/novell/novell.c:532
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "Nemohu poslat zprávu %s. Nemohu vytvořit konferenci (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
+msgid "Sad"
+msgstr "Smutný"
 
-#: ../src/protocols/novell/novell.c:537
-#, c-format
-msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Nemohu odeslat zprávu. Nemohu vytvořit konferenci (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
+msgid "Angry"
+msgstr "Rozzlobený"
 
-#: ../src/protocols/novell/novell.c:584
-#, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Nemohu přesunout uživatele %s do složky %s v seznamu na serveru. Chyba při "
-"vytváření složky (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
+msgid "Jealous"
+msgstr "Žárlivý"
 
-#: ../src/protocols/novell/novell.c:632
-#, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Nemohu přidat %s do vašeho seznamu kamarádů. Chyba při vytváření složky v "
-"seznamu na serveru (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
+msgid "Ashamed"
+msgstr "Hanbící se"
 
-#: ../src/protocols/novell/novell.c:705
-#, c-format
-msgid "Could not get details for user %s (%s)."
-msgstr "Nemohu získat detaily o uživateli %s (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
+msgid "Invincible"
+msgstr "Neporazitelný"
 
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
-#, c-format
-msgid "Unable to add user to privacy list (%s)."
-msgstr "Nemohu přidat uživatele do seznamu soukromí (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
+msgid "In Love"
+msgstr "Zamilovaný"
 
-#: ../src/protocols/novell/novell.c:798
-#, c-format
-msgid "Unable to add %s to deny list (%s)."
-msgstr "Nemohu přidat %s do seznamu zakázaných (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
+msgid "Sleepy"
+msgstr "Ospalý"
 
-#: ../src/protocols/novell/novell.c:851
-#, c-format
-msgid "Unable to add %s to permit list (%s)."
-msgstr "Nemohu přidat %s do seznamu povolených (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
+msgid "Bored"
+msgstr "Znuděný"
 
-#: ../src/protocols/novell/novell.c:919
-#, c-format
-msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Nemohu přidat %s do vašeho seznamu kamarádů (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
+msgid "Excited"
+msgstr "Vzrušený"
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
-#, c-format
-msgid "Unable to change server side privacy settings (%s)."
-msgstr "Nemohu změnit nastavení soukromí na straně serveru (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
+msgid "Anxious"
+msgstr "Nedočkavý"
 
-#: ../src/protocols/novell/novell.c:1014
-#, c-format
-msgid "Unable to create conference (%s)."
-msgstr "Nemohu vytvořit konferenci (%s)."
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
+msgid "User Modes"
+msgstr "Režimy uživatele"
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
-msgid "Error communicating with server. Closing connection."
-msgstr "Chyba při komunikaci se serverem. Zavírám spojení."
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Nálada"
 
-#: ../src/protocols/novell/novell.c:1478
-msgid "Telephone Number"
-msgstr "Telefonní číslo"
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
+msgid "Preferred Contact"
+msgstr "Preferovaný kontakt"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Oddělení"
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
+msgid "Preferred Language"
+msgstr "Preferovaný jazyk"
 
-#: ../src/protocols/novell/novell.c:1484
-msgid "Personal Title"
-msgstr "Osobní titul"
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
+msgid "Device"
+msgstr "Zařízení"
 
-#: ../src/protocols/novell/novell.c:1488
-msgid "Mailstop"
-msgstr "Poštovní schránka"
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
+msgid "Timezone"
+msgstr "Časové pásmo"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Emailová adresa"
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
+msgid "Geolocation"
+msgstr "Zeměpisné umístění"
 
-#: ../src/protocols/novell/novell.c:1506
-msgid "User ID"
-msgstr "ID uživatele"
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
+msgid "Reset IM Key"
+msgstr "Vynulovat klíč IM"
 
-#. tag = _("DN");
-#. value = nm_user_record_get_dn(user_record);
-#. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
-#. }
-#.
-#: ../src/protocols/novell/novell.c:1520
-msgid "Full name"
-msgstr "Celé jméno"
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
+msgid "IM with Key Exchange"
+msgstr "IM s výměnou klíčů"
 
-#: ../src/protocols/novell/novell.c:1644
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "Konference GroupWise %d"
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
+msgid "IM with Password"
+msgstr "IM s heslem"
 
-#: ../src/protocols/novell/novell.c:1669
-msgid "Unable to make SSL connection to server."
-msgstr "Nemohu vytvořit připojení SSL k serveru."
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
+msgid "Get Public Key..."
+msgstr "Získat veřejný klíč..."
 
-#: ../src/protocols/novell/novell.c:1726
-msgid "Authenticating..."
-msgstr "Autentizuji..."
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
+msgid "Kill User"
+msgstr "Zabít uživatele"
 
-#: ../src/protocols/novell/novell.c:1738
-msgid "Unable to connect to server."
-msgstr "Nemohu se připojit k serveru."
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
+msgid "Draw On Whiteboard"
+msgstr "Kreslit na tabuli"
 
-#: ../src/protocols/novell/novell.c:1741
-msgid "Waiting for response..."
-msgstr "Čekám na odpověď..."
+#: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
+msgid "_Passphrase:"
+msgstr "_Heslo:"
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
-msgid "%s has been invited to this conversation."
-msgstr "%s byl pozván do této konverzace."
+msgid "Channel %s does not exist in the network"
+msgstr "Kanál %s v síti neexistuje"
 
-#: ../src/protocols/novell/novell.c:1904
-msgid "Invitation to Conversation"
-msgstr "Pozvání ke konverzaci"
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
+msgid "Channel Information"
+msgstr "Informace o kanálu"
 
-#: ../src/protocols/novell/novell.c:1905
-#, c-format
-msgid ""
-"Invitation from: %s\n"
-"\n"
-"Sent: %s"
-msgstr ""
-"Pozvání od: %s\n"
-"\n"
-"Odesláno: %s"
+#: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
+msgid "Cannot get channel information"
+msgstr "Nemohu získat informace o kanálu"
 
-#: ../src/protocols/novell/novell.c:1907
-msgid "Would you like to join the conversation?"
-msgstr "Chcete se připojit k této konverzaci?"
+#: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>Název kanálu:</b> %s"
 
-#: ../src/protocols/novell/novell.c:2014
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
+#: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>Počet uživatelů:</b> %d"
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s je zřejmě odpojen a nedostal zprávu, kterou jste právě odeslali."
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>Zakladatel kanálu:</b> %s"
 
-#. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
-"chcete připojit."
+#: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>Šifra kanálu:</b> %s"
 
-#: ../src/protocols/novell/novell.c:2190
-msgid "Error. SSL support is not installed."
-msgstr "Chyba. Není nainstalována podpora SSL."
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>HMAC kanálu:</b>\t%s"
 
-#: ../src/protocols/novell/novell.c:2499
-msgid "This conference has been closed. No more messages can be sent."
-msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>Téma kanálu:</b><br>%s"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
-msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Zásuvný modul protokolu Novell GroupWise Messenger"
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>Režimy kanálu:</b> "
 
-#: ../src/protocols/novell/novell.c:3564
-msgid "Server address"
-msgstr "Adresa serveru"
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>Otisk klíče zakladatele:</b><br>%s"
 
-#: ../src/protocols/novell/novell.c:3568
-msgid "Server port"
-msgstr "Port serveru"
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>Babbleprint klíče zakladatele:</b><br>%s"
 
-#: ../src/protocols/oscar/oscar.c:203
-msgid "Invalid error"
-msgstr "Neplatná chyba"
+#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
+msgid "Add Channel Public Key"
+msgstr "Přidat veřejný klíč kanálu"
 
-#: ../src/protocols/oscar/oscar.c:204
-msgid "Invalid SNAC"
-msgstr "Neplatné SNAC"
+#. Add new public key
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
+msgid "Open Public Key..."
+msgstr "Otevřít veřejný klíč..."
 
-#: ../src/protocols/oscar/oscar.c:205
-msgid "Rate to host"
-msgstr "Rychlost k hostiteli"
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
+msgid "Channel Passphrase"
+msgstr "Heslo kanálu"
 
-#: ../src/protocols/oscar/oscar.c:206
-msgid "Rate to client"
-msgstr "Rychlost ke klientovi"
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
+msgid "Channel Public Keys List"
+msgstr "Seznam veřejných klíčů kanálu"
 
-#: ../src/protocols/oscar/oscar.c:208
-msgid "Service unavailable"
-msgstr "Služba nedostupná"
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Autentizace kanálů se používá pro zabezpečení kanálu před nepovoleným "
+"přístupem. Autentizace může být založena na heslu a digitálních podpisech. "
+"Je-li nastaveno heslo, je vyžadováno pro umožnění připojení. Jsou-li "
+"nastaveny veřejné klíče, mohou se připojit jen uživatelé, jejichž veřejné "
+"klíče jsou v seznamu."
+
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
+msgid "Channel Authentication"
+msgstr "Autentizace kanálu"
 
-#: ../src/protocols/oscar/oscar.c:209
-msgid "Service not defined"
-msgstr "Služba nedefinována"
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
+msgid "Add / Remove"
+msgstr "Přidat/odstranit"
 
-#: ../src/protocols/oscar/oscar.c:210
-msgid "Obsolete SNAC"
-msgstr "Zastaralé SNAC"
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
+msgid "Group Name"
+msgstr "Název skupiny"
 
-#: ../src/protocols/oscar/oscar.c:211
-msgid "Not supported by host"
-msgstr "Nepodporováno hostitelem"
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
+msgid "Passphrase"
+msgstr "Heslo"
 
-#: ../src/protocols/oscar/oscar.c:212
-msgid "Not supported by client"
-msgstr "Nepodporováno klientem"
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Zadejte prosím název soukromé skupiny kanálu %s a heslo."
 
-#: ../src/protocols/oscar/oscar.c:213
-msgid "Refused by client"
-msgstr "Odmítnuto klientem"
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
+msgid "Add Channel Private Group"
+msgstr "Přidat soukromou skupinu kanálu"
 
-#: ../src/protocols/oscar/oscar.c:214
-msgid "Reply too big"
-msgstr "Odpověď příliš velká"
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
+msgid "User Limit"
+msgstr "Limit uživatelů"
 
-#: ../src/protocols/oscar/oscar.c:215
-msgid "Responses lost"
-msgstr "Odpovědi ztraceny"
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+"Nastavit limit uživatelů v kanálu. Nastavením na nulu limit uživatelů "
+"zrušíte."
 
-#: ../src/protocols/oscar/oscar.c:216
-msgid "Request denied"
-msgstr "Požadavek zamítnut"
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
+msgid "Invite List"
+msgstr "Seznam pozvaných"
 
-#: ../src/protocols/oscar/oscar.c:217
-msgid "Busted SNAC payload"
-msgstr "Poškozená data SNAC"
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
+msgid "Ban List"
+msgstr "Seznam zakázaných"
 
-#: ../src/protocols/oscar/oscar.c:218
-msgid "Insufficient rights"
-msgstr "Nedostatečná oprávnění"
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
+msgid "Add Private Group"
+msgstr "Přidat soukromou skupinu"
 
-#: ../src/protocols/oscar/oscar.c:219
-msgid "In local permit/deny"
-msgstr "V místním povolit/zakázat"
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
+msgid "Reset Permanent"
+msgstr "Zrušit trvalé"
 
-#: ../src/protocols/oscar/oscar.c:220
-msgid "Too evil (sender)"
-msgstr "Příliš zlý (odesílatel)"
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
+msgid "Set Permanent"
+msgstr "Nastavit trvalé"
 
-#: ../src/protocols/oscar/oscar.c:221
-msgid "Too evil (receiver)"
-msgstr "Příliš zlý (příjemce)"
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
+msgid "Set User Limit"
+msgstr "Nastavit limit uživatelů"
 
-#: ../src/protocols/oscar/oscar.c:222
-msgid "User temporarily unavailable"
-msgstr "Uživatel dočasně nedostupný"
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
+msgid "Reset Topic Restriction"
+msgstr "Zrušit omezení tématu"
 
-#: ../src/protocols/oscar/oscar.c:223
-msgid "No match"
-msgstr "Žádná shoda"
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
+msgid "Set Topic Restriction"
+msgstr "Nastavit omezení tématu"
 
-#: ../src/protocols/oscar/oscar.c:224
-msgid "List overflow"
-msgstr "Přetečení seznamu"
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
+msgid "Reset Private Channel"
+msgstr "Zrušit Soukromý kanál"
 
-#: ../src/protocols/oscar/oscar.c:225
-msgid "Request ambiguous"
-msgstr "Požadavek nejednoznačný"
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
+msgid "Set Private Channel"
+msgstr "Nastavit Soukromý kanál"
 
-#: ../src/protocols/oscar/oscar.c:226
-msgid "Queue full"
-msgstr "Fronta plná"
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
+msgid "Reset Secret Channel"
+msgstr "Zrušit Tajný kanál"
 
-#: ../src/protocols/oscar/oscar.c:227
-msgid "Not while on AOL"
-msgstr "Ne když na AOL"
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
+msgid "Set Secret Channel"
+msgstr "Nastavit Tajný kanál"
 
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
+#, c-format
 msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
+"You have to join the %s channel before you are able to join the private group"
 msgstr ""
-"(Při přijímání této zprávy došlo k chybě. Kamarád, se kterým mluvíte, má "
-"pravděpodobně klienta s chybami.)"
-
-#: ../src/protocols/oscar/oscar.c:702
-msgid "Voice"
-msgstr "Hlas"
-
-#: ../src/protocols/oscar/oscar.c:705
-msgid "AIM Direct IM"
-msgstr "AIM Přímé IM"
-
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
-msgid "Chat"
-msgstr "Chat"
-
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
-msgid "Get File"
-msgstr "Získat soubor"
-
-#: ../src/protocols/oscar/oscar.c:718
-msgid "Games"
-msgstr "Hry"
-
-#: ../src/protocols/oscar/oscar.c:721
-msgid "Add-Ins"
-msgstr "Přídavky"
-
-#: ../src/protocols/oscar/oscar.c:724
-msgid "Send Buddy List"
-msgstr "Odeslat seznam kamarádů"
-
-#: ../src/protocols/oscar/oscar.c:727
-msgid "ICQ Direct Connect"
-msgstr "Přímé spojení ICQ"
+"Než se budete moci připojit k soukromé skupině, musíte se připojit ke kanálu "
+"%s"
 
-#: ../src/protocols/oscar/oscar.c:730
-msgid "AP User"
-msgstr "Uživatel AP"
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
+msgid "Join Private Group"
+msgstr "Připojit se k soukromé skupině"
 
-#: ../src/protocols/oscar/oscar.c:733
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
+msgid "Cannot join private group"
+msgstr "Nemohu se připojit k soukromé skupině"
 
-#: ../src/protocols/oscar/oscar.c:736
-msgid "Nihilist"
-msgstr "Nihilist"
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
+msgid "Call Command"
+msgstr "Příkaz volání"
 
-#: ../src/protocols/oscar/oscar.c:739
-msgid "ICQ Server Relay"
-msgstr "Relay ICQ serveru"
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
+msgid "Cannot call command"
+msgstr "Nemohu zavolat příkaz"
 
-#: ../src/protocols/oscar/oscar.c:742
-msgid "Old ICQ UTF8"
-msgstr "Staré ICQ UTF8"
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
+msgid "Unknown command"
+msgstr "Neznámý příkaz"
 
-#: ../src/protocols/oscar/oscar.c:745
-msgid "Trillian Encryption"
-msgstr "Šifrování Trillian"
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
+msgid "Secure File Transfer"
+msgstr "Zabezpečený přenos souborů"
 
-#: ../src/protocols/oscar/oscar.c:748
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
+msgid "Error during file transfer"
+msgstr "Chyba při přenosu souboru"
 
-#: ../src/protocols/oscar/oscar.c:751
-msgid "Hiptop"
-msgstr "Hiptop"
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Vzdálený odpojen"
 
-#: ../src/protocols/oscar/oscar.c:754
-msgid "Security Enabled"
-msgstr "Zabezpečení povoleno"
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+msgid "Permission denied"
+msgstr "Přístup odepřen"
 
-#: ../src/protocols/oscar/oscar.c:757
-msgid "Video Chat"
-msgstr "Video Chat"
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+msgid "Key agreement failed"
+msgstr "Výměna klíčů selhala"
 
-#: ../src/protocols/oscar/oscar.c:761
-msgid "iChat AV"
-msgstr "iChat AV"
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Spojení vypršel čas"
 
-#: ../src/protocols/oscar/oscar.c:764
-msgid "Live Video"
-msgstr "Živé video"
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Vytváření spojení selhalo"
 
-#: ../src/protocols/oscar/oscar.c:767
-msgid "Camera"
-msgstr "Kamera"
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+msgid "File transfer session does not exist"
+msgstr "Sezení pro přenos souborů neexistuje"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
-msgid "Free For Chat"
-msgstr "Volný pro chat"
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+msgid "No file transfer session active"
+msgstr "Není aktivní sezení pro přenos souborů"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
-msgid "Not Available"
-msgstr "Nejsem k dispozici"
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+msgid "File transfer already started"
+msgstr "Přenos souborů již byl spuštěn"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
-msgid "Occupied"
-msgstr "Zaměstnán"
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+msgid "Could not perform key agreement for file transfer"
+msgstr "Nemohu provést výměnu klíčů pro přenos souborů"
 
-#: ../src/protocols/oscar/oscar.c:795
-msgid "Web Aware"
-msgstr "Ví o WWW"
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+msgid "Could not start the file transfer"
+msgstr "Nemohu spustit přenos souborů"
 
-#: ../src/protocols/oscar/oscar.c:799
-msgid "Online"
-msgstr "Připojen"
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+msgid "Cannot send file"
+msgstr "Nemohu odeslat soubor"
 
-#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
-msgid "Warning Level"
-msgstr "Úroveň varování"
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Došlo k chybě"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s změnil téma <I>%s</I> na: %s"
 
-#: ../src/protocols/oscar/oscar.c:885
-msgid "Buddy Comment"
-msgstr "Poznámka o kamarádovi"
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> nastavil režimy kanálu <I>%s</I> na: %s"
 
-#: ../src/protocols/oscar/oscar.c:1034
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
-msgid "Direct IM with %s closed"
-msgstr "Přímé IM s %s zavřeno"
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> odstranil všechny režimy kanálu <I>%s</I>"
 
-#: ../src/protocols/oscar/oscar.c:1036
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
-msgid "Direct IM with %s failed"
-msgstr "Přímé IM s %s selhalo"
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> nastavil režimy <I>%s</I> na: %s"
 
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "Přímé spojení selhalo"
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> odstranil všechny režimy <I>%s</I>"
 
-#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
-msgid "Direct IM with %s established"
-msgstr "Přímé IM s %s navázáno"
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Byli jste vykopnuti z <I>%s</I> od <I>%s</I> (%s)"
 
-#: ../src/protocols/oscar/oscar.c:1205
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Pokouším se připojit k %s na %s:%hu pro přímé IM."
+msgid "You have been killed by %s (%s)"
+msgstr "Byli jste zabiti v %s: (%s)"
 
-#: ../src/protocols/oscar/oscar.c:1608
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Žádám %s, aby se k nám připojili na %s:%hu pro přímé IM."
+msgid "Killed by %s (%s)"
+msgstr "Zabit od %s: (%s)"
 
-#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "Nemohu otevřít Přímé IM"
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
+msgid "Server signoff"
+msgstr "Odhlášení od serveru"
 
-#: ../src/protocols/oscar/oscar.c:1696
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Rozhodli jste se otevřít Přímé IM spojení s %s."
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
+msgid "Personal Information"
+msgstr "Osobní informace"
 
-#: ../src/protocols/oscar/oscar.c:1700
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Protože to odkryje vaši IP adresu, dá se to považovat za riziko pro "
-"soukromí. Chcete pokračovat?"
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
+msgid "Birth Day"
+msgstr "Datum narození"
 
-#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "_Připojit"
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
+msgid "Job Role"
+msgstr "Role v zaměstnání"
 
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Ztratili jste spojení s místností chatu %s."
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
+msgid "Organization"
+msgstr "Organizace"
 
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "Chat je momentálně nedostupný"
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
+msgid "Unit"
+msgstr "Jednotka"
 
-#: ../src/protocols/oscar/oscar.c:1877
-msgid "Screen name sent"
-msgstr "Jméno uživatele odesláno"
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
+msgid "Note"
+msgstr "Poznámka"
+
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
+msgid "Join Chat"
+msgstr "Připojit se k chatu"
 
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr "Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele není platné. Jména uživatele musí buď začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo musí obsahovat jen číslice."
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Jste zakladatel kanálu <I>%s</I>"
 
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "Nemohu se přihlásit do AIM"
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Zakladatel kanálu <I>%s</I> je <I>%s</I>"
 
-#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "Nemohu se připojit"
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+msgid "Real Name"
+msgstr "Skutečné jméno"
 
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "Spojení navázáno, cookie odesláno"
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
+msgid "Status Text"
+msgstr "Text stavu"
 
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-msgid "Attempting connection redirect..."
-msgstr "Pokouším se o přesměrování spojení..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-"Přenosu souboru %s vypršel čas.\n"
-" Zkuste povolit proxy servery pro přenos souborů v Účty->%s->Upravit účet->Pokročilé."
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "Nemohu získat deskriptor souboru."
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
+msgid "Public Key Fingerprint"
+msgstr "Otisk veřejného klíče"
 
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "Nemohu vytvořit nové spojení."
-
-#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "Nemohu se přihlásit k proxy pro přenos souborů."
-
-#: ../src/protocols/oscar/oscar.c:2668
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Nemohu vytvořit naslouchající socket nebo chybí připojení k proxy AOL."
-
-#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Nesprávná přezdívka nebo heslo."
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
+msgid "Public Key Babbleprint"
+msgstr "Babbleprint veřejného klíče"
 
-#: ../src/protocols/oscar/oscar.c:2911
-msgid "Your account is currently suspended."
-msgstr "Váš účet je momentálně suspendován."
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
+msgid "_More..."
+msgstr "_Více..."
 
-#. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
-msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
+msgid "Detach From Server"
+msgstr "Odpojit se od serveru"
 
-#: ../src/protocols/oscar/oscar.c:2920
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
-"to znovu. Pokud to budete dále zkouše, budete muset čekat ještě déle."
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
+msgid "Cannot detach"
+msgstr "Nemohu odpojit"
 
-#: ../src/protocols/oscar/oscar.c:2925
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Verze klienta, kterou používáte, je příliš stará. Aktualizujte prosím na %s"
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
+msgid "Cannot set topic"
+msgstr "Nemohu nastavit téma"
 
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "Interní chyba"
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
+msgid "Failed to change nickname"
+msgstr "Nemohu změnit přezdívku"
 
-#: ../src/protocols/oscar/oscar.c:3023
-msgid "Received authorization"
-msgstr "Přijata autorizace"
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
+msgid "Roomlist"
+msgstr "Seznam místností"
 
-#: ../src/protocols/oscar/oscar.c:3047
-msgid "The SecurID key entered is invalid."
-msgstr "Zadaný klíč SecurID není platný."
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
+msgid "Cannot get room list"
+msgstr "Nemohu získat seznam místností"
 
-#: ../src/protocols/oscar/oscar.c:3061
-msgid "Enter SecurID"
-msgstr "Zadejte SecurID"
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Síť je prázdná"
 
-#: ../src/protocols/oscar/oscar.c:3062
-msgid "Enter the 6 digit number from the digital display."
-msgstr "Zadejte šesticiferné číslo z digitálního displeje."
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
+msgid "No public key was received"
+msgstr "Nebyl přijat veřejný klíč"
 
-#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Možná budete brzo odpojen. Možná budete chtít používat TOC, dokud toto není "
-"opraveno. Hledejte aktualizace na %s."
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
+msgid "Server Information"
+msgstr "Informace o serveru"
 
-#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim nemohl získat platný přihlašovací hash AIM."
-
-#: ../src/protocols/oscar/oscar.c:3226
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim nemohl získat platný přihlašovací hash."
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
+msgid "Cannot get server information"
+msgstr "Nemohu získat informace o serveru"
 
-#: ../src/protocols/oscar/oscar.c:3247
-msgid "Password sent"
-msgstr "Heslo odesláno"
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
+msgid "Server Statistics"
+msgstr "Statistika o serveru"
 
-#: ../src/protocols/oscar/oscar.c:4555
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s právě požádal o přímé spojení s %s"
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
+msgid "Cannot get server statistics"
+msgstr "Nemohu získat statistiku o serveru"
 
-#: ../src/protocols/oscar/oscar.c:4558
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
+#, c-format
 msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"To vyžaduje přímé spojení mezi danými dvěma počítači a je potřeba pro IM "
-"Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
-"pro soukromí."
-
-#: ../src/protocols/oscar/oscar.c:4597
-msgid "Please authorize me so I can add you to my buddy list."
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
 msgstr ""
-"Autorizujte mě prosím, abych vás mohl přidat do svého seznamu kamarádů."
-
-#: ../src/protocols/oscar/oscar.c:4605
-msgid "Authorization Request Message:"
-msgstr "Zpráva požadavku na autorizaci"
+"Čas spuštění místního serveru: %s\n"
+"Čas běhu místního serveru: %s\n"
+"Klienti místního serveru: %d\n"
+"Kanály místního serveru: %d\n"
+"Operátoři místního serveru: %d\n"
+"Operátoři místního směrovače: %d\n"
+"Klienti místní buňky: %d\n"
+"Kanály místní buňky: %d\n"
+"Servery místní buňky: %d\n"
+"Celkem klientů: %d\n"
+"Celkem kanálů: %d\n"
+"Celkem serverů: %d\n"
+"Celkem směrovačů: %d\n"
+"Celkem operátorů serverů: %d\n"
+"Celkem operátorů směrovačů: %d\n"
 
-#: ../src/protocols/oscar/oscar.c:4606
-msgid "Please authorize me!"
-msgstr "Autorizujte mě prosím!"
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
+msgid "Network Statistics"
+msgstr "Statistika o síti"
 
-#: ../src/protocols/oscar/oscar.c:4636
-#, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-msgstr ""
-"Uživatel %s vyžaduje autorizaci před přidáním do seznamu kamarádů. Chcete "
-"odeslat požadavek na autorizaci?"
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
 
-#: ../src/protocols/oscar/oscar.c:4641
-msgid "Request Authorization"
-msgstr "Požadovat autorizaci"
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
+msgid "Ping failed"
+msgstr "Ping selhal"
 
-#: ../src/protocols/oscar/oscar.c:4643
-msgid "_Request Authorization"
-msgstr "_Požádat o autorizaci"
-
-#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
-msgid "No reason given."
-msgstr "Neudán žádný důvod."
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping reply received from server"
+msgstr "Od serveru přijata odpověď na ping"
 
-#: ../src/protocols/oscar/oscar.c:4686
-msgid "Authorization Denied Message:"
-msgstr "Zpráva odmítnutí autorizace:"
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
+msgid "Could not kill user"
+msgstr "Nemohu zabít uživatele"
 
-#: ../src/protocols/oscar/oscar.c:4793
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
 msgstr ""
-"Uživatel %u chce přidat %s do svého seznamu kamarádů z následujícího důvodu:\n"
-"%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
-msgid "Authorization Request"
-msgstr "Požadavek na autorizaci"
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Nemohu sledovat uživatele"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
+msgid "Resuming session"
+msgstr "Obnovuji sezení"
 
-#: ../src/protocols/oscar/oscar.c:4815
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
-msgstr ""
-"Uživatel %u odmítl váš požadavek přidat jej do vašeho seznamu kamarádů z "
-"následujícího důvodu:\n"
-"%s"
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
+msgid "Authenticating connection"
+msgstr "Autentizuji připojení"
 
-#: ../src/protocols/oscar/oscar.c:4816
-msgid "ICQ authorization denied."
-msgstr "Autorizace ICQ odepřena."
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
+msgid "Verifying server public key"
+msgstr "Ověřuji veřejný klíč serveru"
 
-#. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
-#, c-format
-msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"Uživatel %u splnil váš požadavek na jeho přidání do vašeho seznamu kamarádů."
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
+msgid "Passphrase required"
+msgstr "Je vyžadováno heslo"
 
-#: ../src/protocols/oscar/oscar.c:4831
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
-"You have received a special message\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
 msgstr ""
-"Přijali jste speciální zprávu\n"
-"\n"
-"Od: %s [%s]\n"
-"%s"
+"Přijat veřejný klíč %s. Vaše místní kopie tomuto klíči neodpovídá. Opravdu "
+"chcete přijmout tento veřejný klíč?"
 
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
-msgid ""
-"You have received an ICQ page\n"
-"\n"
-"From: %s [%s]\n"
-"%s"
-msgstr ""
-"Přijali jste page ICQ\n"
-"\n"
-"Od: %s [%s]\n"
-"%s"
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "Přijat veřejný klíč %s. Chcete přijmout tento veřejný klíč?"
 
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
-"You have received an ICQ e-mail from %s [%s]\n"
+"Fingerprint and babbleprint for the %s key are:\n"
 "\n"
-"Message is:\n"
-"%s"
+"%s\n"
+"%s\n"
 msgstr ""
-"Přijali jste e-mail ICQ od %s [%s]\n"
+"Otisk a babbleprint klíče %s jsou:\n"
 "\n"
-"Zpráva je:\n"
-"%s"
+"%s\n"
+"%s\n"
 
-#: ../src/protocols/oscar/oscar.c:4868
-#, c-format
-msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "Uživatel ICQ %u vám poslal kamaráda: %s (%s)"
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
+msgid "Verify Public Key"
+msgstr "Ověřit veřejný klíč"
 
-#: ../src/protocols/oscar/oscar.c:4874
-msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Chcete přidat tohoto kamaráda do svého seznamu kamarádů?"
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+msgid "_View..."
+msgstr "_Zobrazit..."
 
-#: ../src/protocols/oscar/oscar.c:4878
-msgid "_Decline"
-msgstr "_Odmítnout"
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+msgid "Unsupported public key type"
+msgstr "Nepodporovaný typ veřejného klíče"
 
-#: ../src/protocols/oscar/oscar.c:4962
-#, c-format
-msgid "You missed %hu message from %s because it was invalid."
-msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "Přišli jste o %hu zprávu od %s, protože byla neplatná."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly neplatné."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly neplatné."
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Odpojen serverem"
 
-#: ../src/protocols/oscar/oscar.c:4971
-#, c-format
-msgid "You missed %hu message from %s because it was too large."
-msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "Přišli jste o %hu zprávu od %s, protože byla příliš velká."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože byly příliš velké."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože byly příliš velké."
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Chyba při připojování se k serveru SILC"
 
-#: ../src/protocols/oscar/oscar.c:4980
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Výměna klíčů selhala"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"Přišli jste o %hu zprávu od %s, protože limit rychlosti byl překročen."
-msgstr[1] ""
-"Přišli jste o %hu zprávy od %s, protože limit rychlosti byl překročen."
-msgstr[2] ""
-"Přišli jste o %hu zpráv od %s, protože limit rychlosti byl překročen."
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Obnova odpojeného sezení selhala. Vytvořte nové spojení stisknutím Znovu se "
+"připojit"
 
-#: ../src/protocols/oscar/oscar.c:4989
-#, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] "Přišli jste o %hu zprávu od %s, protože byli příliš zlí."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože byli příliš zlí."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože byli příliš zlí."
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
+msgid "Connection failed"
+msgstr "Spojení selhalo"
 
-#: ../src/protocols/oscar/oscar.c:4998
-#, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "Přišli jste o %hu zprávu od %s, protože jste velmi zlí."
-msgstr[1] "Přišli jste o %hu zprávy od %s, protože jste velmi zlí."
-msgstr[2] "Přišli jste o %hu zpráv od %s, protože jste velmi zlí."
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
+msgid "Performing key exchange"
+msgstr "Provádím výměnu klíčů"
 
-#: ../src/protocols/oscar/oscar.c:5007
-#, c-format
-msgid "You missed %hu message from %s for an unknown reason."
-msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] "Přišli jste o %hu zprávu od %s z neznámého důvodu."
-msgstr[1] "Přišli jste o %hu zprávy od %s z neznámého důvodu."
-msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Připojuji se k serveru SILC"
 
-#: ../src/protocols/oscar/oscar.c:5066
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Stav:</B> %s<HR>%s"
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Nemohu načíst pár klíčů SILC"
 
-#: ../src/protocols/oscar/oscar.c:5127
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC hodil chybu: %s\n"
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Nemohu vytvořit spojení"
 
-#. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nemohu odeslat zprávu: %s"
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
+msgid "Out of memory"
+msgstr "Nedostatek paměti"
 
-#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
-msgid "Unknown reason."
-msgstr "Neznámý důvod."
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
+msgid "Cannot initialize SILC protocol"
+msgstr "Nemohu inicializovat protokol SILC"
 
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "Nemohu odeslat zprávu k %s:"
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Chyba při načítání páru klíčů SILC"
 
-#: ../src/protocols/oscar/oscar.c:5227
-#, c-format
-msgid "User information not available: %s"
-msgstr "Informace o uživateli nejsou k dispozici: %s"
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
+msgid "Your Current Mood"
+msgstr "Vaše momentální nálada"
 
-#: ../src/protocols/oscar/oscar.c:5230
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Informace o uživateli %s nedostupné:"
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
+msgid "Normal"
+msgstr "Normální"
 
-#: ../src/protocols/oscar/oscar.c:5257
-msgid "Online Since"
-msgstr "Odpojen od"
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
+msgid "In love"
+msgstr "Zamilovaný"
 
-#: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
-msgid "Member Since"
-msgstr "Člen od"
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Vaše preferované metody kontaktu"
 
-#: ../src/protocols/oscar/oscar.c:5267
-msgid "Capabilities"
-msgstr "Schopnosti"
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
+msgid "SMS"
+msgstr "SMS"
 
-#: ../src/protocols/oscar/oscar.c:5285
-msgid "Available Message"
-msgstr "Zpráva o dostupnosti"
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
+msgid "MMS"
+msgstr "MMS"
 
-#: ../src/protocols/oscar/oscar.c:5402
-msgid "Your AIM connection may be lost."
-msgstr "Vaše spojení AIM může být přerušeno."
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
+msgid "Video conferencing"
+msgstr "Videokonference"
 
-#. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
-"znaky.]"
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
+msgid "Your Current Status"
+msgstr "Váš momentální stav"
 
-#: ../src/protocols/oscar/oscar.c:5809
-msgid "Rate limiting error."
-msgstr "Chyba omezení rychlosti."
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
+msgid "Online Services"
+msgstr "Služby online"
 
-#: ../src/protocols/oscar/oscar.c:5810
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
-"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to znovu."
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
+msgid "Let others see what services you are using"
+msgstr "Umožnit ostatním vidět, jaké služby používáte"
 
-#: ../src/protocols/oscar/oscar.c:5883
-msgid "You have been signed off for an unknown reason."
-msgstr "Byli jste odpojeni z neznámého důvodu."
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
+msgid "Let others see what computer you are using"
+msgstr "Umožnit ostatním vidět, jaký počítač používáte"
 
-#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "Byl jste odpojen z místnosti chatu %s."
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
+msgid "Your VCard File"
+msgstr "Váš soubor VCard"
 
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "Dokončuji spojení"
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Časové pásmo (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
+msgid "User Online Status Attributes"
+msgstr "Atributy stavu online uživatele"
 
-#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
-msgid "Mobile Phone"
-msgstr "Mobilní telefon"
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"Můžete umožnit ostatním uživatelům vidět informace o vašem stavu online a "
+"vaše osobní informace. Zadejte prosím informace, které chcete, aby o vás "
+"ostatní uživatelé viděli."
 
-#: ../src/protocols/oscar/oscar.c:6207
-msgid "Personal Web Page"
-msgstr "Osobní WWW stránka"
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
+msgid "Message of the Day"
+msgstr "Zpráva dne"
 
-#: ../src/protocols/oscar/oscar.c:6211
-msgid "Additional Information"
-msgstr "Přídavné informace"
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
+msgid "No Message of the Day available"
+msgstr "Zpráva dne není k dispozici"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Domácí adresa"
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
+msgid "There is no Message of the Day associated with this connection"
+msgstr "S tímto spojením není asociována zpráva dne"
 
-#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
-msgid "Zip Code"
-msgstr "PSČ"
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
+msgid "Create New SILC Key Pair"
+msgstr "Vytvořit nový pár klíčů SILC"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Pracovní adresa"
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
+msgid "Passphrases do not match"
+msgstr "Hesla nesouhlasí"
 
-#: ../src/protocols/oscar/oscar.c:6232
-msgid "Work Information"
-msgstr "Pracovní informace"
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
+msgid "Key Pair Generation failed"
+msgstr "Generování páru klíčů selhalo"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Společnost"
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
+msgid "Key length"
+msgstr "Délka klíče"
 
-#: ../src/protocols/oscar/oscar.c:6234
-msgid "Division"
-msgstr "Oddělení"
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
+msgid "Public key file"
+msgstr "Soubor veřejného klíče"
 
-#: ../src/protocols/oscar/oscar.c:6235
-msgid "Position"
-msgstr "Pozice"
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
+msgid "Private key file"
+msgstr "Soubor soukromého klíče"
 
-#: ../src/protocols/oscar/oscar.c:6237
-msgid "Web Page"
-msgstr "WWW stránka"
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
+msgid "Passphrase (retype)"
+msgstr "Heslo (znovu)"
 
-#: ../src/protocols/oscar/oscar.c:6295
-msgid "Pop-Up Message"
-msgstr "Vyskakovací zpráva"
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
+msgid "Generate Key Pair"
+msgstr "Generovat pár klíčů"
 
-#: ../src/protocols/oscar/oscar.c:6335
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Následující jméno uživatele je asociováno s %s"
-msgstr[1] "Následující jména uživatele jsou asociována s %s"
-msgstr[2] "Následující jména uživatele jsou asociována s %s"
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
+msgid "Online Status"
+msgstr "Stav připojení"
 
-#: ../src/protocols/oscar/oscar.c:6366
-#, c-format
-msgid "No results found for e-mail address %s"
-msgstr "Pro e-mailovou adresu %s nebyly nalezeny žádné výsledky"
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
+msgid "View Message of the Day"
+msgstr "Zobrazit zprávu dne"
 
-#: ../src/protocols/oscar/oscar.c:6387
-#, c-format
-msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Měli byste dostat e-mail žádající o potvrzení %s."
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
+msgid "Create SILC Key Pair..."
+msgstr "Vytvořit klíčů SILC..."
 
-#: ../src/protocols/oscar/oscar.c:6389
-msgid "Account Confirmation Requested"
-msgstr "Požadováno potvrzení účtu"
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "Uživatel <I>%s</I> není v síti přítomen"
 
-#: ../src/protocols/oscar/oscar.c:6420
-msgid "Error Changing Account Info"
-msgstr "Chyba při změně informací o účtu"
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
+msgid "Topic too long"
+msgstr "Téma příliš dlouhé"
 
-#: ../src/protocols/oscar/oscar.c:6423
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
-"uživatele se liší od původního."
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
+msgid "You must specify a nick"
+msgstr "Musíte zadat přezdívku"
 
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože není platné."
+msgid "channel %s not found"
+msgstr "kanál %s nenalezen"
 
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Chyba 0x%04x: Nemohu naformátovat jméno uživatele, protože požadované jméno "
-"uživatele je příliš dlouhé."
+msgid "channel modes for %s: %s"
+msgstr "režimy kanálu pro %s: %s"
 
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože pro toto jméno "
-"uživatele již existuje požadavek."
+msgid "no channel modes are set on %s"
+msgstr "na %s nejsou nastaveny žádné režimy kanálu"
 
-#: ../src/protocols/oscar/oscar.c:6435
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa má "
-"asociováno příliš mnoho jmen uživatelů."
+msgid "Failed to set cmodes for %s"
+msgstr "Nemohu nastavit režimy kanálu pro %s"
 
-#: ../src/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Chyba 0x%04x: Nemohu změnit e-mailovou adresu, protože zadaná adresa je "
-"neplatná."
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Neznámý příkaz: %s, (možná je to chyba v klientovi)"
 
-#: ../src/protocols/oscar/oscar.c:6441
-#, c-format
-msgid "Error 0x%04x: Unknown error."
-msgstr "Chyba 0x%04x: Neznámá chyba."
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
+msgid "part [channel]:  Leave the chat"
+msgstr "part [kanál]: Opustit chat"
 
-#: ../src/protocols/oscar/oscar.c:6451
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Vaše jméno uživatele je aktuálně formátováno následovně:\n"
-"%s"
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
+msgid "leave [channel]:  Leave the chat"
+msgstr "leave [kanál]: Opustit chat"
 
-#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
-msgid "Account Info"
-msgstr "Informace o účtu"
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;nové téma&gt;]: Zobrazit nebo změnit téma"
 
-#: ../src/protocols/oscar/oscar.c:6457
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "Emailová adresa pro %s je %s"
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "join &lt;kanál&gt; [&lt;heslo&gt;]: Připojit se k chatu na této síti"
 
-#: ../src/protocols/oscar/oscar.c:6535
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Váš IM Image nebyl odeslán. Pro odesílání IM Image musíte být připojen přímo."
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
+msgid "list:  List channels on this network"
+msgstr "list: Vypsat kanály v této síti"
 
-#: ../src/protocols/oscar/oscar.c:6775
-msgid "Unable to set AIM profile."
-msgstr "Nemohu nastavit profil AIM."
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
 
-#: ../src/protocols/oscar/oscar.c:6776
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"Pravděpodobně jste požádali o nastavení svého profilu před dokončením "
-"procedury přihlášení. Váš profil zůstává nenastaven; zkuste jej nastavit "
-"znovu, až budete úplně připojeni."
+"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat uživateli soukromou zprávu"
 
-#: ../src/protocols/oscar/oscar.c:6790
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Maximální délka profilu %d bajt byla překročena. Gaim jej pro vás zkrátil."
-msgstr[1] ""
-"Maximální délka profilu %d bajty byla překročena. Gaim jej pro vás zkrátil."
-msgstr[2] ""
-"Maximální délka profilu %d bajtů byla překročena. Gaim jej pro vás zkrátil."
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+"query &lt;přezdívka&gt; [&lt;zpráva&gt;]: Odeslat uživateli soukromou zprávu"
 
-#: ../src/protocols/oscar/oscar.c:6795
-msgid "Profile too long."
-msgstr "Profil příliš dlouhý"
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: Zobrazit zprávu dne tohoto serveru"
 
-#: ../src/protocols/oscar/oscar.c:6837
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] ""
-"Maximální délka zprávy o nepřítomnosti %d bajt byla překročena. Gaim ji "
-"zkrátil a nastavil vaši nepřítomnost."
-msgstr[1] ""
-"Maximální délka zprávy o nepřítomnosti %d bajty byla překročena. Gaim ji "
-"zkrátil a nastavil vaši nepřítomnost."
-msgstr[2] ""
-"Maximální délka zprávy o nepřítomnosti %d bajtů byla překročena. Gaim ji "
-"zkrátil a nastavil vaši nepřítomnost."
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
+msgid "detach:  Detach this session"
+msgstr "detach: Odpojit toto sezení"
 
-#: ../src/protocols/oscar/oscar.c:6842
-msgid "Away message too long."
-msgstr "Zpráva o nepřítomnosti příliš dlouhá."
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [zpráva]: Odpojit se od serveru s nepovinnou zprávou"
 
-#: ../src/protocols/oscar/oscar.c:6911
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr "Nemohu přidat kamaráda %s, protože jméno uživatele není platné. Jména uživatele musí buď začínat písmenem a obsahovat jen číslice, písmena a mezery, nebo musí obsahovat jen číslice."
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;příkaz&gt;: Zavolat libovolný příkaz klienta silc"
 
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
-msgid "Unable To Add"
-msgstr "Nemohu přidat"
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;přezdívka&gt; [-pubkey|&lt;důvod&gt;]: Zabít přezdívku"
 
-#: ../src/protocols/oscar/oscar.c:7020
-msgid "Unable To Retrieve Buddy List"
-msgstr "Nemohu získat seznam kamarádů"
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novápřezdívka&gt;: Změnit vaši přezdívku"
+
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
 
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim dočasně nemohl získat váš seznam kamarádů ze serverů AIM. Váš seznam "
-"kamarádů není ztracen a pravděpodobně bude k dispozici za několik hodin."
-
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
-msgid "Orphans"
-msgstr "Sirotci"
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanál&gt; [+|-&lt;režimy&gt]; [parametry]: Změnit nebo zobrazit "
+"režimy kanálu"
 
-#: ../src/protocols/oscar/oscar.c:7318
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
 msgstr ""
-"Nemohu přidat kamaráda %s, protože ve svém seznamu máte příliš mnoho "
-"kamarádů. Odstraňte prosím jednoho a zkuste to znovu."
+"cumode &lt;kanál&gt; +|-&lt;režimy&gt; &lt;přezdívka&gt;: Změnit režimy "
+"přezdívky v kanálu"
 
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
-msgid "(no name)"
-msgstr "(žádné jméno)"
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;uživatelskérežimy&gt;: Nastavit vaše režimy v síti"
 
-#: ../src/protocols/oscar/oscar.c:7332
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;přezdívka&gt; [-pubkey]: Získat privilegia operátora serveru"
+
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
 msgstr ""
-"Z neznámého důvodu nemohu přidat kamaráda %s. Nejčastější důvod je, že máte "
-"ve svém seznamu kamarádů maximální počet povolených kamarádů."
+"invite &lt;kanál&gt; [-|+]&lt;přezdíva&gt;: pozvat přezdívku nebo přidat/"
+"odstranit ze seznamu pozvaných do kanálu"
 
-#: ../src/protocols/oscar/oscar.c:7415
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"Uživatel %s vám povolil přidat jej do vašeho seznamu kamarádů. Chcete jej "
-"přidat?"
+"kick &lt;kanál&gt; &lt;přezdívk&gt; [poznámka]: Vykopnout klienta z kanálu"
 
-#: ../src/protocols/oscar/oscar.c:7421
-msgid "Authorization Given"
-msgstr "Autorizace udělena"
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
+msgid "info [server]:  View server administrative details"
+msgstr "info [server]: Zobrazit administrativní podrobnosti o serveru"
 
-#: ../src/protocols/oscar/oscar.c:7465
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"Uživatel %s chce přidat %s do svého seznamu kamarádů z následujícího důvodu:\n"
-"%s"
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;kanál&gt; +|-&lt;přezdívka&gt;]:  Zakázat klientovi kanál"
 
-#. Granted
-#: ../src/protocols/oscar/oscar.c:7510
-#, c-format
-msgid "The user %s has granted your request to add them to your buddy list."
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"Uživatel %s vyhověl vašemu požadavku přidat jej do vašeho seznamu kamarádů."
+"getkey &lt;přezdívka|server&gt;: Získat veřejný klíč klienta nebo serveru"
 
-#: ../src/protocols/oscar/oscar.c:7511
-msgid "Authorization Granted"
-msgstr "Autorizace udělena"
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
+msgid "stats:  View server and network statistics"
+msgstr "stats: Zobrazit statistku o serveru a síti"
 
-#. Denied
-#: ../src/protocols/oscar/oscar.c:7514
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
+msgid "ping:  Send PING to the connected server"
+msgstr "ping: Poslat PING připojenému serveru"
+
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;kanál&gt;: Vypsat uživatele v kanálu"
+
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
-"%s"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
 msgstr ""
-"Uživatel %s zamítl váš požadavek přidat jej do vašeho seznamu kamarádů z "
-"následujícího důvodu:\n"
-"%s"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanál(y)&gt;: Vypsat "
+"konkrétní uživatele v kanálech"
 
-#: ../src/protocols/oscar/oscar.c:7515
-msgid "Authorization Denied"
-msgstr "Autorizace zamítnuta"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
+msgid "SILC Protocol Plugin"
+msgstr "Zásuvný modul protokolu SILC"
 
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
-msgid "_Exchange:"
-msgstr "_Výměna:"
+#. *  description
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Protokol Secure Internet Live Conferencing (SILC)"
 
-#: ../src/protocols/oscar/oscar.c:7588
-msgid "Invalid chat name specified."
-msgstr "Zadán neplatný název chatu."
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
+msgid "Network"
+msgstr "Síť"
 
-#: ../src/protocols/oscar/oscar.c:7658
-msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Váš IM Image nebyl odeslán. Nemůžete odesílat IM Image v chatech AIM."
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
+msgid "Public Key file"
+msgstr "Soubor veřejného klíče"
 
-#: ../src/protocols/oscar/oscar.c:7813
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(stahuji)</i>"
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
+msgid "Private Key file"
+msgstr "Soubor soukromého klíče"
 
-#: ../src/protocols/oscar/oscar.c:8119
-#, c-format
-msgid "Buddy Comment for %s"
-msgstr "Poznámka o kamarádovi %s"
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
+msgid "Cipher"
+msgstr "Šifra"
 
-#: ../src/protocols/oscar/oscar.c:8120
-msgid "Buddy Comment:"
-msgstr "Poznámka o kamarádovi:"
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
+msgid "HMAC"
+msgstr "HMAC"
 
-#: ../src/protocols/oscar/oscar.c:8139
-msgid "Edit Buddy Comment"
-msgstr "Upravit poznámku o kamarádovi"
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
 
-#: ../src/protocols/oscar/oscar.c:8146
-msgid "Get Status Msg"
-msgstr "Získat zprávu o stavu"
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
+msgid "Public key authentication"
+msgstr "Autentizace veřejným klíčem"
 
-#: ../src/protocols/oscar/oscar.c:8159
-msgid "Direct IM"
-msgstr "Přímé IM"
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
+msgid "Block IMs without Key Exchange"
+msgstr "Blokovat IM bez výměny klíčů"
 
-#: ../src/protocols/oscar/oscar.c:8178
-msgid "Re-request Authorization"
-msgstr "Znovu požádat o autorizaci"
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
+msgid "Block messages to whiteboard"
+msgstr "Blokovat zprávy na tabuli"
 
-#: ../src/protocols/oscar/oscar.c:8235
-msgid "Require authorization"
-msgstr "Požadovat autorizaci"
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
+msgid "Automatically open whiteboard"
+msgstr "Automaticky otevírat tabuli"
 
-#: ../src/protocols/oscar/oscar.c:8238
-msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Ví o WWW (povolení tohoto způsobí, že budete dostávat SPAM!)"
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
+msgid "Digitally sign and verify all messages"
+msgstr "Digitálně podepisovat a ověřovat všechny zprávy"
 
-#: ../src/protocols/oscar/oscar.c:8243
-msgid "ICQ Privacy Options"
-msgstr "Možnosti soukromí ICQ"
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
+msgid "Creating SILC key pair..."
+msgstr "Vytvářím pár klíčů SILC..."
 
-#: ../src/protocols/oscar/oscar.c:8260
-msgid "The new formatting is invalid."
-msgstr "Nové formátování je neplatné."
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Nemohu vytvořit pár klíčů SILC\n"
 
-#: ../src/protocols/oscar/oscar.c:8261
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Formátování jména uživatele může změnit jen velikost písmen a mezery."
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "Skutečné jméno: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8268
-msgid "New screen name formatting:"
-msgstr "Nové formátování jména uživatele:"
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "Jméno uživatele: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8320
-msgid "Change Address To:"
-msgstr "Změnit adresu na:"
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "E-mail: \t\t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8365
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>nečekáte na autorizaci</i>"
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "Název počítače: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8368
-msgid "You are awaiting authorization from the following buddies"
-msgstr "Čekáte na autorizaci od následujících kamarádů:"
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "Organizace: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8369
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Můžete znovu požádat o autorizaci od těchto kamarádů kliknutím na ně pravým "
-"tlačítkem a zvolením \"Znovu požádat o autorizaci.\""
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "Země: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8386
-msgid "Find Buddy by E-Mail"
-msgstr "Hledat kamaráda podle e-mailu"
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "Algoritmus: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8387
-msgid "Search for a buddy by e-mail address"
-msgstr "Hledat kamaráda podle e-mailové adresy"
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Délka klíče: \t%d bitů\n"
 
-#: ../src/protocols/oscar/oscar.c:8388
-msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Zadejte e-mailovou adresu kamaráda, kterého hledáte."
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Verze: \t%s\n"
 
-#: ../src/protocols/oscar/oscar.c:8481
-msgid "Set User Info (URL)..."
-msgstr "Nastavit informace o uživateli (URL)..."
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Otisk veřejného klíče:\n"
+"%s\n"
+"\n"
 
-#: ../src/protocols/oscar/oscar.c:8492
-msgid "Change Password (URL)"
-msgstr "Změnit heslo (URL)"
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"Babbleprint veřejného klíče:\n"
+"%s"
 
-#: ../src/protocols/oscar/oscar.c:8496
-msgid "Configure IM Forwarding (URL)"
-msgstr "Nastavit předávání IM (URL)"
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
+msgid "Public Key Information"
+msgstr "Informace o veřejném klíči"
 
-#. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8506
-msgid "Set Privacy Options..."
-msgstr "Nastavit možnosti soukromí..."
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
+msgid "Paging"
+msgstr "Pager"
 
-#. AIM actions
-#: ../src/protocols/oscar/oscar.c:8513
-msgid "Format Screen Name..."
-msgstr "Formátovat jméno uživatele..."
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
+msgid "Video Conferencing"
+msgstr "Videokonference"
 
-#: ../src/protocols/oscar/oscar.c:8517
-msgid "Confirm Account"
-msgstr "Potvrdit účet"
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
+msgid "Computer"
+msgstr "Počítač"
 
-#: ../src/protocols/oscar/oscar.c:8521
-msgid "Display Currently Registered Address"
-msgstr "Zobrazit aktuální registrovanou adresu"
-
-#: ../src/protocols/oscar/oscar.c:8525
-msgid "Change Currently Registered Address..."
-msgstr "Změnit aktuální registrovanou adresu..."
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
+msgid "PDA"
+msgstr "PDA"
 
-#: ../src/protocols/oscar/oscar.c:8532
-msgid "Show Buddies Awaiting Authorization"
-msgstr "Zobrazit kamarády čekající na autorizaci"
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
+msgid "Terminal"
+msgstr "Terminál"
 
-#: ../src/protocols/oscar/oscar.c:8538
-msgid "Search for Buddy by E-Mail..."
-msgstr "Hledat kamaráda podle e-mailu..."
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "%s odeslal zprávu na tabuli. Chcete otevřít tabuli?"
 
-#: ../src/protocols/oscar/oscar.c:8543
-msgid "Search for Buddy by Information"
-msgstr "Hledat kamaráda podle informací"
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr "%s odeslal zprávu na tabuli na kanálu %s. Chcete otevřít tabuli?"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "Zásuvný modul protokolu AIM/ICQ"
-
-#: ../src/protocols/oscar/oscar.c:8742
-msgid "Auth host"
-msgstr "Počítač autentizace"
-
-#: ../src/protocols/oscar/oscar.c:8745
-msgid "Auth port"
-msgstr "Port autentizace"
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+msgid "Whiteboard"
+msgstr "Tabule"
 
-#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
-msgid "Encoding"
-msgstr "Kódování"
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Statistika o serveru není k dispozici"
 
-#: ../src/protocols/oscar/oscar.c:8752
-msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
-msgstr ""
-"Používat proxy server AIM/ICQ\n"
-"(pomalejší, ale obvykle funguje)"
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
 
-#: ../src/protocols/sametime/sametime.c:415
-msgid "Connection closed (writing)"
-msgstr "Spojení uzavřeno (zápis)"
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Chyba: Vzdálený nevěří/nepodporuje váš veřejný klíč"
 
-#: ../src/protocols/sametime/sametime.c:1267
-#, c-format
-msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Název skupiny:</b> %s<br>"
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Chyba: Vzdálený nepodporuje navrženou skupinu KE"
 
-#: ../src/protocols/sametime/sametime.c:1268
-#, c-format
-msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>ID skupiny v Notes:</b> %s<br>"
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Chyba: Vzdálený nepodporuje navrženou šifru"
 
-#: ../src/protocols/sametime/sametime.c:1270
-#, c-format
-msgid "Info for Group %s"
-msgstr "Informace o skupině %s"
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Chyba: Vzdálený nepodporuje navržený PKCS"
 
-#: ../src/protocols/sametime/sametime.c:1272
-msgid "Notes Address Book Information"
-msgstr "Informace adresáře Notes"
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Chyba: Vzdálený nepodporuje navrženou hašovací funkci"
 
-#: ../src/protocols/sametime/sametime.c:1304
-msgid "Invite Group to Conference..."
-msgstr "Pozvat skupinu ke konferenci..."
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Chyba: Vzdálený nepodporuje navržený HMAC"
 
-#: ../src/protocols/sametime/sametime.c:1314
-msgid "Get Notes Address Book Info"
-msgstr "Získat informace adresáře Notes"
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Chyba: Nesprávný podpis"
 
-#: ../src/protocols/sametime/sametime.c:1467
-msgid "Sending Handshake"
-msgstr "Odesílám pozdrav"
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Chyba: Neplatný cookie"
 
-#: ../src/protocols/sametime/sametime.c:1472
-msgid "Waiting for Handshake Acknowledgement"
-msgstr "Čekám na potvrzení pozdravu"
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Chyba: Autentizace selhala"
 
-#: ../src/protocols/sametime/sametime.c:1477
-msgid "Handshake Acknowledged, Sending Login"
-msgstr "Pozdrav potvrzen, odesílám přihlášení"
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Nemohu inicializovat připojení klienta SILC"
 
-#: ../src/protocols/sametime/sametime.c:1482
-msgid "Waiting for Login Acknowledgement"
-msgstr "Čekám na potvrzení přihlášení"
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Jan Anonym"
 
-#: ../src/protocols/sametime/sametime.c:1487
-msgid "Login Redirected"
-msgstr "Přihlášení přesměrováno"
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Nemohu najít/přistupovat k adresáři ~/.silc"
 
-#: ../src/protocols/sametime/sametime.c:1493
-msgid "Forcing Login"
-msgstr "Vynucuji přihlášení"
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Nemohu načíst pár klíčů SILC: %s"
 
-#: ../src/protocols/sametime/sametime.c:1497
-msgid "Login Acknowledged"
-msgstr "Přihlášení potvrzeno"
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../libpurple/protocols/simple/simple.c:416
+msgid "Could not write"
+msgstr "Nemohu zapisovat"
 
-#: ../src/protocols/sametime/sametime.c:1502
-msgid "Starting Services"
-msgstr "Spouštím služby"
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1490
+msgid "Could not connect"
+msgstr "Nemohu se připojit"
 
-#: ../src/protocols/sametime/sametime.c:1507
-msgid "Connected"
-msgstr "Připojen"
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
+msgid "Could not create listen socket"
+msgstr "Nemohu vytvořit socket pro poslouchání"
 
-#: ../src/protocols/sametime/sametime.c:1605
-#, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr "Správce Sametime vydal na serveru %s následující oznámení"
+#: ../libpurple/protocols/simple/simple.c:1547
+msgid "Couldn't resolve host"
+msgstr "Nemohu najít počítač"
 
-#: ../src/protocols/sametime/sametime.c:1610
-msgid "Sametime Administrator Announcement"
-msgstr "Oznámení správce Sametime"
+#: ../libpurple/protocols/simple/simple.c:1638
+msgid "Could not resolve hostname"
+msgstr "Nemohu přeložit název počítače"
 
-#: ../src/protocols/sametime/sametime.c:1662
-msgid "Connection reset"
-msgstr "Spojení přerušeno"
+#: ../libpurple/protocols/simple/simple.c:1655
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
 
-#: ../src/protocols/sametime/sametime.c:1669
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Chyba při čtení ze socketu: %s"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../libpurple/protocols/simple/simple.c:1830
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Zásuvný modul protokolu SIP/SIMPLE"
 
-#. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
-msgid "Unable to connect to host"
-msgstr "Nemohu se připojit k počítači"
+#. *  summary
+#: ../libpurple/protocols/simple/simple.c:1831
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Zásuvný modul protokolu SIP/SIMPLE"
 
-#: ../src/protocols/sametime/sametime.c:1736
-#, c-format
-msgid "Announcement from %s"
-msgstr "Oznámení od %s"
+#: ../libpurple/protocols/simple/simple.c:1859
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Zveřejnit stav (upozornění: všichni vás mohou sledovat)"
 
-#: ../src/protocols/sametime/sametime.c:1910
-msgid "Conference Closed"
-msgstr "Konference uzavřena"
+#: ../libpurple/protocols/simple/simple.c:1865
+msgid "Use UDP"
+msgstr "Používat UDP"
 
-#: ../src/protocols/sametime/sametime.c:2367
-msgid "Unable to send message: "
-msgstr "Nemohu odeslat zprávu: "
+#: ../libpurple/protocols/simple/simple.c:1867
+msgid "Use proxy"
+msgstr "Používat proxy"
 
-#: ../src/protocols/sametime/sametime.c:2926
-msgid "Place Closed"
-msgstr "Místo uzavřeno"
+#: ../libpurple/protocols/simple/simple.c:1869
+msgid "Proxy"
+msgstr "Proxy"
 
-#: ../src/protocols/sametime/sametime.c:3217
-msgid "Microphone"
-msgstr "Mikrofon"
+#: ../libpurple/protocols/simple/simple.c:1871
+msgid "Auth User"
+msgstr "Uživatel pro autentizaci"
 
-#: ../src/protocols/sametime/sametime.c:3218
-msgid "Speakers"
-msgstr "Reproduktory"
+#: ../libpurple/protocols/simple/simple.c:1873
+msgid "Auth Domain"
+msgstr "Doména autentizace"
 
-#: ../src/protocols/sametime/sametime.c:3219
-msgid "Video Camera"
-msgstr "Videokamera"
+#: ../libpurple/protocols/toc/toc.c:139
+#, c-format
+msgid "Looking up %s"
+msgstr "Vyhledávám %s"
 
-#: ../src/protocols/sametime/sametime.c:3223
-msgid "File Transfer"
-msgstr "Přenos souborů"
+#: ../libpurple/protocols/toc/toc.c:148
+#, c-format
+msgid "Connect to %s failed"
+msgstr "Spojení k %s selhalo"
 
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
-msgid ""
-"\n"
-"<b>Supports:</b> %s"
-msgstr "\n<b>Podporuje:</b> %s"
+msgid "Signon: %s"
+msgstr "Přihlásit: %s"
 
-#: ../src/protocols/sametime/sametime.c:3262
-msgid ""
-"\n"
-"<b>External User</b>"
-msgstr "\n<b>Externí uživatel</b>"
+#: ../libpurple/protocols/toc/toc.c:488
+#, c-format
+msgid "Unable to write file %s."
+msgstr "Nemohu zapsat soubor %s."
 
-#: ../src/protocols/sametime/sametime.c:3368
-msgid "Create conference with user"
-msgstr "Vytvořit konferenci s uživatelem"
+#: ../libpurple/protocols/toc/toc.c:491
+#, c-format
+msgid "Unable to read file %s."
+msgstr "Nemohu číst soubor %s."
 
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr "Zadejte prosím téma nové konference a zvací zprávu, kterou poslat %s"
+msgid "Message too long, last %s bytes truncated."
+msgstr "Zpráva příliš dlouhá, posledních %s bajtů useknuto."
 
-#: ../src/protocols/sametime/sametime.c:3373
-msgid "New Conference"
-msgstr "Nová konference"
+#: ../libpurple/protocols/toc/toc.c:497
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s není momentálně přihlášen."
 
-#: ../src/protocols/sametime/sametime.c:3375
-msgid "Create"
-msgstr "Vytvořit"
+#: ../libpurple/protocols/toc/toc.c:500
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "Varování %s není povoleno."
 
-#: ../src/protocols/sametime/sametime.c:3439
-msgid "Available Conferences"
-msgstr "Dostupné konference"
+#: ../libpurple/protocols/toc/toc.c:503
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
 
-#: ../src/protocols/sametime/sametime.c:3445
-msgid "Create New Conference..."
-msgstr "Vytvořit novou konferenci..."
+#: ../libpurple/protocols/toc/toc.c:506
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "Chat v %s není dostupný."
 
-#: ../src/protocols/sametime/sametime.c:3452
-msgid "Invite user to a conference"
-msgstr "Pozvat uživatele ke konferenci"
+#: ../libpurple/protocols/toc/toc.c:509
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "Odesíláte zprávy pro %s příliš rychle."
 
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr "Odešlete pozvánku uživateli %s zvolením konference ze seznamu níže. Zvolte \"Vytvořit novou konferenci\", pokud chcete vytvořit novou konferenci, do které pozvat tohoto uživatele."
+msgid "You missed an IM from %s because it was too big."
+msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
 
-#: ../src/protocols/sametime/sametime.c:3458
-msgid "Invite to Conference"
-msgstr "Pozvat ke konferenci"
+#: ../libpurple/protocols/toc/toc.c:515
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
 
-#: ../src/protocols/sametime/sametime.c:3460
-msgid "Invite"
-msgstr "Pozvat"
+#: ../libpurple/protocols/toc/toc.c:518
+msgid "Failure."
+msgstr "Selhání."
 
-#: ../src/protocols/sametime/sametime.c:3548
-msgid "Invite to Conference..."
-msgstr "Pozvat ke konferenci..."
+#: ../libpurple/protocols/toc/toc.c:521
+msgid "Too many matches."
+msgstr "Příliš mnoho odpovědí."
 
-#: ../src/protocols/sametime/sametime.c:3553
-msgid "Send TEST Announcement"
-msgstr "Odeslat testovací oznámení"
+#: ../libpurple/protocols/toc/toc.c:524
+msgid "Need more qualifiers."
+msgstr "Potřebuji více kvalifikátorů."
 
-#: ../src/protocols/sametime/sametime.c:3600
-msgid "No Sametime Community Server specified"
-msgstr "Nezadán server komunity Sametime"
+#: ../libpurple/protocols/toc/toc.c:527
+msgid "Dir service temporarily unavailable."
+msgstr "Adresářová služba momentálně není k dispozici."
 
-#: ../src/protocols/sametime/sametime.c:3622
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr "Pro účet Meanwhile %s nebyl nastaven počítač ani IP adresa. Pro pokračování v přihlašování jej prosím zadejte níže."
+#: ../libpurple/protocols/toc/toc.c:530
+msgid "E-mail lookup restricted."
+msgstr "Vyhledávání podle e-mailu omezeno."
 
-#: ../src/protocols/sametime/sametime.c:3627
-msgid "Meanwhile Connection Setup"
-msgstr "Nastavení spojení Meanwhile"
+#: ../libpurple/protocols/toc/toc.c:533
+msgid "Keyword ignored."
+msgstr "Klíčové slovo ignorováno."
 
-#: ../src/protocols/sametime/sametime.c:3628
-msgid "No Sametime Community Server Specified"
-msgstr "Nezadán server komunity Sametime"
+#: ../libpurple/protocols/toc/toc.c:536
+msgid "No keywords."
+msgstr "Žádné klíčové slovo."
 
-#: ../src/protocols/sametime/sametime.c:4085
-msgid "<b>External User</b><br>"
-msgstr "<b>Externí uživatel</b><br>"
+#: ../libpurple/protocols/toc/toc.c:539
+msgid "User has no directory information."
+msgstr "Uživatel nemá žádné informace v adresáři."
 
-#: ../src/protocols/sametime/sametime.c:4088
-#, c-format
-msgid "<b>User ID:</b> %s<br>"
-msgstr "<b>ID Uživatele:</b> %s<br>"
+#: ../libpurple/protocols/toc/toc.c:543
+msgid "Country not supported."
+msgstr "Země není podporována."
 
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
-msgid "<b>Full Name:</b> %s<br>"
-msgstr "<b>Celé jméno:</b> %s<br>"
-
-#: ../src/protocols/sametime/sametime.c:4100
-msgid "<b>Last Known Client:</b> "
-msgstr "<b>Poslední známý klient:</b> "
+msgid "Failure unknown: %s."
+msgstr "Neznámé selhání: %s."
 
-#: ../src/protocols/sametime/sametime.c:4108
-#, c-format
-msgid "Unknown (0x%04x)<br>"
-msgstr "Neznámé (0x%04x)<br>"
+#: ../libpurple/protocols/toc/toc.c:549
+msgid "Incorrect screen name or password."
+msgstr "Nesprávné jméno uživatele nebo heslo."
 
-#: ../src/protocols/sametime/sametime.c:4115
-#, c-format
-msgid "<b>Supports:</b> %s<br>"
-msgstr "<b>Podporuje:</b> %s<br>"
+#: ../libpurple/protocols/toc/toc.c:552
+msgid "The service is temporarily unavailable."
+msgstr "Služba je dočasně nedostupná."
 
-#: ../src/protocols/sametime/sametime.c:4121
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>Stav</b>: %s"
-
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
-msgid "User Name"
-msgstr "Jméno uživatele"
+#: ../libpurple/protocols/toc/toc.c:555
+msgid "Your warning level is currently too high to log in."
+msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
 
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
-msgid "Sametime ID"
-msgstr "ID Sametime"
+#: ../libpurple/protocols/toc/toc.c:558
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
+"to znovu. Pokud to budete dále zkoušet, budete muset čekat ještě déle."
 
-#: ../src/protocols/sametime/sametime.c:4291
-msgid "An ambiguous user ID was entered"
-msgstr "Bylo zadáno nejednoznačné ID uživatele"
+#: ../libpurple/protocols/toc/toc.c:560
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "Došlo k neznámé chybě při přihlašování: %s."
 
-#: ../src/protocols/sametime/sametime.c:4292
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr "Identifikátor '%s' se může odkazovat na libovolného z následujících uživatelů. Uživatele prosím přidejte do vašeho seznamu kamarádů zvolením správného uživatele ze seznamu níže."
+msgid "An unknown error, %d, has occurred.  Info: %s"
+msgstr "Došlo k neznámé chybě, %d. Informace: %s"
 
-#: ../src/protocols/sametime/sametime.c:4297
-msgid "Select User"
-msgstr "Vyberte uživatele"
+#: ../libpurple/protocols/toc/toc.c:590
+msgid "Invalid Groupname"
+msgstr "Neplatný název skupiny"
 
-#: ../src/protocols/sametime/sametime.c:4367
-msgid "Unable to add user: user not found"
-msgstr "Nemohu přidat uživatele: uživatel nenalezen"
+#: ../libpurple/protocols/toc/toc.c:674
+msgid "Connection Closed"
+msgstr "Spojení uzavřeno"
 
-#: ../src/protocols/sametime/sametime.c:4369
-#, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr "Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime. Tato položka byla odstraněna z vašeho seznamu kamarádů."
+#: ../libpurple/protocols/toc/toc.c:714
+msgid "Waiting for reply..."
+msgstr "Čekám na odpověď..."
 
-#: ../src/protocols/sametime/sametime.c:4374
-msgid "Unable to add user"
-msgstr "Nemohu přidat uživatele"
+#: ../libpurple/protocols/toc/toc.c:792
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr "TOC se vrátil z přestávky. Nyní můžete zase odesílat zprávy."
 
-#: ../src/protocols/sametime/sametime.c:4946
-#, c-format
-msgid ""
-"Error reading file %s: \n"
-"%s\n"
-msgstr ""
-"Chyba při čtení souboru %s: \n"
-"%s\n"
+#: ../libpurple/protocols/toc/toc.c:995
+msgid "Password Change Successful"
+msgstr "Změna hesla úspěšná"
 
-#: ../src/protocols/sametime/sametime.c:5077
-msgid "Remotely Stored Buddy List"
-msgstr "Vzdáleně uložený seznam kamarádů"
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
+msgid "_Group:"
+msgstr "_Skupina:"
 
-#: ../src/protocols/sametime/sametime.c:5082
-msgid "Buddy List Storage Mode"
-msgstr "Režim ukládání seznamu kamarádů"
+#: ../libpurple/protocols/toc/toc.c:1535
+msgid "Get Dir Info"
+msgstr "Získat informace adresáře"
 
-#: ../src/protocols/sametime/sametime.c:5085
-msgid "Local Buddy List Only"
-msgstr "Jen místní seznam kamarádů"
+#: ../libpurple/protocols/toc/toc.c:1675
+msgid "Set Dir Info"
+msgstr "Nastavit informace adresáře"
 
-#: ../src/protocols/sametime/sametime.c:5087
-msgid "Merge List from Server"
-msgstr "Sloučit seznam kamarádů ze serveru"
+#: ../libpurple/protocols/toc/toc.c:1797
+#, c-format
+msgid "Could not open %s for writing!"
+msgstr "Nemohu otevřít %s pro zápis!"
 
-#: ../src/protocols/sametime/sametime.c:5089
-msgid "Merge and Save List to Server"
-msgstr "Sloučit a uložit seznam na server"
+#: ../libpurple/protocols/toc/toc.c:1833
+msgid "File transfer failed; other side probably canceled."
+msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
 
-#: ../src/protocols/sametime/sametime.c:5091
-msgid "Synchronize List with Server"
-msgstr "Synchronizovat seznam se serverem"
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+msgid "Could not connect for transfer."
+msgstr "Nemohu se připojit pro přenos."
+
+#: ../libpurple/protocols/toc/toc.c:2075
+msgid "Could not write file header.  The file will not be transferred."
+msgstr "Nemohu zapsat hlavičku souboru. Soubor nebude přenesen."
+
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Uložit jako..."
 
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
-msgid "Import Sametime List for Account %s"
-msgstr "Importovat seznam Sametime pro účet %s"
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr[0] "%s požaduje, aby %s přijal %d soubor: %s (%.2f %s)%s%s"
+msgstr[1] "%s požaduje, aby %s přijal %d soubory: %s (%.2f %s)%s%s"
+msgstr[2] "%s požaduje, aby %s přijal %d souborů: %s (%.2f %s)%s%s"
 
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
-msgid "Export Sametime List for Account %s"
-msgstr "Exportovat seznam Sametime pro účet %s"
+msgid "%s requests you to send them a file"
+msgstr "%s vás žádá, abyste jim poslali soubor"
 
-#: ../src/protocols/sametime/sametime.c:5232
-msgid "Unable to add group: group exists"
-msgstr "Nemohu přidat skupinu: skupina existuje"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+msgid "TOC Protocol Plugin"
+msgstr "Zásuvný modul protokolu TOC"
 
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
-msgid "A group named '%s' already exists in your buddy list."
-msgstr "Skupina nazvaná '%s' již ve vašem seznamu kamarádů existuje."
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vám poslal pozvánku k WWW kameře, což ještě není podporováno."
 
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
-msgid "Unable to add group"
-msgstr "Nemohu přidat skupinu"
+#: ../libpurple/protocols/yahoo/yahoo.c:838
+msgid "Your Yahoo! message did not get sent."
+msgstr "Vaše zpráva Yahoo! nebyla odeslána."
 
-#: ../src/protocols/sametime/sametime.c:5295
-msgid "Possible Matches"
-msgstr "Možné výskyty"
+#: ../libpurple/protocols/yahoo/yahoo.c:915
+#, fuzzy, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s vám právě poslal šťouchnutí!"
 
-#: ../src/protocols/sametime/sametime.c:5311
-msgid "Notes Address Book group results"
-msgstr "Výsledky skupiny v adresáři Notes"
+#: ../libpurple/protocols/yahoo/yahoo.c:962
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Zpráva systému Yahoo! pro %s:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+msgid "Authorization denied message:"
+msgstr "Zpráva o odmítnutí autorizace:"
 
-#: ../src/protocols/sametime/sametime.c:5312
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr "Identifikátor '%s' se může odkazovat na libovolnou z následujících skupin adresáře Notes. Skupinu prosím přidejte do vašeho seznamu kamarádů správné skupiny ze seznamu níže."
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s (zpětně) zamítl váš požadavek přidat jej do vašeho seznamu kontaktů z "
+"následujícího důvodu: %s."
 
-#: ../src/protocols/sametime/sametime.c:5317
-msgid "Select Notes Address Book"
-msgstr "Zvolte adresář Notes"
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s (zpětně) odmítl váš požadavek přidat jej do vašeho seznamu kontaktů."
 
-#: ../src/protocols/sametime/sametime.c:5359
-msgid "Unable to add group: group not found"
-msgstr "Nemohu přidat skupinu: skupina nenalezena"
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
+msgid "Add buddy rejected"
+msgstr "Přidání kamaráda zamítnuto"
 
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr "Identifikátor '%s' neodpovídá žádné skupině adresáře Notes ve vaší komunitě Sametime."
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr "Server Yahoo požádal o použití neznámé metody autentizace. Pravděpodobně se nebudete moci úspěšně přihlásit k Yahoo. Hledejte aktualizace na %s."
 
-#: ../src/protocols/sametime/sametime.c:5402
-msgid "Notes Address Book Group"
-msgstr "Skupina adresáře Notes"
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
+msgid "Failed Yahoo! Authentication"
+msgstr "Selhala autentizace Yahoo!"
 
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#, c-format
 msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr "Skupinu a její členy přidáte do vašeho seznamu kamarádů zadáním názvu skupiny adresáře Notes do pole níže."
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Pokusili jste se ignorovat %s, ale tento uživatel je na vašem seznamu "
+"kamarádů.  Kliknutím na \"Ano\" kamaráda odstraníte a budete ignorovat."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
+msgid "Ignore buddy?"
+msgstr "Ignorovat kamaráda?"
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "Váš účet je uzamčen, přihlaste se prosím na WWW stránkách Yahoo!."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
-msgid "Search results for '%s'"
-msgstr "Výsledky hledání '%s'"
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "Neznámá chyba číslo %d. Přihlášení se na WWW Yahoo! to možná opraví."
 
-#: ../src/protocols/sametime/sametime.c:5452
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr "Identifikátor '%s' se může odkazovat na libovolného z následujících uživatelů. Tyto uživatele můžete přidat do vašeho seznamu kamarádů nebo jim odeslat zprávy tlačítky níže."
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr "Nemohu přidat kamaráda %s do skupiny %s do seznamu serveru na účtu %s."
 
-#: ../src/protocols/sametime/sametime.c:5484
-msgid "No matches"
-msgstr "Žádné shody"
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
+msgid "Could not add buddy to server list"
+msgstr "Nemohu přidat kamaráda do seznamu na serveru"
 
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "Identifikátor '%s' neodpovídá žádnému uživateli ve vaší komunitě Sametime."
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Slyšitelné %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/sametime/sametime.c:5489
-msgid "No Matches"
-msgstr "Žádné shody"
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
+msgid "Received unexpected HTTP response from server."
+msgstr "Přijata neočekávaná odpověď HTTP od serveru."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/ycht.c:585
+msgid "Connection problem"
+msgstr "Problém se spojením"
 
-#: ../src/protocols/sametime/sametime.c:5526
-msgid "Search for a user"
-msgstr "Hledat uživatele"
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Ztraceno spojení s %s:\n"
+"%s"
 
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
+#, c-format
 msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr "Odpovídající uživatele ve vaší komunitě Sametime hledejte zadáním jména nebo částečného ID do pole níže."
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Nemohu navázat spojení s %s:\n"
+"%s"
 
-#: ../src/protocols/sametime/sametime.c:5530
-msgid "User Search"
-msgstr "Hledání uživatele"
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
+msgid "Not at Home"
+msgstr "Nejsem doma"
 
-#: ../src/protocols/sametime/sametime.c:5542
-msgid "Import Sametime List..."
-msgstr "Importovat seznam Sametime..."
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
+msgid "Not at Desk"
+msgstr "Nejsem u stolu"
 
-#: ../src/protocols/sametime/sametime.c:5546
-msgid "Export Sametime List..."
-msgstr "Exportovat seznam Sametime..."
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
+msgid "Not in Office"
+msgstr "Nejsem v kanceláři"
 
-#: ../src/protocols/sametime/sametime.c:5550
-msgid "Add Notes Address Book Group..."
-msgstr "Přidat skupinu adresáře Notes..."
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
+msgid "On Vacation"
+msgstr "Na dovolené"
 
-#: ../src/protocols/sametime/sametime.c:5554
-msgid "User Search..."
-msgstr "Hledání uživatele..."
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
+msgid "Stepped Out"
+msgstr "Šel jsem ven"
 
-#: ../src/protocols/sametime/sametime.c:5651
-msgid "Force login (ignore server redirects)"
-msgstr "Vnutit přihlášení (ignorovat přesměrování serveru)"
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
+msgid "Not on server list"
+msgstr "Není na seznamu serveru"
 
-#. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
-msgid "Hide client identity"
-msgstr "Skrýt identitu klienta"
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+msgid "Appear Online"
+msgstr "Vypadat připojen"
 
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
-#, c-format
-msgid "User %s is not present in the network"
-msgstr "Uživatel %s není v síti přítomen"
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
+msgid "Appear Permanently Offline"
+msgstr "Vypadat vždy odpojen"
 
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
-msgid "Key Agreement"
-msgstr "Výměna klíčů"
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
+msgid "Presence"
+msgstr "Přítomnost"
 
-#: ../src/protocols/silc/buddy.c:54
-msgid "Cannot perform the key agreement"
-msgstr "Nemohu provést výměnu klíčů"
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
+msgid "Appear Offline"
+msgstr "Vypadat odpojen"
 
-#: ../src/protocols/silc/buddy.c:116
-msgid "Error occurred during key agreement"
-msgstr "Při výměně klíčů došlo k chybě"
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
+msgid "Don't Appear Permanently Offline"
+msgstr "Nevypadat vždy odpojen"
 
-#: ../src/protocols/silc/buddy.c:120
-msgid "Key Agreement failed"
-msgstr "Výměna klíčů selhala"
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
+msgid "Join in Chat"
+msgstr "Připojit se k chatu"
 
-#: ../src/protocols/silc/buddy.c:125
-msgid "Timeout during key agreement"
-msgstr "Čas vypršel při výměně klíčů"
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
+msgid "Initiate Conference"
+msgstr "Začít konferenci"
 
-#: ../src/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Výměna klíčů byla přerušena"
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
+msgid "Presence Settings"
+msgstr "Nastavení přítomnosti"
 
-#: ../src/protocols/silc/buddy.c:135
-msgid "Key agreement is already started"
-msgstr "Výměna klíčů již byla spuštěna"
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
+msgid "Start Doodling"
+msgstr "Začít kreslit"
 
-#: ../src/protocols/silc/buddy.c:140
-msgid "Key agreement cannot be started with yourself"
-msgstr "Výměnu klíčů nemůžete spustit sami se sebou"
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+msgid "Activate which ID?"
+msgstr "Které ID aktivovat?"
 
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
-msgid "The remote user is not present in the network any more"
-msgstr "Vzdálený uživatel již není v síti přítomen"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join whom in chat?"
+msgstr "Připojit koho k chatu?"
 
-#: ../src/protocols/silc/buddy.c:294
-#, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Byl přijat požadavek na výměnu klíčů od %s. Chcete provést výměnu klíčů?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
+msgid "Activate ID..."
+msgstr "Aktivovat ID..."
 
-#: ../src/protocols/silc/buddy.c:298
-#, c-format
-msgid ""
-"The remote user is waiting key agreement on:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"Vzdálený uživatel čeká na výměnu klíčů na:\n"
-"Vzdálený počítač: %s\n"
-"Vzdálený port: %d"
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Join User in Chat..."
+msgstr "Připojit se k uživateli v chatu..."
 
-#: ../src/protocols/silc/buddy.c:311
-msgid "Key Agreement Request"
-msgstr "Požadavek na výměnu klíčů"
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
+msgid "Open Inbox"
+msgstr "Otevřít Příchozí poštu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#, fuzzy
+msgid "You have just sent a Buzz!"
+msgstr "Právě jste odeslali šťouchnutí!"
 
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
-msgid "IM With Password"
-msgstr "IM s heslem"
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, fuzzy
+msgid "buzz"
+msgstr "Crr!!"
 
-#: ../src/protocols/silc/buddy.c:423
-msgid "Cannot set IM key"
-msgstr "Nemohu nastavit klíč IM"
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr ""
 
-#: ../src/protocols/silc/buddy.c:465
-msgid "Set IM Password"
-msgstr "Nastavit heslo IM"
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+#, fuzzy
+msgid "Buzzing"
+msgstr "Crr!!"
 
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
-msgid "Get Public Key"
-msgstr "Získat veřejný klíč"
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
 
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
-msgid "Cannot fetch the public key"
-msgstr "Nemohu získat veřejný klíč"
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypsat místnosti v síti Yahoo"
 
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
-msgid "Show Public Key"
-msgstr "Zobrazit veřejný klíč"
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Získat pozornost uživatele zabzučením"
 
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
-msgid "Could not load public key"
-msgstr "Nemohu načíst veřejný klíč"
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
 
-#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
-msgid "User Information"
-msgstr "Informace o uživateli"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
+msgid "Yahoo Protocol Plugin"
+msgstr "Zásuvný modul protokolu Yahoo"
 
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
-msgid "Cannot get user information"
-msgstr "Nemohu získat informace o uživateli"
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
+msgid "Yahoo Japan"
+msgstr "Yahoo Japonsko"
 
-#: ../src/protocols/silc/buddy.c:734
-#, c-format
-msgid "The %s buddy is not trusted"
-msgstr "Kamarádovi %s se nedůvěřuje"
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
+msgid "Pager server"
+msgstr "Server pageru"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
+msgid "Japan Pager server"
+msgstr "Server pageru v Japonsku"
 
-#: ../src/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"Nemůžete dostávat upozornění o kamarádovi, dokud neimportujete jeho/její "
-"veřejný klíč. Veřejný klíč můžete získat pomocí příkazu Získat veřejný klíč."
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
+msgid "Pager port"
+msgstr "Port pageru"
 
-#. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
-msgid "Open..."
-msgstr "Otevřít..."
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
+msgid "File transfer server"
+msgstr "Server přenosu souborů"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
+msgid "Japan file transfer server"
+msgstr "Server přenosu souborů v Japonsku"
 
-#: ../src/protocols/silc/buddy.c:1073
-#, c-format
-msgid "The %s buddy is not present in the network"
-msgstr "Kamarád %s není v síti přítomen"
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
+msgid "File transfer port"
+msgstr "Port přenosu souborů"
 
-#: ../src/protocols/silc/buddy.c:1076
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Pro přidání kamaráda musíte importovat jeho/její veřejný klíč. Veřejný klíč "
-"importujete stisknutím Importovat."
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
+msgid "Chat room locale"
+msgstr "Locale místnosti chatu"
 
-#: ../src/protocols/silc/buddy.c:1079
-msgid "_Import..."
-msgstr "_Importovat..."
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovat pozvání do konferencí a místností chatu"
 
-#: ../src/protocols/silc/buddy.c:1175
-msgid "Select correct user"
-msgstr "Zvolte správného uživatele"
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
+msgid "Chat room list URL"
+msgstr "URL seznamu místností chatu"
 
-#: ../src/protocols/silc/buddy.c:1177
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"Byl nalezen více než jeden uživatel se stejným veřejným klíčem. Vyberte ze "
-"seznamu uživatele, kterého přidat do seznamu kamarádů."
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
 
-#: ../src/protocols/silc/buddy.c:1179
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
-"Byl nalezen více než jeden uživatel se stejným jménem. Zvolte ze seznamu "
-"uživatele, kterého přidat do seznamu kamarádů."
-
-#: ../src/protocols/silc/buddy.c:1467
-msgid "Detached"
-msgstr "Odpojen"
+"%s odmítl vaše pozvání ke konferenci do místnosti \"%s\", protože \"%s\"."
 
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
-msgid "Indisposed"
-msgstr "Indisponován"
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Pozvání odmítnuto"
 
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
-msgid "Wake Me Up"
-msgstr "Probuďte mě"
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Nemohu se připojit k chatu"
 
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
-msgid "Hyper Active"
-msgstr "Hyperaktivní"
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Neznámá místnost"
 
-#: ../src/protocols/silc/buddy.c:1479
-msgid "Robot"
-msgstr "Robot"
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Možná je místnost plná"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
-msgid "Happy"
-msgstr "Šťastný"
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Není k dispozici"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
-msgid "Sad"
-msgstr "Smutný"
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Neznámá chyba. Možná se budete muset odhlásit a počkat pět minut, než se "
+"budete moci znovu připojit k místnosti chatu"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
-msgid "Angry"
-msgstr "Rozzlobený"
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Nyní diskutujete v %s."
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
-msgid "Jealous"
-msgstr "Žárlivý"
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Nemohu připojit kamaráda k chatu"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
-msgid "Ashamed"
-msgstr "Hanbící se"
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Možná nejsou v chatu?"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
-msgid "Invincible"
-msgstr "Neporazitelný"
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Získávání seznamu místností selhalo."
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
-msgid "In Love"
-msgstr "Zamilovaný"
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Hlasy"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
-msgid "Sleepy"
-msgstr "Ospalý"
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "WWW kamery"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
-msgid "Bored"
-msgstr "Znuděný"
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Nemohu získat seznam místností."
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
-msgid "Excited"
-msgstr "Vzrušený"
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Místnosti uživatele"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
-msgid "Anxious"
-msgstr "Nedočkavý"
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
+msgid "Sent Doodle request."
+msgstr "Odeslán požadavek o kreslení."
 
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
-msgid "User Modes"
-msgstr "Režimy uživatele"
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+msgid "Unable to establish file descriptor."
+msgstr "Nemohu získat deskriptor souboru."
 
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
-msgid "Mood"
-msgstr "Nálada"
+#. TODO: what to do here - do we really have to disconnect?
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
+msgid "Write Error"
+msgstr "Chyba při zápisu"
 
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
-msgid "Preferred Contact"
-msgstr "Preferovaný kontakt"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
+msgid "Yahoo! Japan Profile"
+msgstr "Profil Yahoo! Japonsko"
 
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
-msgid "Preferred Language"
-msgstr "Preferovaný jazyk"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
+msgid "Yahoo! Profile"
+msgstr "Profil Yahoo!"
 
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
-msgid "Device"
-msgstr "Zařízení"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Lituji, v současné době nejsou podporovány profily označené jako obsahující "
+"obsah pro dospělé."
 
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
-msgid "Timezone"
-msgstr "Časová zóna"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr "Pokud si přejete zobrazit tento profil, musíte navštívit tento odkaz ve svém WWW prohlížeči:"
 
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
-msgid "Geolocation"
-msgstr "Zeměpisné umístění"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+msgid "Yahoo! ID"
+msgstr "ID Yahoo!"
 
-#: ../src/protocols/silc/buddy.c:1629
-msgid "Reset IM Key"
-msgstr "Vynulovat klíč IM"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+msgid "Hobbies"
+msgstr "Koníčky"
 
-#: ../src/protocols/silc/buddy.c:1635
-msgid "IM with Key Exchange"
-msgstr "IM s výměnou klíčů"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+msgid "Latest News"
+msgstr "Nejnovější zprávy"
 
-#: ../src/protocols/silc/buddy.c:1640
-msgid "IM with Password"
-msgstr "IM s heslem"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+msgid "Home Page"
+msgstr "Domovská stránka"
 
-#: ../src/protocols/silc/buddy.c:1653
-msgid "Get Public Key..."
-msgstr "Získat veřejný klíč..."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+msgid "Cool Link 1"
+msgstr "Skvělý odkaz 1"
 
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
-msgid "Kill User"
-msgstr "Zabít uživatele"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+msgid "Cool Link 2"
+msgstr "Skvělý odkaz 2"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
-msgid "Draw On Whiteboard"
-msgstr "Kreslit na tabuli"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+msgid "Cool Link 3"
+msgstr "Skvělý odkaz 3"
 
-#: ../src/protocols/silc/chat.c:39
-msgid "_Passphrase:"
-msgstr "_Heslo:"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+msgid "Last Update"
+msgstr "Poslední aktualizace"
 
-#: ../src/protocols/silc/chat.c:80
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
-msgid "Channel %s does not exist in the network"
-msgstr "Kanál %s v síti neexistuje"
+msgid "User information for %s unavailable"
+msgstr "Informace o uživateli %s nedostupné"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
-msgid "Channel Information"
-msgstr "Informace o kanálu"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Lituji, tento profil je zřejmě v jazyce nebo formátu, který momentálně není "
+"podporován."
 
-#: ../src/protocols/silc/chat.c:82
-msgid "Cannot get channel information"
-msgstr "Nemohu získat informace o kanálu"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Nemohu získat profil uživatele. To je pravděpodobně dočasný problém na "
+"straně serveru. Zkuste to prosím znovu později."
 
-#: ../src/protocols/silc/chat.c:119
-#, c-format
-msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Název kanálu:</b> %s"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Nemohu získat profil uživatele. To pravděpodobně znamená, že uživatel "
+"neexistuje; někdy ale Yahoo! opravdu nemůže najít profil uživatele. Pokud "
+"více, že uživatel existuje, zkuste to prosím znovu později."
 
-#: ../src/protocols/silc/chat.c:122
-#, c-format
-msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>Počet uživatelů:</b> %d"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+msgid "The user's profile is empty."
+msgstr "Profil uživatele je prázdný."
 
-#: ../src/protocols/silc/chat.c:129
-#, c-format
-msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>Zakladatel kanálu:</b> %s"
+#: ../libpurple/protocols/yahoo/ycht.c:456
+msgid "Connection problem with the YCHT server."
+msgstr "Problém se spojením k servery YCHT."
 
-#: ../src/protocols/silc/chat.c:138
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
-msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Šifra kanálu:</b> %s"
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Ztraceno spojení se serverem\n"
+"%s"
 
-#: ../src/protocols/silc/chat.c:141
-#, c-format
-msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>HMAC kanálu:</b>\t%s"
+#: ../libpurple/protocols/zephyr/zephyr.c:354
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Při konverzi této zprávy došlo k chybě. Zkontrolujte volbu 'Kódování' v "
+"Editoru účtů)"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
-msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>Téma kanálu:</b><br>%s"
-
-#: ../src/protocols/silc/chat.c:151
-msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Režimy kanálu:</b> "
+msgid "Unable to send to chat %s,%s,%s"
+msgstr "Nemohu do chatu poslat %s,%s,%s"
 
-#: ../src/protocols/silc/chat.c:164
-#, c-format
-msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>Otisk klíče zakladatele:</b><br>%s"
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Uživatel"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
+msgid "Hidden or not logged-in"
+msgstr "Skrytý nebo nepřihlášen"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
-msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Babbleprint klíče zakladatele:</b><br>%s"
-
-#: ../src/protocols/silc/chat.c:235
-msgid "Add Channel Public Key"
-msgstr "Přidat veřejný klíč kanálu"
-
-#. Add new public key
-#: ../src/protocols/silc/chat.c:290
-msgid "Open Public Key..."
-msgstr "Otevřít veřejný klíč..."
+msgid "<br>At %s since %s"
+msgstr "<br>Na %s od %s"
 
-#: ../src/protocols/silc/chat.c:399
-msgid "Channel Passphrase"
-msgstr "Heslo kanálu"
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
+msgid "Anyone"
+msgstr "Kdokoli"
 
-#: ../src/protocols/silc/chat.c:406
-msgid "Channel Public Keys List"
-msgstr "Seznam veřejných klíčů kanálu"
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
+msgid "_Class:"
+msgstr "_Třída:"
 
-#: ../src/protocols/silc/chat.c:411
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr "Autentizace kanálů se používá pro zabezpečení kanálu před nepovoleným přístupem. Autentizace může být založena na heslu a digitálních podpisech. Je-li nastaveno heslo, je vyžadováno pro umožnění připojení. Jsou-li nastaveny veřejné klíče, mohou se připojit jen uživatelé, jejichž veřejné klíče jsou v seznamu."
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
+msgid "_Instance:"
+msgstr "_Instance:"
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
-msgid "Channel Authentication"
-msgstr "Autentizace kanálu"
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
+msgid "_Recipient:"
+msgstr "_Příjemce:"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
-msgid "Add / Remove"
-msgstr "Přidat/odstranit"
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "Pokus přihlásit se k %s,%s,%s selhal"
 
-#: ../src/protocols/silc/chat.c:577
-msgid "Group Name"
-msgstr "Název skupiny"
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;přezdívka&gt;: Najít uživatele"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:948
-msgid "Passphrase"
-msgstr "Heslo"
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;přezdívka&gt;: Najít uživatele"
 
-#: ../src/protocols/silc/chat.c:592
-#, c-format
-msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Zadejte prosím název soukromé skupiny kanálu %s a heslo."
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"instance &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
 
-#: ../src/protocols/silc/chat.c:594
-msgid "Add Channel Private Group"
-msgstr "Přidat soukromou skupinu kanálu"
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
 
-#: ../src/protocols/silc/chat.c:721
-msgid "User Limit"
-msgstr "Limit uživatelů"
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+"topic &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
 
-#: ../src/protocols/silc/chat.c:722
-msgid "Set user limit on channel. Set to zero to reset user limit."
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"Nastavit limit uživatelů v kanálu. Nastavením na nulu limit uživatelů "
-"zrušíte."
+"sub &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Připojit se k novému "
+"chatu"
 
-#: ../src/protocols/silc/chat.c:877
-msgid "Get Info"
-msgstr "Info"
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Odeslat zprávu na &lt;zpráva,<i>instance</i>,*&gt;"
 
-#: ../src/protocols/silc/chat.c:885
-msgid "Invite List"
-msgstr "Seznam pozvaných"
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;třída&gt; &lt;instance&gt;: Odeslat zprávu na &lt;<i>třída</i>,"
+"<i>instance</i>,*&gt;"
 
-#: ../src/protocols/silc/chat.c:890
-msgid "Ban List"
-msgstr "Seznam zakázaných"
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;"
+"<i>třída</i>,<i>instance</i>,<i>příjemce</i>&gt;"
 
-#: ../src/protocols/silc/chat.c:898
-msgid "Add Private Group"
-msgstr "Přidat soukromou skupinu"
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;MESSAGE,"
+"<i>instance</i>,<i>příjemce</i>&gt;"
 
-#: ../src/protocols/silc/chat.c:911
-msgid "Reset Permanent"
-msgstr "Zrušit trvalé"
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;třída&gt;: Odeslat zprávu na &lt;<i>třída</i>,PERSONAL,*&gt;"
 
-#: ../src/protocols/silc/chat.c:916
-msgid "Set Permanent"
-msgstr "Nastavit trvalé"
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
+msgid "Resubscribe"
+msgstr "Znovu se přihlásit"
 
-#: ../src/protocols/silc/chat.c:924
-msgid "Set User Limit"
-msgstr "Nastavit limit uživatelů"
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
+msgid "Retrieve subscriptions from server"
+msgstr "Získat přihlášení od serveru"
 
-#: ../src/protocols/silc/chat.c:930
-msgid "Reset Topic Restriction"
-msgstr "Zrušit omezení tématu"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
+msgid "Zephyr Protocol Plugin"
+msgstr "Zásuvný modul protokolu Zephyr"
 
-#: ../src/protocols/silc/chat.c:935
-msgid "Set Topic Restriction"
-msgstr "Nastavit omezení tématu"
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
+msgid "Use tzc"
+msgstr "Používat tzc"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
+msgid "tzc command"
+msgstr "Příkaz tzc"
 
-#: ../src/protocols/silc/chat.c:942
-msgid "Reset Private Channel"
-msgstr "Zrušit Soukromý kanál"
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
+msgid "Export to .anyone"
+msgstr "Exportovat do .anyone"
 
-#: ../src/protocols/silc/chat.c:947
-msgid "Set Private Channel"
-msgstr "Nastavit Soukromý kanál"
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
+msgid "Export to .zephyr.subs"
+msgstr "Exportovat do .zephyr.subs"
 
-#: ../src/protocols/silc/chat.c:954
-msgid "Reset Secret Channel"
-msgstr "Zrušit Tajný kanál"
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
+msgid "Import from .anyone"
+msgstr "Importovat z .anyone"
 
-#: ../src/protocols/silc/chat.c:959
-msgid "Set Secret Channel"
-msgstr "Nastavit Tajný kanál"
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
+msgid "Import from .zephyr.subs"
+msgstr "Importovat z .zephyr.subs"
 
-#: ../src/protocols/silc/chat.c:1033
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Jste zakladatel kanálu <I>%s</I>"
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
+msgid "Realm"
+msgstr "Realm"
 
-#: ../src/protocols/silc/chat.c:1037
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Zakladatel kanálu <I>%s</I> je <I>%s</I>"
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
+msgid "Exposure"
+msgstr "Vystavení"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
-"You have to join the %s channel before you are able to join the private group"
+"Unable to create socket:\n"
+"%s"
 msgstr ""
-"Než se budete moci připojit k soukromé skupině, musíte se připojit ke kanálu "
+"Nemohu vytvořit socket:\n"
 "%s"
 
-#: ../src/protocols/silc/chat.c:1098
-msgid "Join Private Group"
-msgstr "Připojit se k soukromé skupině"
-
-#: ../src/protocols/silc/chat.c:1099
-msgid "Cannot join private group"
-msgstr "Nemohu se připojit k soukromé skupině"
+#: ../libpurple/proxy.c:658
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "Nemohu zpracovat odpověď od HTTP proxy: %s\n"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
-msgid "Call Command"
-msgstr "Příkaz volání"
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr "Chyba připojení k HTTP proxy %d"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
-msgid "Cannot call command"
-msgstr "Nemohu zavolat příkaz"
+#: ../libpurple/proxy.c:778
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr "Přístup odepřen: HTTP proxy server zakazuje tunelování portu %d."
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
-msgid "Unknown command"
-msgstr "Neznámý příkaz"
+#: ../libpurple/proxy.c:995
+#, c-format
+msgid "Error resolving %s"
+msgstr "Chyba při překladu %s"
 
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
-msgid "Secure File Transfer"
-msgstr "Zabezpečený přenos souborů"
+#: ../libpurple/proxy.c:1697
+msgid "Could not resolve host name"
+msgstr "Nemohu přeložit název počítače"
 
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
-msgid "Error during file transfer"
-msgstr "Chyba při přenosu souboru"
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libpurple/request.h:1377
+msgid "_Yes"
+msgstr "_Ano"
+
+#: ../libpurple/request.h:1377
+msgid "_No"
+msgstr "_Ne"
 
-#: ../src/protocols/silc/ft.c:94
-msgid "Permission denied"
-msgstr "Přístup odepřen"
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../libpurple/request.h:1397
+msgid "_Accept"
+msgstr "_Přijmout"
 
-#: ../src/protocols/silc/ft.c:98
-msgid "Key agreement failed"
-msgstr "Výměna klíčů selhala"
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libpurple/savedstatuses.c:47
+msgid "I'm not here right now"
+msgstr "Teď tu zrovna nejsem"
 
-#: ../src/protocols/silc/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "Sezení pro přenos souborů neexistuje"
+#: ../libpurple/savedstatuses.c:534
+msgid "saved statuses"
+msgstr "uložené stavy"
 
-#: ../src/protocols/silc/ft.c:206
-msgid "No file transfer session active"
-msgstr "Není aktivní sezení pro přenos souborů"
+#: ../libpurple/server.c:233
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s je teď znám jako %s.\n"
 
-#: ../src/protocols/silc/ft.c:211
-msgid "File transfer already started"
-msgstr "Přenos souborů již byl spuštěn"
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Pozor! %s %s."
 
-#: ../src/protocols/silc/ft.c:216
-msgid "Could not perform key agreement for file transfer"
-msgstr "Nemohu provést výměnu klíčů pro přenos souborů"
+#: ../libpurple/server.c:295 ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Pozor!"
 
-#: ../src/protocols/silc/ft.c:222
-msgid "Could not start the file transfer"
-msgstr "Nemohu spustit přenos souborů"
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "Pozor! Byli jste %s."
 
-#: ../src/protocols/silc/ft.c:341
-msgid "Cannot send file"
-msgstr "Nemohu odeslat soubor"
+#: ../libpurple/server.c:782
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+"%s zve %s do místnosti chatu %s:\n"
+"%s"
 
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libpurple/server.c:787
 #, c-format
-msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s změnil téma <I>%s</I> na: %s"
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s zve %s do místnosti chatu %s\n"
+
+#: ../libpurple/server.c:791
+msgid "Accept chat invitation?"
+msgstr "Přijmout pozvání k chatu?"
+
+#: ../libpurple/status.c:152
+msgid "Unset"
+msgstr "Nenastaveno"
+
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+msgid "Do not disturb"
+msgstr "Nerušit"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Pryč na dlouho"
+
+#: ../libpurple/status.c:159
+msgid "Mobile"
+msgstr "Mobilní"
 
-#: ../src/protocols/silc/ops.c:639
+#: ../libpurple/status.c:608
 #, c-format
-msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> nastavil režimy kanálu <I>%s</I> na: %s"
+msgid "%s changed status from %s to %s"
+msgstr "%s změnil stav z %s na %s"
 
-#: ../src/protocols/silc/ops.c:643
+#: ../libpurple/status.c:618
 #, c-format
-msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> odstranil všechny režimy kanálu <I>%s</I>"
+msgid "%s is now %s"
+msgstr "%s je teď %s"
 
-#: ../src/protocols/silc/ops.c:676
+#: ../libpurple/status.c:623
 #, c-format
-msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> nastavil režimy <I>%s</I> na: %s"
+msgid "%s is no longer %s"
+msgstr "%s už není %s"
 
-#: ../src/protocols/silc/ops.c:684
+#: ../libpurple/status.c:1233
 #, c-format
-msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I> odstranil všechny režimy <I>%s</I>"
+msgid "%s became idle"
+msgstr "%s se stal nečinným"
 
-#: ../src/protocols/silc/ops.c:713
+#: ../libpurple/status.c:1250
 #, c-format
-msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "Byli jste vykopnuti z <I>%s</I> od <I>%s</I> (%s)"
+msgid "%s became unidle"
+msgstr "%s se stal činným"
 
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libpurple/status.c:1313
 #, c-format
-msgid "You have been killed by %s (%s)"
-msgstr "Byli jste zabiti v %s: (%s)"
+msgid "+++ %s became idle"
+msgstr "+++ %s se stal nečinným"
 
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libpurple/status.c:1315
 #, c-format
-msgid "Killed by %s (%s)"
-msgstr "Zabit od %s: (%s)"
+msgid "+++ %s became unidle"
+msgstr "+++ %s se stal činným"
 
-#: ../src/protocols/silc/ops.c:830
-msgid "Server signoff"
-msgstr "Odhlášení od serveru"
+#: ../libpurple/util.c:717
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
 
-#: ../src/protocols/silc/ops.c:1017
-msgid "Personal Information"
-msgstr "Osobní informace"
+#: ../libpurple/util.c:2720
+#, c-format
+msgid "Error Reading %s"
+msgstr "Chyba při čtení %s"
 
-#: ../src/protocols/silc/ops.c:1040
-msgid "Birth Day"
-msgstr "Datum narození"
+#: ../libpurple/util.c:2721
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Při čtení vašeho %s došlo k chybě. Nebylo načteno a starý soubor byl "
+"přejmenován na %s~."
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Název zaměstnání"
+#: ../libpurple/util.c:3221
+msgid "Calculating..."
+msgstr "Počítám..."
 
-#: ../src/protocols/silc/ops.c:1048
-msgid "Job Role"
-msgstr "Role v zaměstnání"
+#: ../libpurple/util.c:3224
+msgid "Unknown."
+msgstr "Neznámá."
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
-msgid "Organization"
-msgstr "Organizace"
+#: ../libpurple/util.c:3250
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekundy"
+msgstr[2] "%d sekund"
 
-#: ../src/protocols/silc/ops.c:1056
-msgid "Unit"
-msgstr "Jednotka"
+#: ../libpurple/util.c:3262
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d den"
+msgstr[1] "%d dny"
+msgstr[2] "%d dnů"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-mail"
+#: ../libpurple/util.c:3270
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d hodina"
+msgstr[1] "%s, %d hodiny"
+msgstr[2] "%s, %d hodin"
 
-#: ../src/protocols/silc/ops.c:1080
-msgid "Note"
-msgstr "Poznámka"
+#: ../libpurple/util.c:3276
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hodina"
+msgstr[1] "%d hodiny"
+msgstr[2] "%d hodin"
 
-#: ../src/protocols/silc/ops.c:1128
-msgid "Join Chat"
-msgstr "Připojit se k chatu"
+#: ../libpurple/util.c:3284
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minuta"
+msgstr[1] "%s, %d minuty"
+msgstr[2] "%s, %d minut"
 
-#: ../src/protocols/silc/ops.c:1211
-msgid "Status Text"
-msgstr "Text stavu"
+#: ../libpurple/util.c:3290
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
 
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
-msgid "Public Key Fingerprint"
-msgstr "Otisk veřejného klíče"
+#: ../libpurple/util.c:3550
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Nemohu otevřít %s: Příliš mnohokrát přesměrován"
 
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
-msgid "Public Key Babbleprint"
-msgstr "Babbleprint veřejného klíče"
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "Nemohu se připojit k %s"
 
-#: ../src/protocols/silc/ops.c:1298
-msgid "_More..."
-msgstr "_Více..."
+#: ../libpurple/util.c:3710
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr "Nemohu alokovat dostatek paměti pro uložení obsahu z %s. WWW server možná zkouší něco zlomyslného."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
-msgid "Detach From Server"
-msgstr "Odpojit se od serveru"
+#: ../libpurple/util.c:3745
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "Chyba při čtení z %s: %s"
 
-#: ../src/protocols/silc/ops.c:1369
-msgid "Cannot detach"
-msgstr "Nemohu odpojit"
+#: ../libpurple/util.c:3776
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Chyba při zápisu do %s: %s"
 
-#: ../src/protocols/silc/ops.c:1380
-msgid "Cannot set topic"
-msgstr "Nemohu nastavit téma"
+#: ../libpurple/util.c:3801
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "Nemohu se připojit k %s: %s"
 
-#: ../src/protocols/silc/ops.c:1412
-msgid "Failed to change nickname"
-msgstr "Nemohu změnit přezdívku"
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Internet Messenger"
 
-#: ../src/protocols/silc/ops.c:1460
-msgid "Roomlist"
-msgstr "Seznam místností"
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin Internet Messenger"
 
-#: ../src/protocols/silc/ops.c:1460
-msgid "Cannot get room list"
-msgstr "Nemohu získat seznam místností"
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Posílat instant message různými protokoly"
 
-#: ../src/protocols/silc/ops.c:1505
-msgid "No public key was received"
-msgstr "Nebyl přijat veřejný klíč"
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientace"
 
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
-msgid "Server Information"
-msgstr "Informace o serveru"
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Orientace oznamovací oblasti."
 
-#: ../src/protocols/silc/ops.c:1519
-msgid "Cannot get server information"
-msgstr "Nemohu získat informace o serveru"
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:407
+msgid "Login Options"
+msgstr "Možnosti přihlášení"
 
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
-msgid "Server Statistics"
-msgstr "Statistika o serveru"
+#: ../pidgin/gtkaccount.c:428
+msgid "Pro_tocol:"
+msgstr "_Protokol:"
+
+#: ../pidgin/gtkaccount.c:439
+msgid "Screen _name:"
+msgstr "_Jméno uživatele:"
+
+#: ../pidgin/gtkaccount.c:529
+msgid "_Local alias:"
+msgstr "_Místní alias:"
+
+#: ../pidgin/gtkaccount.c:533
+msgid "Remember pass_word"
+msgstr "Za_pamatovat si heslo"
 
-#: ../src/protocols/silc/ops.c:1549
-msgid "Cannot get server statistics"
-msgstr "Nemohu získat statistiku o serveru"
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:591
+msgid "User Options"
+msgstr "Nastavení uživatele"
 
-#: ../src/protocols/silc/ops.c:1558
-msgid "No server statistics available"
-msgstr "Statistika o serveru není k dispozici"
+#: ../pidgin/gtkaccount.c:604
+msgid "New _mail notifications"
+msgstr "_Upozornění na nové zprávy"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:609
+msgid "Use this buddy _icon for this account:"
+msgstr "Používat pro tento účet tuto _ikonu kamaráda:"
 
-#: ../src/protocols/silc/ops.c:1580
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:731
 #, c-format
-msgid ""
-"Local server start time: %s\n"
-"Local server uptime: %s\n"
-"Local server clients: %d\n"
-"Local server channels: %d\n"
-"Local server operators: %d\n"
-"Local router operators: %d\n"
-"Local cell clients: %d\n"
-"Local cell channels: %d\n"
-"Local cell servers: %d\n"
-"Total clients: %d\n"
-"Total channels: %d\n"
-"Total servers: %d\n"
-"Total routers: %d\n"
-"Total server operators: %d\n"
-"Total router operators: %d\n"
-msgstr ""
-"Čas spuštění místního serveru: %s\n"
-"Čas běhu místního serveru: %s\n"
-"Klienti místního serveru: %d\n"
-"Kanály místního serveru: %d\n"
-"Operátoři místního serveru: %d\n"
-"Operátoři místního směrovače: %d\n"
-"Klienti místní buňky: %d\n"
-"Kanály místní buňky: %d\n"
-"Servery místní buňky: %d\n"
-"Celkem klientů: %d\n"
-"Celkem kanálů: %d\n"
-"Celkem serverů: %d\n"
-"Celkem směrovačů: %d\n"
-"Celkem operátorů serverů: %d\n"
-"Celkem operátorů směrovačů: %d\n"
-
-#: ../src/protocols/silc/ops.c:1603
-msgid "Network Statistics"
-msgstr "Statistika o síti"
+msgid "%s Options"
+msgstr "Nastavení %s"
 
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
-msgid "Ping"
-msgstr "Ping"
+#: ../pidgin/gtkaccount.c:936
+msgid "Use GNOME Proxy Settings"
+msgstr "Používat nastavení proxy v GNOME"
 
-#: ../src/protocols/silc/ops.c:1611
-msgid "Ping failed"
-msgstr "Ping selhal"
+#: ../pidgin/gtkaccount.c:937
+msgid "Use Global Proxy Settings"
+msgstr "Používat globální nastavení proxy"
 
-#: ../src/protocols/silc/ops.c:1616
-msgid "Ping reply received from server"
-msgstr "Od serveru přijata odpověď na ping"
+#: ../pidgin/gtkaccount.c:943
+msgid "No Proxy"
+msgstr "Žádná proxy"
 
-#: ../src/protocols/silc/ops.c:1624
-msgid "Could not kill user"
-msgstr "Nemohu zabít uživatele"
+#: ../pidgin/gtkaccount.c:949
+msgid "HTTP"
+msgstr "HTTP"
 
-#: ../src/protocols/silc/ops.c:1708
-msgid "Error during connecting to SILC Server"
-msgstr "Chyba při připojování se k serveru SILC"
+#: ../pidgin/gtkaccount.c:955
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
 
-#: ../src/protocols/silc/ops.c:1713
-msgid "Key Exchange failed"
-msgstr "Výměna klíčů selhala"
+#: ../pidgin/gtkaccount.c:961
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
 
-#: ../src/protocols/silc/ops.c:1722
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Obnova odpojeného sezení selhala. Vytvořte nové spojení stisknutím Znovu se "
-"připojit"
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
+msgid "Use Environmental Settings"
+msgstr "Použít globální prostředí"
 
-#: ../src/protocols/silc/ops.c:1757
-msgid "Disconnected by server"
-msgstr "Odpojen serverem"
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:1006
+msgid "If you look real closely"
+msgstr "Pokud se podíváte opravdu zblízka,"
 
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:199
-msgid "Resuming session"
-msgstr "Obnovuji sezení"
+# More daring translation?
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:1009
+msgid "you can see the butterflies mating"
+msgstr "můžete vidět, jak se motýli párují"
 
-#: ../src/protocols/silc/ops.c:1821
-msgid "Authenticating connection"
-msgstr "Autentizuji připojení"
+#: ../pidgin/gtkaccount.c:1030
+msgid "Proxy Options"
+msgstr "Možnosti proxy"
 
-#: ../src/protocols/silc/ops.c:1868
-msgid "Verifying server public key"
-msgstr "Ověřuji veřejný klíč serveru"
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
+msgid "Proxy _type:"
+msgstr "_Typ proxy:"
 
-#: ../src/protocols/silc/ops.c:1909
-msgid "Passphrase required"
-msgstr "Je vyžadováno heslo"
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
+msgid "_Host:"
+msgstr "_Počítač:"
 
-#: ../src/protocols/silc/ops.c:1938
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
+msgid "_Port:"
+msgstr "_Port:"
 
-#: ../src/protocols/silc/ops.c:1941
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Chyba: Vzdálený nevěří/nepodporuje váš veřejný klíč"
+#: ../pidgin/gtkaccount.c:1065
+msgid "_Username:"
+msgstr "Jméno _uživatele:"
 
-#: ../src/protocols/silc/ops.c:1944
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Chyba: Vzdálený nepodporuje navrženou skupinu KE"
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
+msgid "Pa_ssword:"
+msgstr "_Heslo:"
 
-#: ../src/protocols/silc/ops.c:1947
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Chyba: Vzdálený nepodporuje navrženou šifru"
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Nemohu uložit nový účet"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Již existuje účet se zadanými podmínkami."
 
-#: ../src/protocols/silc/ops.c:1950
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Chyba: Vzdálený nepodporuje navržený PKCS"
+#: ../pidgin/gtkaccount.c:1473
+msgid "Add Account"
+msgstr "Přidat účet"
 
-#: ../src/protocols/silc/ops.c:1953
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Chyba: Vzdálený nepodporuje navrženou hašovací funkci"
+#: ../pidgin/gtkaccount.c:1492
+msgid "_Basic"
+msgstr "Zá_kladní"
 
-#: ../src/protocols/silc/ops.c:1956
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Chyba: Vzdálený nepodporuje navržený HMAC"
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Vytvořit tento nový účet na serveru"
 
-#: ../src/protocols/silc/ops.c:1958
-msgid "Failure: Incorrect signature"
-msgstr "Chyba: Nesprávný podpis"
+#: ../pidgin/gtkaccount.c:1515
+msgid "_Advanced"
+msgstr "_Pokročilé"
 
-#: ../src/protocols/silc/ops.c:1960
-msgid "Failure: Invalid cookie"
-msgstr "Chyba: Neplatný cookie"
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Povoleno"
 
-#: ../src/protocols/silc/ops.c:1971
-msgid "Failure: Authentication failed"
-msgstr "Chyba: Autentizace selhala"
+#: ../pidgin/gtkaccount.c:2001
+msgid "Protocol"
+msgstr "Protokol"
 
-#: ../src/protocols/silc/pk.c:103
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
-"Přijat veřejný klíč %s. Vaše místní kopie tomuto klíči neodpovídá. Opravdu "
-"chcete přijmout tento veřejný klíč?"
+"<span size='larger' weight='bold'>Vítá vás %s!</span>\n"
+"\n"
+"Nemáte nastaveny žádné účty IM. Začněte se připojovat pomocí %s stisknutím tlačítka <b>Přidat</b> níže a nastavte svůj první účet. Pokud chcete, aby se %s připojoval k více účtům IM, nastavte je všechny opakovanými stisky <b>Přidat</b>.\n"
+"\n"
+"Můžete se do tohoto okna vrátit a přidávat, upravovat nebo odstraňovat účty přes <b>Účty->Přidat/Upravit</b> v okně seznamu kamarádů."
 
-#: ../src/protocols/silc/pk.c:108
-#, c-format
-msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "Přijat veřejný klíč %s. Chcete přijmout tento veřejný klíč?"
+#: ../pidgin/gtkblist.c:765
+msgid "Join a Chat"
+msgstr "Připojit se k chatu"
 
-#: ../src/protocols/silc/pk.c:112
-#, c-format
+#: ../pidgin/gtkblist.c:786
 msgid ""
-"Fingerprint and babbleprint for the %s key are:\n"
-"\n"
-"%s\n"
-"%s\n"
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
 msgstr ""
-"Otisk a babbleprint klíče %s jsou:\n"
-"\n"
-"%s\n"
-"%s\n"
+"Zadejte prosím odpovídající informace o chatu, ke kterému se chcete "
+"připojit.\n"
 
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
-msgid "Verify Public Key"
-msgstr "Ověřit veřejný klíč"
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
+#: ../pidgin/gtkroomlist.c:395
+msgid "_Account:"
+msgstr "_Účet:"
 
-#: ../src/protocols/silc/pk.c:119
-msgid "_View..."
-msgstr "_Zobrazit..."
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Blokovat"
 
-#: ../src/protocols/silc/pk.c:141
-msgid "Unsupported public key type"
-msgstr "Nepodporovaný typ veřejného klíče"
+#: ../pidgin/gtkblist.c:1086
+msgid "Un_block"
+msgstr "Od_blokovat"
 
-#: ../src/protocols/silc/silc.c:158
-msgid "Connection failed"
-msgstr "Spojení selhalo"
+# KEEP THIS SHORT FORM, the full one doesn't fit on a button.
+#: ../pidgin/gtkblist.c:1137
+msgid "Get _Info"
+msgstr "_Info"
 
-#: ../src/protocols/silc/silc.c:191
-msgid "Cannot initialize SILC Client connection"
-msgstr "Nemohu inicializovat připojení klienta SILC"
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
+msgid "I_M"
+msgstr "I_M"
 
-#: ../src/protocols/silc/silc.c:202
-msgid "Performing key exchange"
-msgstr "Provádím výměnu klíčů"
+#: ../pidgin/gtkblist.c:1146
+msgid "_Send File"
+msgstr "_Odeslat soubor"
 
-#: ../src/protocols/silc/silc.c:287
-msgid "Out of memory"
-msgstr "Nedostatek paměti"
+#: ../pidgin/gtkblist.c:1153
+msgid "Add Buddy _Pounce"
+msgstr "Přidat _sledování kamaráda"
 
-#: ../src/protocols/silc/silc.c:328
-msgid "Cannot initialize SILC protocol"
-msgstr "Nemohu inicializovat protokol SILC"
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
+msgid "View _Log"
+msgstr "Zobrazit záz_nam"
 
-#: ../src/protocols/silc/silc.c:335
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Nemohu najít/přistupovat k adresáři ~/.silc"
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
+msgid "_Alias..."
+msgstr "_Alias..."
 
-#. Progress
-#: ../src/protocols/silc/silc.c:340
-msgid "Connecting to SILC Server"
-msgstr "Připojuji se k serveru SILC"
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+msgid "_Remove"
+msgstr "_Odstranit"
 
-#: ../src/protocols/silc/silc.c:349
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Nemohu načíst pár klíčů SILC: %s"
+#: ../pidgin/gtkblist.c:1236
+msgid "Add a _Buddy"
+msgstr "_Přidat kamaráda"
 
-#: ../src/protocols/silc/silc.c:369
-msgid "Unable to create connection"
-msgstr "Nemohu vytvořit spojení"
+#: ../pidgin/gtkblist.c:1239
+msgid "Add a C_hat"
+msgstr "Přidat _chat"
 
-#: ../src/protocols/silc/silc.c:668
-msgid "Your Current Mood"
-msgstr "Vaše momentální nálada"
+#: ../pidgin/gtkblist.c:1242
+msgid "_Delete Group"
+msgstr "_Odstranit skupinu"
 
-#: ../src/protocols/silc/silc.c:695
-msgid ""
-"\n"
-"Your Preferred Contact Methods"
-msgstr ""
-"\n"
-"Vaše preferované metody kontaktu"
+#: ../pidgin/gtkblist.c:1244
+msgid "_Rename"
+msgstr "_Přejmenovat"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
-msgid "SMS"
-msgstr "SMS"
+#. join button
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
+msgid "_Join"
+msgstr "_Připojit"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
-msgid "MMS"
-msgstr "MMS"
+#: ../pidgin/gtkblist.c:1265
+msgid "Auto-Join"
+msgstr "Automatické přihlašování"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
-msgstr "Videokonference"
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
+msgid "_Collapse"
+msgstr "_Sbalit"
 
-#: ../src/protocols/silc/silc.c:712
-msgid "Your Current Status"
-msgstr "Váš momentální stav"
+#: ../pidgin/gtkblist.c:1332
+msgid "_Expand"
+msgstr "_Rozbalit"
 
-#: ../src/protocols/silc/silc.c:719
-msgid "Online Services"
-msgstr "Služby online"
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
+msgid "/Tools/Mute Sounds"
+msgstr "/Nástroje/Umlčet zvuky"
 
-#: ../src/protocols/silc/silc.c:722
-msgid "Let others see what services you are using"
-msgstr "Umožnit ostatním vidět, jaké služby používáte"
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
+#: ../pidgin/gtkpounce.c:429
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "Nejste momentálně připojen s účtem, který může přidat tohoto kamaráda."
 
-#: ../src/protocols/silc/silc.c:728
-msgid "Let others see what computer you are using"
-msgstr "Umožnit ostatním vidět, jaký počítač používáte"
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2866
+msgid "/_Buddies"
+msgstr "/_Kamarádi"
 
-#: ../src/protocols/silc/silc.c:735
-msgid "Your VCard File"
-msgstr "Váš soubor VCard"
+#: ../pidgin/gtkblist.c:2867
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Kamarádi/Nová _Instant Message..."
 
-#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
-msgid "User Online Status Attributes"
-msgstr "Atributy stavu online uživatele"
+#: ../pidgin/gtkblist.c:2868
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Kamarádi/Připojit se k _chatu..."
 
-#: ../src/protocols/silc/silc.c:749
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Můžete umožnit ostatním uživatelům vidět informace o vašem stavu online a "
-"vaše osobní informace. Zadejte prosím informace, které chcete, aby o vás "
-"ostatní uživatelé viděli."
+#: ../pidgin/gtkblist.c:2869
+msgid "/Buddies/Get User _Info..."
+msgstr "/Kamarádi/Získat informace o _uživateli..."
 
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
-msgid "Message of the Day"
-msgstr "Zpráva dne"
+#: ../pidgin/gtkblist.c:2870
+msgid "/Buddies/View User _Log..."
+msgstr "/Kamarádi/Zobrazit _záznam uživatele..."
 
-#: ../src/protocols/silc/silc.c:789
-msgid "No Message of the Day available"
-msgstr "Zpráva dne není k dispozici"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Kamarádi/Zobrazit"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Kamarádi/Zobrazit/_Odpojené kamarády"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Kamarádi/Zobrazit/_Prázdné skupiny"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Kamarádi/Zobrazit/_Podrobnosti o kamarádovi"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Kamarádi/Zobrazit/_Čas nečinnosti"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Kamarádi/Zobrazit/_Ikony protokolu"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
-msgid "There is no Message of the Day associated with this connection"
-msgstr "S tímto spojením není asociována zpráva dne"
+#: ../pidgin/gtkblist.c:2878
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Kamarádi/_Řadit kamarády"
 
-#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
-#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
-msgid "Create New SILC Key Pair"
-msgstr "Vytvořit nový pár klíčů SILC"
+#: ../pidgin/gtkblist.c:2880
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Kamarádi/_Přidat kamaráda..."
 
-#: ../src/protocols/silc/silc.c:841
-msgid "Passphrases do not match"
-msgstr "Hesla nesouhlasí"
+#: ../pidgin/gtkblist.c:2881
+msgid "/Buddies/Add C_hat..."
+msgstr "/Kamarádi/Přidat _chat..."
 
-#: ../src/protocols/silc/silc.c:885
-msgid "Key Pair Generation failed"
-msgstr "Generování páru klíčů selhalo"
+#: ../pidgin/gtkblist.c:2882
+msgid "/Buddies/Add _Group..."
+msgstr "/Kamarádi/Přidat _skupinu..."
 
-#: ../src/protocols/silc/silc.c:924
-msgid "Key length"
-msgstr "Délka klíče"
+#: ../pidgin/gtkblist.c:2884
+msgid "/Buddies/_Quit"
+msgstr "/Kamarádi/_Konec"
 
-#: ../src/protocols/silc/silc.c:926
-msgid "Public key file"
-msgstr "Soubor veřejného klíče"
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2887
+msgid "/_Accounts"
+msgstr "/_Účty"
 
-#: ../src/protocols/silc/silc.c:928
-msgid "Private key file"
-msgstr "Soubor soukromého klíče"
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Účty/Přidat\\/upravit"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Skutečné jméno"
+#. Tools
+#: ../pidgin/gtkblist.c:2891
+msgid "/_Tools"
+msgstr "/_Nástroje"
 
-#: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Heslo (znovu)"
+#: ../pidgin/gtkblist.c:2892
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Nástroje/_Sledování kamarádů"
 
-#: ../src/protocols/silc/silc.c:958
-msgid "Generate Key Pair"
-msgstr "Generovat pár klíčů"
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Nástroje/_Certifikáty"
 
-#: ../src/protocols/silc/silc.c:1002
-msgid "Online Status"
-msgstr "Stav připojení"
+#: ../pidgin/gtkblist.c:2894
+msgid "/Tools/Plu_gins"
+msgstr "/Nástroje/_Zásuvné moduly"
 
-#: ../src/protocols/silc/silc.c:1011
-msgid "View Message of the Day"
-msgstr "Zobrazit zprávu dne"
+#: ../pidgin/gtkblist.c:2895
+msgid "/Tools/Pr_eferences"
+msgstr "/Nástroje/_Nastavení"
 
-#: ../src/protocols/silc/silc.c:1015
-msgid "Create SILC Key Pair..."
-msgstr "Vytvořit klíčů SILC..."
+#: ../pidgin/gtkblist.c:2896
+msgid "/Tools/Pr_ivacy"
+msgstr "/Nástroje/_Soukromí"
 
-#: ../src/protocols/silc/silc.c:1114
-#, c-format
-msgid "User <I>%s</I> is not present in the network"
-msgstr "Uživatel <I>%s</I> není v síti přítomen"
+#: ../pidgin/gtkblist.c:2898
+msgid "/Tools/_File Transfers"
+msgstr "/Nástroje/_Přenosy souborů"
 
-#: ../src/protocols/silc/silc.c:1306
-msgid "Topic too long"
-msgstr "Téma příliš dlouhé"
+#: ../pidgin/gtkblist.c:2899
+msgid "/Tools/R_oom List"
+msgstr "/Nástroje/_Seznam místností"
 
-#: ../src/protocols/silc/silc.c:1387
-msgid "You must specify a nick"
-msgstr "Musíte zadat přezdívku"
+#: ../pidgin/gtkblist.c:2900
+msgid "/Tools/System _Log"
+msgstr "/Nástroje/Systémový záz_nam"
 
-#: ../src/protocols/silc/silc.c:1489
-#, c-format
-msgid "channel %s not found"
-msgstr "kanál %s nenalezen"
+#: ../pidgin/gtkblist.c:2902
+msgid "/Tools/Mute _Sounds"
+msgstr "/Nástroje/Umlčet _zvuky"
 
-#: ../src/protocols/silc/silc.c:1494
-#, c-format
-msgid "channel modes for %s: %s"
-msgstr "režimy kanálu pro %s: %s"
+#. Help
+#: ../pidgin/gtkblist.c:2904
+msgid "/_Help"
+msgstr "/Nápo_věda"
 
-#: ../src/protocols/silc/silc.c:1496
-#, c-format
-msgid "no channel modes are set on %s"
-msgstr "na %s nejsou nastaveny žádné režimy kanálu"
+#: ../pidgin/gtkblist.c:2905
+msgid "/Help/Online _Help"
+msgstr "/Nápověda/_Nápověda online"
+
+#: ../pidgin/gtkblist.c:2906
+msgid "/Help/_Debug Window"
+msgstr "/Nápověda/_Ladicí okno"
+
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
+msgid "/Help/_About"
+msgstr "/Nápověda/O _aplikaci"
 
-#: ../src/protocols/silc/silc.c:1509
+#: ../pidgin/gtkblist.c:2939
 #, c-format
-msgid "Failed to set cmodes for %s"
-msgstr "Nemohu nastavit režimy kanálu pro %s"
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Účet:</b> %s"
+
+#: ../pidgin/gtkblist.c:3017
+msgid "Buddy Alias"
+msgstr "Alias kamaráda"
+
+#: ../pidgin/gtkblist.c:3046
+msgid "Logged In"
+msgstr "Přihlášen"
+
+#: ../pidgin/gtkblist.c:3092
+msgid "Last Seen"
+msgstr "Naposledy viděn"
+
+#: ../pidgin/gtkblist.c:3113
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3115
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3117
+msgid "Rockin'"
+msgstr ""
 
-#: ../src/protocols/silc/silc.c:1539
+#: ../pidgin/gtkblist.c:3450
 #, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Neznámý příkaz: %s, (možná je to chyba v Gaimu)"
+msgid "Idle %dd %dh %02dm"
+msgstr "Nečinný %dd %dh %02dm"
 
-#: ../src/protocols/silc/silc.c:1602
-msgid "part [channel]:  Leave the chat"
-msgstr "part [kanál]: Opustit chat"
+#: ../pidgin/gtkblist.c:3452
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Nečinný %dh %02dm"
 
-#: ../src/protocols/silc/silc.c:1606
-msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanál]: Opustit chat"
+#: ../pidgin/gtkblist.c:3454
+#, c-format
+msgid "Idle %dm"
+msgstr "Nečinný %dm"
 
-#: ../src/protocols/silc/silc.c:1610
-msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;nové téma&gt;]: Zobrazit nebo změnit téma"
+#: ../pidgin/gtkblist.c:3599
+msgid "/Buddies/New Instant Message..."
+msgstr "/Kamarádi/Nová Instant Message..."
 
-#: ../src/protocols/silc/silc.c:1615
-msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;kanál&gt; [&lt;heslo&gt;]: Připojit se k chatu na této síti"
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
+msgid "/Buddies/Join a Chat..."
+msgstr "/Kamarádi/Připojit se k chatu..."
 
-#: ../src/protocols/silc/silc.c:1619
-msgid "list:  List channels on this network"
-msgstr "list: Vypsat kanály v této síti"
+#: ../pidgin/gtkblist.c:3601
+msgid "/Buddies/Get User Info..."
+msgstr "/Kamarádi/Získat informace o uživateli..."
 
-#: ../src/protocols/silc/silc.c:1623
-msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
+#: ../pidgin/gtkblist.c:3602
+msgid "/Buddies/Add Buddy..."
+msgstr "/Kamarádi/Přidat kamaráda..."
 
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2602
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+msgid "/Buddies/Add Chat..."
+msgstr "/Kamarádi/Přidat chat..."
+
+#: ../pidgin/gtkblist.c:3604
+msgid "/Buddies/Add Group..."
+msgstr "/Kamarádi/Přidat skupinu..."
+
+#: ../pidgin/gtkblist.c:3639
+msgid "/Tools/Privacy"
+msgstr "/Nástroje/Soukromí"
+
+#: ../pidgin/gtkblist.c:3642
+msgid "/Tools/Room List"
+msgstr "/Nástroje/Seznam místností"
+
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d nepřečtená zpráva od %s\n"
+msgstr[1] "%d nepřečtené zprávy od %s\n"
+msgstr[2] "%d nepřečtených zpráv od %s\n"
+
+#: ../pidgin/gtkblist.c:3819
+msgid "Manually"
+msgstr "Ručně"
+
+#: ../pidgin/gtkblist.c:3821
+msgid "Alphabetically"
+msgstr "Podle abecedy"
+
+#: ../pidgin/gtkblist.c:3822
+msgid "By status"
+msgstr "Podle stavu"
+
+#: ../pidgin/gtkblist.c:3823
+msgid "By log size"
+msgstr "Podle velikosti záznamu"
+
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s odpojen"
+
+#: ../pidgin/gtkblist.c:4038
+msgid "Re-enable Account"
+msgstr "Znovu povolit účet"
+
+#: ../pidgin/gtkblist.c:4064
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s odpojen: %s</span>"
+
+#: ../pidgin/gtkblist.c:4216
+msgid "<b>Username:</b>"
+msgstr "<b>Jméno uživatele:</b>"
+
+#: ../pidgin/gtkblist.c:4223
+msgid "<b>Password:</b>"
+msgstr "<b>Heslo:</b>"
+
+#: ../pidgin/gtkblist.c:4234
+msgid "_Login"
+msgstr "_Přihlásit"
+
+#: ../pidgin/gtkblist.c:4317
+msgid "/Accounts"
+msgstr "/Účty"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4331
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
 msgstr ""
-"msg &lt;přezdívka&gt; &lt;zpráva&gt;: Odeslat uživateli soukromou zprávu"
+"<span size='larger' weight='bold'>Vítá vás %s!</span>\n"
+"\n"
+"Nemáte povoleny žádné účty. Povolte své účty IM z okna <b>Účty</b> na <b>Účty->Přidat/Upravit</b>. Až povolíte účty, budete se moci přihlásit, nastavit svůj stav, a mluvit se svými kamarády."
 
-#: ../src/protocols/silc/silc.c:1631
-msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Kamarádi/Zobrazit/Odpojené kamarády"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Kamarádi/Zobrazit/Prázdné skupiny"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Kamarádi/Zobrazit/Podrobnosti o kamarádovi"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Kamarádi/Zobrazit/Čas nečinnosti"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Kamarádi/Zobrazit/Ikony protokolu"
+
+#: ../pidgin/gtkblist.c:5501
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"query &lt;přezdívka&gt; [&lt;zpráva&gt;]: Odeslat uživateli soukromou zprávu"
+"Zadejte prosím jméno uživatele, kterého chcete přidat do svého seznamu "
+"kamarádů. Můžete také zadat alias nebo přezdívku pro kamaráda. Alias bude "
+"zobrazen místo jména uživatele kdykoli je to možné.\n"
 
-#: ../src/protocols/silc/silc.c:1635
-msgid "motd:  View the server's Message Of The Day"
-msgstr "motd: Zobrazit zprávu dne tohoto serveru"
+#. End of account box
+#: ../pidgin/gtkblist.c:5536
+msgid "_Screen name:"
+msgstr "_Jméno uživatele:"
+
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
+msgid "A_lias:"
+msgstr "_Alias:"
 
-#: ../src/protocols/silc/silc.c:1639
-msgid "detach:  Detach this session"
-msgstr "detach: Odpojit toto sezení"
+#: ../pidgin/gtkblist.c:5823
+msgid "This protocol does not support chat rooms."
+msgstr "Tento protokol nepodporuje místnosti chatu."
 
-#: ../src/protocols/silc/silc.c:1643
-msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [zpráva]: Odpojit se od serveru s nepovinnou zprávou"
+#: ../pidgin/gtkblist.c:5839
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Nejste momentálně připojen s žádným protokolem, který má možnost chatu."
+
+#: ../pidgin/gtkblist.c:5880
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Zadejte prosím alias a odpovídající informace o chatu, který chcete přidat "
+"do svého seznamu kamarádů.\n"
+
+#: ../pidgin/gtkblist.c:5968
+msgid "Please enter the name of the group to be added."
+msgstr "Zadejte prosím název skupiny, kterou přidat."
+
+#: ../pidgin/gtkblist.c:6609
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Účty/"
+
+#: ../pidgin/gtkblist.c:6633
+msgid "_Edit Account"
+msgstr "_Upravit účet"
+
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
+msgid "No actions available"
+msgstr "Žádné akce nejsou k dispozici"
+
+#: ../pidgin/gtkblist.c:6654
+msgid "_Disable"
+msgstr "Za_kázat"
+
+#: ../pidgin/gtkblist.c:6666
+msgid "Enable Account"
+msgstr "Povolit účet"
+
+#: ../pidgin/gtkblist.c:6672
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Účty/Povolit účet"
+
+#: ../pidgin/gtkblist.c:6721
+msgid "/Tools"
+msgstr "/Nástroje"
+
+#: ../pidgin/gtkblist.c:6791
+msgid "/Buddies/Sort Buddies"
+msgstr "/Kamarádi/Řadit kamarády"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"%s se nepokusí znovu připojit k účtu, dokud chybu neopravíte a účet znovu nepovolíte."
+
+#: ../pidgin/gtkconv.c:462
+msgid "Unknown command."
+msgstr "Neznámý příkaz."
+
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Tento kamarád není na stejném protokolu jako tento chat."
+
+#: ../pidgin/gtkconv.c:754
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr "Nejste momentálně připojen s účtem, který může pozvat tohoto kamaráda."
+
+#: ../pidgin/gtkconv.c:807
+msgid "Invite Buddy Into Chat Room"
+msgstr "Pozvat kamaráda do místnosti chatu"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:837
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Zadejte prosím jméno uživatele, kterého chcete pozvat, a nepovinně i zvací "
+"zprávu."
+
+#: ../pidgin/gtkconv.c:858
+msgid "_Buddy:"
+msgstr "_Kamarád:"
+
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
+msgid "_Message:"
+msgstr "Z_práva:"
+
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Nemohu otevřít soubor."
+
+#: ../pidgin/gtkconv.c:942
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Konverzace s %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:980
+msgid "Save Conversation"
+msgstr "Uložit konverzaci"
+
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+msgid "Find"
+msgstr "Hledat"
+
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Hledat:"
+
+#: ../pidgin/gtkconv.c:1607
+msgid "Un-Ignore"
+msgstr "Přestat ignorovat"
+
+#: ../pidgin/gtkconv.c:1610
+msgid "Ignore"
+msgstr "Ignorovat"
+
+#: ../pidgin/gtkconv.c:1630
+msgid "Get Away Message"
+msgstr "Získat zprávu o nepřítomnosti"
+
+#: ../pidgin/gtkconv.c:1653
+msgid "Last said"
+msgstr "Naposledy řečeno"
+
+#: ../pidgin/gtkconv.c:2589
+msgid "Unable to save icon file to disk."
+msgstr "Nemohu uložit soubor ikony na disk."
+
+#: ../pidgin/gtkconv.c:2640
+msgid "Save Icon"
+msgstr "Uložit ikonu"
+
+#: ../pidgin/gtkconv.c:2692
+msgid "Animate"
+msgstr "Animovat"
+
+#: ../pidgin/gtkconv.c:2697
+msgid "Hide Icon"
+msgstr "Skrýt ikonu"
+
+#: ../pidgin/gtkconv.c:2700
+msgid "Save Icon As..."
+msgstr "Uložit ikonu jako..."
+
+#: ../pidgin/gtkconv.c:2704
+msgid "Set Custom Icon..."
+msgstr "Nastavit vlastní ikonu..."
+
+#: ../pidgin/gtkconv.c:2717
+msgid "Remove Custom Icon"
+msgstr "Odstranit vlastní ikonu"
+
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Zobrazit vše"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2863
+msgid "/_Conversation"
+msgstr "/_Konverzace"
+
+#: ../pidgin/gtkconv.c:2865
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Konverzace/Nová _Instant Message..."
+
+#: ../pidgin/gtkconv.c:2870
+msgid "/Conversation/_Find..."
+msgstr "/Konverzace/_Hledat..."
+
+#: ../pidgin/gtkconv.c:2872
+msgid "/Conversation/View _Log"
+msgstr "/Konverzace/Zobrazit záz_nam"
+
+#: ../pidgin/gtkconv.c:2873
+msgid "/Conversation/_Save As..."
+msgstr "/Konverzace/_Uložit jako..."
+
+#: ../pidgin/gtkconv.c:2875
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Konverzace/Vy_mazat paměť řádků"
+
+#: ../pidgin/gtkconv.c:2879
+msgid "/Conversation/Se_nd File..."
+msgstr "/Konverzace/Odeslat _soubor..."
+
+#: ../pidgin/gtkconv.c:2880
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Konverzace/Přidat _sledování kamaráda..."
+
+#: ../pidgin/gtkconv.c:2882
+msgid "/Conversation/_Get Info"
+msgstr "/Konverzace/_Získat informace"
+
+#: ../pidgin/gtkconv.c:2884
+msgid "/Conversation/In_vite..."
+msgstr "/Konverzace/_Pozvat..."
+
+#: ../pidgin/gtkconv.c:2886
+msgid "/Conversation/M_ore"
+msgstr "/Konverzace/_Více"
+
+#: ../pidgin/gtkconv.c:2890
+msgid "/Conversation/Al_ias..."
+msgstr "/Konverzace/_Alias..."
+
+#: ../pidgin/gtkconv.c:2892
+msgid "/Conversation/_Block..."
+msgstr "/Konverzace/_Blokovat..."
+
+#: ../pidgin/gtkconv.c:2894
+msgid "/Conversation/_Unblock..."
+msgstr "/Konverzace/O_dblokovat..."
+
+#: ../pidgin/gtkconv.c:2896
+msgid "/Conversation/_Add..."
+msgstr "/Konverzace/_Přidat..."
+
+#: ../pidgin/gtkconv.c:2898
+msgid "/Conversation/_Remove..."
+msgstr "/Konverzace/_Odstranit..."
+
+#: ../pidgin/gtkconv.c:2903
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Konverzace/Vložit _odkaz..."
+
+#: ../pidgin/gtkconv.c:2905
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Konverzace/Vložit _obrázek..."
+
+#: ../pidgin/gtkconv.c:2911
+msgid "/Conversation/_Close"
+msgstr "/Konverzace/_Zavřít"
+
+#. Options
+#: ../pidgin/gtkconv.c:2915
+msgid "/_Options"
+msgstr "/_Možnosti"
+
+#: ../pidgin/gtkconv.c:2916
+msgid "/Options/Enable _Logging"
+msgstr "/Možnosti/Povolit zaz_namenávání"
+
+#: ../pidgin/gtkconv.c:2917
+msgid "/Options/Enable _Sounds"
+msgstr "/Možnosti/Povolit _zvuky"
+
+#: ../pidgin/gtkconv.c:2919
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Možnosti/Zobrazovat lišty nástrojů _Formátování"
+
+#: ../pidgin/gtkconv.c:2920
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Možnosti/Zobrazovat _časové značky"
+
+#: ../pidgin/gtkconv.c:3044
+msgid "/Conversation/More"
+msgstr "/Konverzace/Více"
+
+#: ../pidgin/gtkconv.c:3100
+msgid "/Options"
+msgstr "/Možnosti"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
+msgid "/Conversation"
+msgstr "/Konverzace"
+
+#: ../pidgin/gtkconv.c:3175
+msgid "/Conversation/View Log"
+msgstr "/Konverzace/Zobrazit záznam"
+
+#: ../pidgin/gtkconv.c:3181
+msgid "/Conversation/Send File..."
+msgstr "/Konverzace/Odeslat soubor..."
+
+#: ../pidgin/gtkconv.c:3185
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Konverzace/Přidat sledování kamaráda..."
+
+#: ../pidgin/gtkconv.c:3191
+msgid "/Conversation/Get Info"
+msgstr "/Konverzace/Získat informace"
+
+#: ../pidgin/gtkconv.c:3195
+msgid "/Conversation/Invite..."
+msgstr "/Konverzace/Pozvat..."
+
+#: ../pidgin/gtkconv.c:3201
+msgid "/Conversation/Alias..."
+msgstr "/Konverzace/Alias..."
+
+#: ../pidgin/gtkconv.c:3205
+msgid "/Conversation/Block..."
+msgstr "/Konverzace/Blokovat..."
+
+#: ../pidgin/gtkconv.c:3209
+msgid "/Conversation/Unblock..."
+msgstr "/Konverzace/Odblokovat..."
+
+#: ../pidgin/gtkconv.c:3213
+msgid "/Conversation/Add..."
+msgstr "/Konverzace/Přidat..."
+
+#: ../pidgin/gtkconv.c:3217
+msgid "/Conversation/Remove..."
+msgstr "/Konverzace/Odstranit..."
+
+#: ../pidgin/gtkconv.c:3223
+msgid "/Conversation/Insert Link..."
+msgstr "/Konverzace/Vložit odkaz..."
+
+#: ../pidgin/gtkconv.c:3227
+msgid "/Conversation/Insert Image..."
+msgstr "/Konverzace/Vložit obrázek..."
+
+#: ../pidgin/gtkconv.c:3233
+msgid "/Options/Enable Logging"
+msgstr "/Možnosti/Povolit zaznamenávání"
+
+#: ../pidgin/gtkconv.c:3236
+msgid "/Options/Enable Sounds"
+msgstr "/Možnosti/Povolit zvuky"
+
+#: ../pidgin/gtkconv.c:3249
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Možnosti/Zobrazovat lišty nástrojů Formátování"
+
+#: ../pidgin/gtkconv.c:3252
+msgid "/Options/Show Timestamps"
+msgstr "/Možnosti/Zobrazovat časové značky"
+
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
+msgid "User is typing..."
+msgstr "Uživatel píše..."
+
+#: ../pidgin/gtkconv.c:3374
+msgid "User has typed something and stopped"
+msgstr "Uživatel něco napsal a počkal"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
+msgid "_Send To"
+msgstr "_Odeslat do"
+
+#: ../pidgin/gtkconv.c:4270
+msgid "_Send"
+msgstr "_Odeslat"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4374
+msgid "0 people in room"
+msgstr "0 lidí v místnosti"
+
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d osoba v místnosti"
+msgstr[1] "%d osoby v místnosti"
+msgstr[2] "%d osob v místnosti"
+
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
+msgid "Typing"
+msgstr "Píše"
+
+#: ../pidgin/gtkconv.c:6468
+msgid "Stopped Typing"
+msgstr "Přestane psát"
+
+#: ../pidgin/gtkconv.c:6471
+msgid "Nick Said"
+msgstr "Přezdívka řekla"
+
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
+msgid "Unread Messages"
+msgstr "Nepřečtené zprávy"
+
+#: ../pidgin/gtkconv.c:6477
+msgid "New Event"
+msgstr "Nová událost"
+
+#: ../pidgin/gtkconv.c:7550
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Vymaže všechny paměti řádků konverzace."
+
+#: ../pidgin/gtkconv.c:7714
+msgid "Confirm close"
+msgstr "Potvrdit zavření"
+
+#: ../pidgin/gtkconv.c:7746
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Máte nepřečtené zprávy. Opravdu chcete zavřít okno?"
+
+#: ../pidgin/gtkconv.c:8333
+msgid "Close other tabs"
+msgstr "Zavřít ostatní záložky"
+
+#: ../pidgin/gtkconv.c:8339
+msgid "Close all tabs"
+msgstr "Zavřít všechny záložky"
+
+#: ../pidgin/gtkconv.c:8347
+msgid "Detach this tab"
+msgstr "Odpojit tuto záložku"
+
+#: ../pidgin/gtkconv.c:8353
+msgid "Close this tab"
+msgstr "Zavřít tuto záložku"
+
+#: ../pidgin/gtkconv.c:8853
+msgid "Close conversation"
+msgstr "Zavřít konverzaci"
+
+#: ../pidgin/gtkconv.c:9455
+msgid "Last created window"
+msgstr "Poslední vytvořené okno"
+
+#: ../pidgin/gtkconv.c:9457
+msgid "Separate IM and Chat windows"
+msgstr "Oddělovat okna IM a chatů"
+
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
+msgid "New window"
+msgstr "Nové okno"
+
+#: ../pidgin/gtkconv.c:9461
+msgid "By group"
+msgstr "Podle skupiny"
+
+#: ../pidgin/gtkconv.c:9463
+msgid "By account"
+msgstr "Podle účtu"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Uložit ladicí záznam"
+
+#: ../pidgin/gtkdebug.c:581
+msgid "Invert"
+msgstr "Invertovat"
+
+#: ../pidgin/gtkdebug.c:584
+msgid "Highlight matches"
+msgstr "Zvýrazňovat výskyty"
+
+#: ../pidgin/gtkdebug.c:651
+msgid "_Icon Only"
+msgstr "Jen _ikony"
+
+#: ../pidgin/gtkdebug.c:652
+msgid "_Text Only"
+msgstr "Jen _text"
+
+#: ../pidgin/gtkdebug.c:653
+msgid "_Both Icon & Text"
+msgstr "_Jak ikony, tak text"
+
+#: ../pidgin/gtkdebug.c:774
+msgid "Filter"
+msgstr "Filtr"
+
+#: ../pidgin/gtkdebug.c:793
+msgid "Right click for more options."
+msgstr "Pro více možností klikněte pravým tlačítkem."
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Level "
+msgstr "Úroveň "
+
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+msgid "Select the debug filter level."
+msgstr "Zvolte úroveň ladicího filtru."
+
+#: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr "Vše"
+
+#: ../pidgin/gtkdebug.c:833
+msgid "Misc"
+msgstr "Různé"
+
+#: ../pidgin/gtkdebug.c:835
+msgid "Warning"
+msgstr "Varování"
+
+#: ../pidgin/gtkdebug.c:836
+msgid "Error "
+msgstr "Chyba "
+
+#: ../pidgin/gtkdebug.c:837
+msgid "Fatal Error"
+msgstr "Fatální chyba"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
+msgid "lead developer"
+msgstr "vedoucí vývojář"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
+msgid "developer"
+msgstr "vývojář"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support"
+msgstr "podpora"
+
+#: ../pidgin/gtkdialogs.c:87
+msgid "support/QA"
+msgstr "podpora/QA"
+
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "vývojář a webmaster"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:107
+msgid "win32 port"
+msgstr "port na win32"
+
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+msgid "maintainer"
+msgstr "správce"
+
+#: ../pidgin/gtkdialogs.c:110
+msgid "libfaim maintainer"
+msgstr "správce libfaim"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:113
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker a jmenovaný řidič [líná kůže]"
+
+#: ../pidgin/gtkdialogs.c:114
+msgid "XMPP developer"
+msgstr "vývojář XMPP"
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "original author"
+msgstr "původní autor"
+
+#: ../pidgin/gtkdialogs.c:132
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../pidgin/gtkdialogs.c:133
+msgid "Arabic"
+msgstr "Arabština"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
+msgid "Bulgarian"
+msgstr "Bulharština"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+msgid "Bengali"
+msgstr "Bengálština"
+
+#: ../pidgin/gtkdialogs.c:140
+msgid "Bosnian"
+msgstr "Bosenština"
+
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
+msgid "Catalan"
+msgstr "Katalánština"
+
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
+msgid "Valencian-Catalan"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
+msgid "Czech"
+msgstr "Čeština"
+
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+msgid "Danish"
+msgstr "Dánština"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
+msgid "German"
+msgstr "Němčina"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
+msgid "Dzongkha"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+msgid "Greek"
+msgstr "Řečtina"
+
+#: ../pidgin/gtkdialogs.c:154
+msgid "Australian English"
+msgstr "Australská angličtina"
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Canadian English"
+msgstr "Kanadská angličtina"
+
+#: ../pidgin/gtkdialogs.c:156
+msgid "British English"
+msgstr "Britská angličtina"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
+msgid "Spanish"
+msgstr "Španělština"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonština"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
+msgid "Persian"
+msgstr "Perština"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Finnish"
+msgstr "Finština"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
+msgid "French"
+msgstr "Francouzština"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
+#, fuzzy
+msgid "Galician"
+msgstr "Italština"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../pidgin/gtkdialogs.c:170
+msgid "Gujarati Language Team"
+msgstr "Tým jazyka Gujarati"
+
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
+msgid "Hebrew"
+msgstr "Hebrejština"
+
+#: ../pidgin/gtkdialogs.c:172
+msgid "Hindi"
+msgstr "Hindština"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Hungarian"
+msgstr "Maďarština"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Indonesian"
+msgstr "Indonéština"
+
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
+msgid "Italian"
+msgstr "Italština"
+
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
+msgid "Japanese"
+msgstr "Japonština"
+
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
+msgid "Georgian"
+msgstr "Gruzínština"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Ubuntu Georgian Translators"
+msgstr "Překladatelé Gruzínštiny z Ubuntu"
+
+#: ../pidgin/gtkdialogs.c:178
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../pidgin/gtkdialogs.c:178
+msgid "Kannada Translation team"
+msgstr "Tým překladatelů Kannada"
+
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
+msgid "Korean"
+msgstr "Korejština"
+
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
+msgid "Kurdish"
+msgstr "Kurdština"
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
+msgid "Lithuanian"
+msgstr "Litevština"
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
+msgid "Macedonian"
+msgstr "Makedonština"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
+msgid "Bokmål Norwegian"
+msgstr "Norština Bokmål"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Nepali"
+msgstr "Nepálština"
+
+#: ../pidgin/gtkdialogs.c:188
+msgid "Dutch, Flemish"
+msgstr "Holandština, vlámština"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Norwegian Nynorsk"
+msgstr "Norština Nynorsk"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
+msgid "Polish"
+msgstr "Polština"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Portuguese"
+msgstr "Portugalština"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Portuguese-Brazil"
+msgstr "Portugalština-brazilská"
+
+#: ../pidgin/gtkdialogs.c:195
+#, fuzzy
+msgid "Pashto"
+msgstr "Foto"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Romanian"
+msgstr "Rumunština"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
+msgid "Russian"
+msgstr "Ruština"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
+msgid "Slovak"
+msgstr "Slovenština"
+
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
+msgid "Slovenian"
+msgstr "Slovinština"
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Albanian"
+msgstr "Albánština"
+
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+msgid "Serbian"
+msgstr "Srbština"
+
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
+msgid "Swedish"
+msgstr "Švédština"
+
+#: ../pidgin/gtkdialogs.c:205
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:206
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../pidgin/gtkdialogs.c:207
+msgid "Thai"
+msgstr "Thajština"
+
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
+msgid "Turkish"
+msgstr "Turečtina"
+
+#: ../pidgin/gtkdialogs.c:209
+msgid "Vietnamese"
+msgstr "Vietnamština"
+
+#: ../pidgin/gtkdialogs.c:209
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh a tým Gnome-Vi"
+
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
+msgid "Simplified Chinese"
+msgstr "Zjednodušená čínština"
+
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+msgid "Hong Kong Chinese"
+msgstr "Hong Kongská čínština"
+
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
+msgid "Traditional Chinese"
+msgstr "Tradiční čínština"
+
+#: ../pidgin/gtkdialogs.c:221
+msgid "Amharic"
+msgstr "Amharština"
+
+#: ../pidgin/gtkdialogs.c:346
+#, c-format
+msgid "About %s"
+msgstr "O %s"
+
+#: ../pidgin/gtkdialogs.c:384
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr "%s je modulární klient IM založený na libpurple, schopný zároveň používat AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu a QQ. Je napsán pomocí GTK+<BR><BR>Program můžete upravovat a dále šířit pod podmínkami GPL (verze 2 nebo novější). Kopie GPL je obsažena v souboru 'COPYING' dodávaném s %s. Copyright %s vlastní jeho spoluautoři. Pro úplný seznam spoluautorů viz soubor 'COPYRIGHT'. Pro tento program neposkytujeme žádnou záruku.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:402
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:407
+msgid "Current Developers"
+msgstr "Současní vývojáři"
+
+#: ../pidgin/gtkdialogs.c:422
+msgid "Crazy Patch Writers"
+msgstr "Šílení autoři patchů"
+
+#: ../pidgin/gtkdialogs.c:437
+msgid "Retired Developers"
+msgstr "Vývojáři na odpočinku"
+
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "Šílení autoři patchů na odpočinku"
+
+#: ../pidgin/gtkdialogs.c:467
+msgid "Artists"
+msgstr "Umělci"
+
+#: ../pidgin/gtkdialogs.c:482
+msgid "Current Translators"
+msgstr "Současní překladatelé"
+
+#: ../pidgin/gtkdialogs.c:502
+msgid "Past Translators"
+msgstr "Dřívější překladatelé"
+
+#: ../pidgin/gtkdialogs.c:520
+msgid "Debugging Information"
+msgstr "Ladicí informace"
+
+#: ../pidgin/gtkdialogs.c:890
+msgid "Get User Info"
+msgstr "Získat informace o uživateli"
+
+#: ../pidgin/gtkdialogs.c:892
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Zadejte prosím jméno uživatele nebo alias osoby, jejíž informace chcete "
+"zobrazit."
+
+#: ../pidgin/gtkdialogs.c:982
+msgid "View User Log"
+msgstr "Zobrazit záznam uživatele"
+
+#: ../pidgin/gtkdialogs.c:984
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Zadejte prosím jméno uživatele nebo alias osoby, jejíž záznam chcete "
+"zobrazit."
+
+#: ../pidgin/gtkdialogs.c:1004
+msgid "Alias Contact"
+msgstr "Alias kontaktu"
+
+#: ../pidgin/gtkdialogs.c:1005
+msgid "Enter an alias for this contact."
+msgstr "Zadejte alias pro tento kontakt."
+
+#: ../pidgin/gtkdialogs.c:1027
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Zadejte alias pro %s"
+
+#: ../pidgin/gtkdialogs.c:1029
+msgid "Alias Buddy"
+msgstr "Alias kamaráda"
+
+#: ../pidgin/gtkdialogs.c:1050
+msgid "Alias Chat"
+msgstr "Alias chatu"
+
+#: ../pidgin/gtkdialogs.c:1051
+msgid "Enter an alias for this chat."
+msgstr "Zadejte alias pro tento chat."
+
+#: ../pidgin/gtkdialogs.c:1090
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Hodláte odstranit kontakt obsahující %s a %d jiného kamaráda ze svého "
+"seznamu kamarádů. Chcete pokračovat?"
+msgstr[1] ""
+"Hodláte odstranit kontakt obsahující %s a %d jiné kamarády ze svého seznamu "
+"kamarádů. Chcete pokračovat?"
+msgstr[2] ""
+"Hodláte odstranit kontakt obsahující %s a %d jiných kamarádů ze svého "
+"seznamu kamarádů. Chcete pokračovat?"
+
+#: ../pidgin/gtkdialogs.c:1098
+msgid "Remove Contact"
+msgstr "Odstranit kontakt"
+
+#: ../pidgin/gtkdialogs.c:1101
+msgid "_Remove Contact"
+msgstr "_Odstranit kontakt"
+
+#: ../pidgin/gtkdialogs.c:1132
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "Hodláte sloučit skupinu nazvanou %s do skupiny nazvané %s. Chcete pokračovat?"
+
+#: ../pidgin/gtkdialogs.c:1139
+msgid "Merge Groups"
+msgstr "Sloučit skupiny"
+
+#: ../pidgin/gtkdialogs.c:1142
+msgid "_Merge Groups"
+msgstr "_Sloučit skupiny"
+
+#: ../pidgin/gtkdialogs.c:1192
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Hodláte odstranit skupinu %s a všechny její členy ze svého seznamu kamarádů. "
+"Chcete pokračovat?"
+
+#: ../pidgin/gtkdialogs.c:1195
+msgid "Remove Group"
+msgstr "Odstranit skupinu"
+
+#: ../pidgin/gtkdialogs.c:1198
+msgid "_Remove Group"
+msgstr "_Odstranit skupinu"
+
+#: ../pidgin/gtkdialogs.c:1231
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Hodláte odstranit %s ze svého seznamu kamarádů. Chcete pokračovat?"
+
+#: ../pidgin/gtkdialogs.c:1234
+msgid "Remove Buddy"
+msgstr "Odstranit kamaráda"
+
+#: ../pidgin/gtkdialogs.c:1237
+msgid "_Remove Buddy"
+msgstr "_Odstranit kamaráda"
+
+#: ../pidgin/gtkdialogs.c:1258
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Hodláte odstranit chat %s ze svého seznamu kamarádů. Chcete pokračovat?"
+
+#: ../pidgin/gtkdialogs.c:1261
+msgid "Remove Chat"
+msgstr "Odstranit chat"
+
+#: ../pidgin/gtkdialogs.c:1264
+msgid "_Remove Chat"
+msgstr "_Odstranit chat"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "Pro více nepřečtených zpráv klikněte pravým tlačítkem...\n"
+
+#: ../pidgin/gtkdocklet.c:435
+msgid "Change Status"
+msgstr "Změnit stav"
+
+#: ../pidgin/gtkdocklet.c:487
+msgid "Show Buddy List"
+msgstr "Zobrazit seznam kamarádů"
+
+#: ../pidgin/gtkdocklet.c:513
+msgid "New Message..."
+msgstr "Nová zpráva.."
+
+#: ../pidgin/gtkdocklet.c:528
+msgid "Mute Sounds"
+msgstr "Umlčet zvuky"
+
+#: ../pidgin/gtkdocklet.c:535
+msgid "Blink on new message"
+msgstr "Blikat při nové zprávě"
+
+#: ../pidgin/gtkdocklet.c:542
+msgid "Quit"
+msgstr "Konec"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Nezačato"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Přijímám jako:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Přijímám od:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Odesílám k:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Odesílám jako:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Pro otevírání tohoto typu souborů není nastavena žádná aplikace."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Při otevírání souboru došlo k chybě."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Chyba při spouštění %s: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Chyba při spouštění %s"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Proces vrátil kód chyby %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Název souboru:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Místní soubor:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Rychlost:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Využitý čas:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Zbývající čas:"
+
+#: ../pidgin/gtkft.c:783
+msgid "Close this window when all transfers _finish"
+msgstr "Zavřít toto okno, až všechny přenosy _skončí"
+
+#: ../pidgin/gtkft.c:793
+msgid "C_lear finished transfers"
+msgstr "_Vymazat dokončené přenosy"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:802
+msgid "File transfer _details"
+msgstr "_Podrobnosti o přenosu souboru"
+
+#. Pause button
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
+msgid "_Pause"
+msgstr "_Pozastavit"
+
+#. Resume button
+#: ../pidgin/gtkft.c:842
+msgid "_Resume"
+msgstr "_Pokračovat"
+
+#: ../pidgin/gtkimhtml.c:815
+msgid "Paste as Plain _Text"
+msgstr "Vložit _jako text"
+
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
+msgid "_Reset formatting"
+msgstr "Vy_mazat formátování"
+
+#: ../pidgin/gtkimhtml.c:1372
+msgid "Hyperlink color"
+msgstr "Barva odkazu"
+
+#: ../pidgin/gtkimhtml.c:1373
+msgid "Color to draw hyperlinks."
+msgstr "Barva, kterou kreslit odkazy."
+
+#: ../pidgin/gtkimhtml.c:1376
+msgid "Hyperlink prelight color"
+msgstr "Barva zvýraznění odkazu"
+
+#: ../pidgin/gtkimhtml.c:1377
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Barva, kterou kreslit odkazy, když je nad nimi myš."
+
+#: ../pidgin/gtkimhtml.c:1597
+msgid "_Copy E-Mail Address"
+msgstr "_Kopírovat e-mailovou adresu"
+
+#: ../pidgin/gtkimhtml.c:1609
+msgid "_Open Link in Browser"
+msgstr "_Otevřít odkaz v prohlížeči"
+
+#: ../pidgin/gtkimhtml.c:1619
+msgid "_Copy Link Location"
+msgstr "_Kopírovat adresu odkazu"
+
+#: ../pidgin/gtkimhtml.c:3365
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Nerozpoznaný typ souboru</span>\n"
+"\n"
+"Používám PNG."
+
+#: ../pidgin/gtkimhtml.c:3368
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Nerozpoznaný typ souboru\n"
+"\n"
+"Používám PNG."
+
+#: ../pidgin/gtkimhtml.c:3397
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Chyba při ukládání obrázku</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3400
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Chyba při ukládání obrázku\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
+msgid "Save Image"
+msgstr "Uložit obrázek"
+
+#: ../pidgin/gtkimhtml.c:3518
+msgid "_Save Image..."
+msgstr "_Uložit obrázek..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:162
+msgid "Select Font"
+msgstr "Vyberte písmo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:241
+msgid "Select Text Color"
+msgstr "Vyberte barvu textu"
+
+#: ../pidgin/gtkimhtmltoolbar.c:320
+msgid "Select Background Color"
+msgstr "Vyberte barvu pozadí"
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:417
+msgid "_Description"
+msgstr "_Popis"
+
+#: ../pidgin/gtkimhtmltoolbar.c:420
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Zadejte prosím URL a popis odkazu, který chcete vložit. Popis je nepovinný."
+
+#: ../pidgin/gtkimhtmltoolbar.c:424
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Zadejte prosím URL odkazu, který chcete vložit."
+
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Insert Link"
+msgstr "Vložit odkaz"
+
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
+msgid "_Insert"
+msgstr "_Vložit"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Nemohu uložit obrázek: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
+msgid "Insert Image"
+msgstr "Vložit obrázek"
+
+#: ../pidgin/gtkimhtmltoolbar.c:760
+msgid "This theme has no available smileys."
+msgstr "V tomto tématu nejsou k dispozici smajlíky."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:777
+msgid "Smile!"
+msgstr "Úsměv!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "_Písmo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Položky skupiny"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Zrušit seskupení položek"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Tučné"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kurzíva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Podtržené"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Přeškrtnuté"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Zvětšit velikost písma"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Zmenšit velikost písma"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Řez písma"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Barva pozadí"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Barva popředí"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Vymazat formátování"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Vložit obrázek IM"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Vložit smajlík"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>_Tučné</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>_Kurzíva</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>_Podtržené</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Přeškrtnuté</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Větší</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "_Normal"
+msgstr "_Normální"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Menší</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "_Font face"
+msgstr "_Řez písma"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "Barva po_předí"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "Barva po_zadí"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1266
+msgid "_Smiley"
+msgstr "_Smajlík"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1272
+msgid "_Image"
+msgstr "_Obrázek"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1278
+msgid "_Link"
+msgstr "Od_kaz"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Vodorovná čára"
+
+#: ../pidgin/gtklog.c:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "Opravdu že chcete natrvalo odstranit záznam konverzace s %s, který začal v %s?"
+
+#: ../pidgin/gtklog.c:303
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Opravdu že chcete natrvalo odstranit záznam konverzace v %s, který začal v %s?"
+
+#: ../pidgin/gtklog.c:308
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "Opravdu že chcete natrvalo odstranit systémovy záznam, který začal v %s?"
+
+#: ../pidgin/gtklog.c:452
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konverzace v %s v %s</span>"
+
+#: ../pidgin/gtklog.c:455
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konverzace s %s v %s</span>"
+
+#: ../pidgin/gtklog.c:502
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:549
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Systémový události budou zaznamenávány, jen je-li povoleno nastavení "
+"\"Zaznamenávat všechny změny stavu do systémového záznamu\"."
+
+#: ../pidgin/gtklog.c:553
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Instant message budou zaznamenávány, jen je-li povoleno nastavení "
+"\"Zaznamenávat všechny instant message\"."
+
+#: ../pidgin/gtklog.c:556
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Chaty budou zaznamenávány, jen je-li povoleno nastavení \"Zaznamenávat "
+"všechny chaty\"."
+
+#: ../pidgin/gtklog.c:560
+msgid "No logs were found"
+msgstr "Nebyly nalezeny žádné záznamy"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:575
+msgid "_Browse logs folder"
+msgstr "_Procházet složku záznamů"
+
+#: ../pidgin/gtklog.c:639
+msgid "Total log size:"
+msgstr "Celková velikost záznamu:"
+
+#: ../pidgin/gtklog.c:708
+#, c-format
+msgid "Conversations in %s"
+msgstr "Konverzace v %s"
+
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
+#, c-format
+msgid "Conversations with %s"
+msgstr "Konverzace s %s"
+
+#: ../pidgin/gtklog.c:803
+msgid "System Log"
+msgstr "Systémový záznam"
+
+#: ../pidgin/gtkmain.c:386
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Pro více informací zkuste `%s -h'.\n"
+
+#: ../pidgin/gtkmain.c:388
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Použití: %s [PŘEPÍNAČ]...\n"
+"\n"
+"  -c, --config=ADRESÁŘ používat ADRESÁŘ pro soubory s nastavením\n"
+"  -d, --debug          vypisovat ladicí zprávy na stdout\n"
+"  -h, --help           zobrazit tuto nápovědu a skončit\n"
+"  -m, --multiple       nezajišťovat jedinou instanci\n"
+"  -n, --nologin        nepřihlašovat se automaticky\n"
+"  -l, --login[=NÁZEV]  automaticky se přihlásit (nepovinný parametr NÁZEV\n"
+"                       určuje účty, které použít, oddělené čárkami)\n"
+"  -v, --version        zobrazit aktuální verzi a skončit\n"
+
+#: ../pidgin/gtkmain.c:512
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%swiki/DeveloperPages\n"
+msgstr ""
+"%s spadl a pokusil se vypsat soubor core.\n"
+"Toto je chyba v programu a nestalo se to vaší\n"
+"vinou.\n"
+"\n"
+"Pokud umíte pád zopakovat, upozorněte prosím\n"
+"vývojáře ohlášením chyby na:\n"
+"%ssimpleticket/\n"
+"\n"
+"Zkontrolujte prosím, že jste popsali, co jste v té době\n"
+"dělali, a že jste poslali backtrace ze souboru core. Pokud\n"
+"nevíte, jak získat backtrace, přečtěte si prosím instrukce na\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"Pokud potřebujete další pomoc, prosím IM buď SeanEgn nebo\n"
+"LSchiere (pomocí AIM). Kontaktní informace pro Sean a Luka\n"
+"na jiných protokolech je na\n"
+"%swiki/DeveloperPages\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:348
+msgid "Open All Messages"
+msgstr "Otevřít všechny zprávy"
+
+#: ../pidgin/gtknotify.c:401
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
+
+#: ../pidgin/gtknotify.c:521
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s má %d novou zprávu."
+msgstr[1] "%s má %d nové zprávy."
+msgstr[2] "%s má %d nových zpráv."
+
+#: ../pidgin/gtknotify.c:532
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../pidgin/gtknotify.c:957
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Příkaz prohlížeče \"%s\" není platný."
+
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
+msgid "Unable to open URL"
+msgstr "Nemohu otevřít URL"
+
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Chyba při spouštění \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1113
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Byl zvolen 'Ruční' příkaz prohlížeče, ale nebyl nastaven žádný příkaz."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Následující zásuvné moduly budou odebrány."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Několik zásuvných modulů bude odebráno."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Odebrat zásuvné moduly"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Napsal:</span>\t%s\n"
+"<span weight=\"bold\">WWW stránka:</span>\t\t%s\n"
+"<span weight=\"bold\">Název souboru:</span>\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Chyba: %s\n"
+"Hledejte aktualizaci na WWW zásuvného modulu.</span>"
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "Nastavit zásuvný _modul"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Podrobnosti o zásuvném modulu</b>"
+
+#: ../pidgin/gtkpounce.c:156
+msgid "Select a file"
+msgstr "Zvolte soubor"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:531
+msgid "Pounce on Whom"
+msgstr "Sledovat koho"
+
+#: ../pidgin/gtkpounce.c:558
+msgid "_Buddy name:"
+msgstr "_Jméno kamaráda:"
+
+#: ../pidgin/gtkpounce.c:592
+msgid "Si_gns on"
+msgstr "_Přihlásí se"
+
+#: ../pidgin/gtkpounce.c:594
+msgid "Signs o_ff"
+msgstr "_Odhlásí se"
+
+#: ../pidgin/gtkpounce.c:596
+msgid "Goes a_way"
+msgstr "Jde _pryč"
+
+#: ../pidgin/gtkpounce.c:598
+msgid "Ret_urns from away"
+msgstr "_Vrátí se z nepřítomnosti"
+
+#: ../pidgin/gtkpounce.c:600
+msgid "Becomes _idle"
+msgstr "Stane se _nečinným"
+
+#: ../pidgin/gtkpounce.c:602
+msgid "Is no longer i_dle"
+msgstr "Už není ne_činný."
+
+#: ../pidgin/gtkpounce.c:604
+msgid "Starts _typing"
+msgstr "Začne _psát"
+
+#: ../pidgin/gtkpounce.c:606
+msgid "P_auses while typing"
+msgstr "Z_astaví se při psaní"
+
+#: ../pidgin/gtkpounce.c:608
+msgid "Stops t_yping"
+msgstr "Přestane p_sát"
+
+#: ../pidgin/gtkpounce.c:610
+msgid "Sends a _message"
+msgstr "Odešle _zprávu"
+
+#: ../pidgin/gtkpounce.c:653
+msgid "Ope_n an IM window"
+msgstr "_Otevřít okno IM"
+
+#: ../pidgin/gtkpounce.c:655
+msgid "_Pop up a notification"
+msgstr "Zobrazit _upozornění"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "Send a _message"
+msgstr "Odeslat _zprávu"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "E_xecute a command"
+msgstr "Spustit _příkaz"
+
+#: ../pidgin/gtkpounce.c:661
+msgid "P_lay a sound"
+msgstr "Pře_hrát zvuk"
+
+#: ../pidgin/gtkpounce.c:667
+msgid "Brows_e..."
+msgstr "_Procházet..."
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Br_owse..."
+msgstr "_Procházet..."
+
+#: ../pidgin/gtkpounce.c:670
+msgid "Pre_view"
+msgstr "Ná_hled"
+
+#: ../pidgin/gtkpounce.c:797
+msgid "P_ounce only when my status is not Available"
+msgstr "_Sledovat, jen když můj stav není K dispozici"
+
+#: ../pidgin/gtkpounce.c:802
+msgid "_Recurring"
+msgstr "_Opakující se"
+
+#: ../pidgin/gtkpounce.c:1245
+msgid "Pounce Target"
+msgstr "Cíl sledování"
+
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Implicitní"
+
+#: ../pidgin/gtkprefs.c:516
+msgid "Smiley theme failed to unpack."
+msgstr "Téma smajlíků nelze rozbalit."
+
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Nainstalovat téma"
+
+#: ../pidgin/gtkprefs.c:696
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Vyberte téma smajlíků, které chcete používat, ze seznamu níže. Nová témata "
+"mohou být nainstalována jejich přetažením do seznamu témat."
+
+#: ../pidgin/gtkprefs.c:731
+msgid "Icon"
+msgstr "Ikona"
+
+#: ../pidgin/gtkprefs.c:893
+msgid "System Tray Icon"
+msgstr "Ikona v panelu"
+
+#: ../pidgin/gtkprefs.c:894
+msgid "_Show system tray icon:"
+msgstr "Zobrazovat _ikonu v panelu:"
+
+#: ../pidgin/gtkprefs.c:898
+msgid "On unread messages"
+msgstr "Při nepřečtených zprávách"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Conversation Window Hiding"
+msgstr "Skrývání okna konverzace"
+
+#: ../pidgin/gtkprefs.c:904
+msgid "_Hide new IM conversations:"
+msgstr "_Skrýt nové konverzace IM:"
+
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
+msgid "When away"
+msgstr "Při nepřítomnosti"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:915
+msgid "Tabs"
+msgstr "Záložky"
+
+#: ../pidgin/gtkprefs.c:917
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Zobrazovat IM a chaty v oknech se zá_ložkami."
+
+#: ../pidgin/gtkprefs.c:931
+msgid "Show close b_utton on tabs"
+msgstr "Zobrazovat na záložkách tlačítko z_avřít"
+
+#: ../pidgin/gtkprefs.c:934
+msgid "_Placement:"
+msgstr "_Umístění:"
+
+#: ../pidgin/gtkprefs.c:936
+msgid "Top"
+msgstr "Nahoře"
+
+#: ../pidgin/gtkprefs.c:937
+msgid "Bottom"
+msgstr "Dole"
+
+#: ../pidgin/gtkprefs.c:938
+msgid "Left"
+msgstr "Vlevo"
+
+#: ../pidgin/gtkprefs.c:939
+msgid "Right"
+msgstr "Vpravo"
+
+#: ../pidgin/gtkprefs.c:941
+msgid "Left Vertical"
+msgstr "Vlevo svislé"
+
+#: ../pidgin/gtkprefs.c:942
+msgid "Right Vertical"
+msgstr "Vpravo svislé"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "N_ew conversations:"
+msgstr "_Nové konverzace:"
+
+#: ../pidgin/gtkprefs.c:994
+msgid "Show _formatting on incoming messages"
+msgstr "Zobrazovat _Formátování u příchozích zpráv"
+
+#: ../pidgin/gtkprefs.c:997
+msgid "Show _detailed information"
+msgstr "Zobrazit _podrobné informace"
+
+#: ../pidgin/gtkprefs.c:999
+msgid "Enable buddy ic_on animation"
+msgstr "Povolit _animaci ikon kamarádů"
+
+#: ../pidgin/gtkprefs.c:1006
+msgid "_Notify buddies that you are typing to them"
+msgstr "Upozorňovat kamarády, že jim _píšete"
+
+#: ../pidgin/gtkprefs.c:1009
+msgid "Highlight _misspelled words"
+msgstr "Z_výrazňovat slova s překlepy"
+
+#: ../pidgin/gtkprefs.c:1013
+msgid "Use smooth-scrolling"
+msgstr "Používat hladké posouvání"
+
+#: ../pidgin/gtkprefs.c:1016
+msgid "F_lash window when IMs are received"
+msgstr "_Bliknout oknem, když jsou přijaty IM"
+
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimalizovat nová okna konverzací"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Písmo"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "Používat písmo dokumentu z _tématu"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "Používat písmo z _tématu"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "_Písmo konverzace"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Default Formatting"
+msgstr "Implicitní formátování"
+
+#: ../pidgin/gtkprefs.c:1061
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr "Takto bude vypadat text vaší odchozí zprávy, pokud používáte protokoly, které podporují formátování."
+
+#: ../pidgin/gtkprefs.c:1127
+msgid "ST_UN server:"
+msgstr "Server ST_UN:"
+
+#: ../pidgin/gtkprefs.c:1139
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Příklad: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1143
+msgid "_Autodetect IP address"
+msgstr "_Autodetekovat IP adresu"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "Public _IP:"
+msgstr "Veřejná _IP:"
+
+#: ../pidgin/gtkprefs.c:1181
+msgid "Ports"
+msgstr "Porty"
+
+#: ../pidgin/gtkprefs.c:1184
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Ručně určit rozsah portů, na kterých poslouchat"
+
+#: ../pidgin/gtkprefs.c:1187
+msgid "_Start port:"
+msgstr "_Počáteční port:"
+
+#: ../pidgin/gtkprefs.c:1194
+msgid "_End port:"
+msgstr "_Koncový port:"
+
+#: ../pidgin/gtkprefs.c:1202
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+#: ../pidgin/gtkprefs.c:1206
+msgid "No proxy"
+msgstr "Žádná proxy"
+
+#: ../pidgin/gtkprefs.c:1262
+msgid "_User:"
+msgstr "_Uživatel:"
+
+#: ../pidgin/gtkprefs.c:1327
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1328
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1329
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1330
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1331
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "GNOME Default"
+msgstr "Implicitní pro GNOME"
+
+#: ../pidgin/gtkprefs.c:1333
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1334
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1335
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1336
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1345
+msgid "Manual"
+msgstr "Ruční"
+
+#: ../pidgin/gtkprefs.c:1398
+msgid "Browser Selection"
+msgstr "Výběr prohlížeče"
+
+#: ../pidgin/gtkprefs.c:1402
+msgid "_Browser:"
+msgstr "_Prohlížeč:"
+
+#: ../pidgin/gtkprefs.c:1410
+msgid "_Open link in:"
+msgstr "_Otevřít odkaz v:"
+
+#: ../pidgin/gtkprefs.c:1412
+msgid "Browser default"
+msgstr "Implicitní nastavení prohlížeče"
+
+#: ../pidgin/gtkprefs.c:1413
+msgid "Existing window"
+msgstr "Existující okno"
+
+#: ../pidgin/gtkprefs.c:1415
+msgid "New tab"
+msgstr "Nová záložka"
+
+#: ../pidgin/gtkprefs.c:1429
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Ruční:\n"
+"(%s pro URL)"
+
+#: ../pidgin/gtkprefs.c:1469
+msgid "Log _format:"
+msgstr "_Formát záznamu:"
+
+#: ../pidgin/gtkprefs.c:1474
+msgid "Log all _instant messages"
+msgstr "Zaz_namenávat všechny instant message"
+
+#: ../pidgin/gtkprefs.c:1476
+msgid "Log all c_hats"
+msgstr "Zaznamenávat všechny _chaty"
+
+#: ../pidgin/gtkprefs.c:1478
+msgid "Log all _status changes to system log"
+msgstr "Zaznamenávat všechny změny _stavu do systémového záznamu"
+
+#: ../pidgin/gtkprefs.c:1624
+msgid "Sound Selection"
+msgstr "Výběr zvuku"
+
+#: ../pidgin/gtkprefs.c:1634
+msgid "Quietest"
+msgstr "Nejtišší"
+
+#: ../pidgin/gtkprefs.c:1636
+msgid "Quieter"
+msgstr "Tišší"
+
+#: ../pidgin/gtkprefs.c:1638
+msgid "Quiet"
+msgstr "Tichý"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Loud"
+msgstr "Hlasitý"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Louder"
+msgstr "Hlasitější"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Loudest"
+msgstr "Nejhlasitější"
+
+#: ../pidgin/gtkprefs.c:1712
+msgid "_Method:"
+msgstr "_Metoda:"
+
+#: ../pidgin/gtkprefs.c:1714
+msgid "Console beep"
+msgstr "Pípnutí konzoly"
+
+#: ../pidgin/gtkprefs.c:1721
+msgid "No sounds"
+msgstr "Žádné zvuky"
+
+#: ../pidgin/gtkprefs.c:1729
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"_Příkaz zvuku:\n"
+"(%s pro název souboru)"
+
+#: ../pidgin/gtkprefs.c:1756
+msgid "Sounds when conversation has _focus"
+msgstr "Zvuky, když je okno konverzace _aktivní"
+
+#: ../pidgin/gtkprefs.c:1758
+msgid "Enable sounds:"
+msgstr "Povolit zvuky:"
+
+#: ../pidgin/gtkprefs.c:1769
+msgid "Volume:"
+msgstr "Hlasitost:"
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Play"
+msgstr "Přehrát"
+
+#: ../pidgin/gtkprefs.c:1926
+msgid "_Report idle time:"
+msgstr "_Hlásit čas nečinnosti:"
+
+#: ../pidgin/gtkprefs.c:1931
+msgid "Based on keyboard or mouse use"
+msgstr "Podle používání klávesnice nebo myši"
+
+#: ../pidgin/gtkprefs.c:1940
+msgid "_Auto-reply:"
+msgstr "_Automatická odpověď:"
+
+#: ../pidgin/gtkprefs.c:1944
+msgid "When both away and idle"
+msgstr "Při nepřítomnosti a nečinnosti"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1950
+msgid "Auto-away"
+msgstr "Automatická nepřítomnost"
+
+#: ../pidgin/gtkprefs.c:1952
+msgid "Change status when _idle"
+msgstr "Změnit stav _při nečinnosti"
+
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuty před nečinností:"
+
+#: ../pidgin/gtkprefs.c:1964
+msgid "Change _status to:"
+msgstr "Změnit _stav na:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1985
+msgid "Status at Startup"
+msgstr "Stav při spuštění"
+
+#: ../pidgin/gtkprefs.c:1987
+msgid "Use status from last _exit at startup"
+msgstr "Používat při spouštění stav podle posledního _ukončení"
+
+#: ../pidgin/gtkprefs.c:1993
+msgid "Status to a_pply at startup:"
+msgstr "Stav, který použít při _spouštění:"
+
+#: ../pidgin/gtkprefs.c:2031
+msgid "Interface"
+msgstr "Rozhraní"
+
+#: ../pidgin/gtkprefs.c:2033
+msgid "Smiley Themes"
+msgstr "Témata smajlíků"
+
+#: ../pidgin/gtkprefs.c:2040
+msgid "Browser"
+msgstr "Prohlížeč"
+
+#: ../pidgin/gtkprefs.c:2044
+msgid "Status / Idle"
+msgstr "Stav / nečinný"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Povolit všem uživatelům kontaktovat mě"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Povolit jen uživatelům na mém seznamu kamarádů"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Povolit jen uživatelům níže"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Blokovat všechny uživatele"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Blokovat jen uživatele níže"
+
+#: ../pidgin/gtkprivacy.c:369
+msgid "Privacy"
+msgstr "Soukromí"
+
+#: ../pidgin/gtkprivacy.c:381
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Změny v nastavení soukromí mají okamžitý efekt."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:393
+msgid "Set privacy for:"
+msgstr "Nastavit soukromí pro:"
+
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+msgid "Permit User"
+msgstr "Povolit uživateli"
+
+#: ../pidgin/gtkprivacy.c:557
+msgid "Type a user you permit to contact you."
+msgstr "Zadejte uživatele, kterému povolujete vás kontaktovat."
+
+#: ../pidgin/gtkprivacy.c:558
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Zadejte prosím jméno uživatele, o kterém chcete, aby vás mohl kontaktovat."
+
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+msgid "_Permit"
+msgstr "_Povolit"
+
+#: ../pidgin/gtkprivacy.c:567
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Povolit %s kontaktovat vás?"
+
+#: ../pidgin/gtkprivacy.c:569
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Opravdu chcete povolit %s kontaktovat vás?"
+
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "Blokovat uživatele"
+
+#: ../pidgin/gtkprivacy.c:599
+msgid "Type a user to block."
+msgstr "Zadejte uživatele, kterého blokovat."
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Please enter the name of the user you wish to block."
+msgstr "Zadejte prosím jméno uživatele, kterého chcete blokovat."
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "Blokovat %s?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Opravdu chcete blokovat %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Použít"
+
+#: ../pidgin/gtkrequest.c:1507
+msgid "That file already exists"
+msgstr "Tento soubor již existuje"
+
+#: ../pidgin/gtkrequest.c:1508
+msgid "Would you like to overwrite it?"
+msgstr "Chcete jej přepsat?"
+
+#: ../pidgin/gtkrequest.c:1511
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#: ../pidgin/gtkrequest.c:1512
+msgid "Choose New Name"
+msgstr "Zvolte nový název"
+
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+msgid "Select Folder..."
+msgstr "Zvolte složku..."
+
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
+msgid "Room List"
+msgstr "Seznam místností"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:442
+msgid "_Get List"
+msgstr "_Získat seznam"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:450
+msgid "_Add Chat"
+msgstr "_Přidat chat"
+
+#: ../pidgin/gtksavedstatuses.c:336
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Opravdu že chcete odstranit zvolené uložené stavy?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+msgid "_Use"
+msgstr "_Použít"
+
+#: ../pidgin/gtksavedstatuses.c:779
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Název se již používá. Musíte zvolit jedinečný název."
+
+#: ../pidgin/gtksavedstatuses.c:969
+msgid "Different"
+msgstr "Různé"
+
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "_Title:"
+msgstr "_Název:"
+
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
+msgid "_Status:"
+msgstr "_Stav:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1209
+msgid "Use a _different status for some accounts"
+msgstr "Používat _jiný stav pro některé účty"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1273
+msgid "Sa_ve & Use"
+msgstr "Uložit _a použít"
+
+#: ../pidgin/gtksavedstatuses.c:1479
+#, c-format
+msgid "Status for %s"
+msgstr "Stav pro %s"
+
+#: ../pidgin/gtkstatusbox.c:663
+msgid "Waiting for network connection"
+msgstr "Čekám na spojení po síti"
+
+#: ../pidgin/gtkutils.c:631
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Při načítání %s došlo k následující chybě: %s"
+
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
+msgid "Failed to load image"
+msgstr "Nemohu načíst obrázek"
+
+#: ../pidgin/gtkutils.c:1497
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Nemohu odeslat složku %s."
+
+#: ../pidgin/gtkutils.c:1498
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr "%s neumí přenést složku. Budete muset soubory v ní přenést po jednom."
+
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
+msgid "You have dragged an image"
+msgstr "Přetáhli jste obrázek"
+
+#: ../pidgin/gtkutils.c:1531
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Můžete tento obrázek odeslat jako přenos souboru, vložit jej do zprávy, nebo "
+"jej používat jako ikonu kamaráda pro tohoto uživatele."
+
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
+msgid "Set as buddy icon"
+msgstr "Nastavit jako ikonu kamaráda"
+
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+msgid "Send image file"
+msgstr "Odeslat soubor obrázku"
+
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
+msgid "Insert in message"
+msgstr "Vložit do zprávy"
+
+#: ../pidgin/gtkutils.c:1543
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Chcete jej nastavit jako ikonu kamaráda pro tohoto uživatele?"
+
+#: ../pidgin/gtkutils.c:1550
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr "Můžete tento obrázek odeslat jako přenos souboru, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
+
+#: ../pidgin/gtkutils.c:1551
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Můžete tento obrázek vložit do této zprávy nebo jej používat jako ikonu "
+"kamaráda pro tohoto uživatele."
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1609
+msgid "Cannot send launcher"
+msgstr "Nemohu odeslat spouštěč"
+
+#: ../pidgin/gtkutils.c:1609
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Přetáhli jste spouštěč pracovní plochy. Pravděpodobně jste chtěli odeslat, "
+"na co tento spouštěč ukazuje, místo přímo tohoto spouštěče."
+
+#: ../pidgin/gtkutils.c:2344
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Soubor:</b> %s\n"
+"<b>Velikost souboru:</b> %s\n"
+"<b>Velikost obrázku:</b> %d×%d"
+
+#: ../pidgin/gtkutils.c:2640
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "Soubor '%s' je pro %s příliš velký. Zkuste prosím menší obrázek.\n"
+
+#: ../pidgin/gtkutils.c:2642
+msgid "Icon Error"
+msgstr "Chyba ikony"
+
+#: ../pidgin/gtkutils.c:2643
+msgid "Could not set icon"
+msgstr "Nemohu nastavit ikonu"
+
+#: ../pidgin/gtkutils.c:2743
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Nemohu otevřít soubor '%s': %s"
+
+#: ../pidgin/gtkutils.c:2792
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Nemohu načíst obrázek '%s': důvod není znám, pravděpodobně poškozený soubor obrázku"
+
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+msgid "Save File"
+msgstr "Uložit soubor"
+
+#: ../pidgin/gtkwhiteboard.c:861
+msgid "Select color"
+msgstr "Zvolte barvu"
+
+#: ../pidgin/pidginstock.c:86
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../pidgin/pidginstock.c:88
+msgid "Close _tabs"
+msgstr "Zavřít _záložky"
+
+#: ../pidgin/pidginstock.c:90
+msgid "_Get Info"
+msgstr "_Získat info"
+
+#: ../pidgin/pidginstock.c:91
+msgid "_Invite"
+msgstr "_Pozvat"
+
+#: ../pidgin/pidginstock.c:92
+msgid "_Modify"
+msgstr "Z_měnit"
+
+#: ../pidgin/pidginstock.c:93
+msgid "_Open Mail"
+msgstr "_Otevřít poštu"
+
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Smajlíky Pidginu"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Výběr tohoto zakáže grafické emotikony."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "žádné"
+
+#: ../pidgin/plugins/cap/cap.c:450
+msgid "Display Statistics"
+msgstr "Zobrazit statistika"
+
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+msgid "Response Probability:"
+msgstr "Pravěpodobnost odpovědi:"
+
+#: ../pidgin/plugins/cap/cap.c:811
+msgid "Statistics Configuration"
+msgstr "Nastavení statistik"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:814
+msgid "Maximum response timeout:"
+msgstr "Maximální čas na odpověď:"
+
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "minut"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:821
+msgid "Maximum last-seen difference:"
+msgstr "Maximální rozdíl od posledního potkání:"
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:828
+msgid "Threshold:"
+msgstr "Práh:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction"
+msgstr "Předpovídání dostupnosti kontaktu"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:938
+msgid "Contact Availability Prediction plugin."
+msgstr "Zásuvný modul Předpovídání dostupnosti kontaktu."
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:939
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr "Zásuvný modul Předpovídání dostupnosti kontaktu (cap) se používá po zobrazování statistických informací o kamarádech v seznamu kontaktů."
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Kamarád je nečinný"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Kamarád je pryč"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Kamarád je pryč \"na dlouho\""
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Kamarád je mobilní"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Kamarád je odpojen"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Hodnoty bodů, které používat, když..."
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "Kamarád s <i>největším skóre</i> bude mít v kontaktu prioritu.\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Používat posledního kamaráda, když jsou si skóre rovna."
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Hodnoty bodů, které používat pro účet..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:187
+msgid "Contact Priority"
+msgstr "Priorita kontaktu"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:190
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "Umožňuje ovládání hodnot přiřazených s různými stavy kamarádů."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:192
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Umožňuje změnu hodnot bodů stavů nečinný/pryč/odpojen kamarádů při výpočtech "
+"priority kontaktů."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Barvy konverzace"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Upravit barvy v okně konverzace"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Zprávy o chybách"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Zvýrazněné zprávy"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Systémové zprávy"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Odeslané zprávy"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Přijaté zprávy"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#, c-format
+msgid "Select Color for %s"
+msgstr "Vyberte barvu pro %s"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Ignorovat příchozí formátování"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Používat v chatech"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Používat v IM"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Podle počtu konverzací"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Umísťování konverzací"
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "Poznámka: Nastavení pro \"Nové konverzace\" musí být nastaveno na \"Podle počtu konverzací\"."
+
+#: ../pidgin/plugins/extplacement.c:111
+msgid "Number of conversations per window"
+msgstr "Počet konverzací v okně"
+
+#: ../pidgin/plugins/extplacement.c:117
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Oddělovat okna IM a chatů při umísťování podle čísla"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:146
+msgid "ExtPlacement"
+msgstr "DalUmístění"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:148
+msgid "Extra conversation placement options."
+msgstr "Další možnosti umísťování konverzací"
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:150
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "Omezit počet konverzací v okně, volitelně s oddělením IM a chatů"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Nastavení gest myši"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Prostřední tlačítko myši"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Pravé tlačítko myši"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Vizuální zobrazování gest"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Gesta myši"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "Poskytuje podporu pro gesta myši"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Umožňuje podporu gest myši v oknech konverzace.\n"
+"Táhněte prostředním tlačítkem myši pro provedení určitých akcí:\n"
+"\n"
+"Táhněte dolů a pak doprava pro uzavření konverzace.\n"
+"Táhněte nahoru a pak doleva pro přepnutí na předchozí konverzaci.\n"
+"Táhněte nahoru a pak doprava pro přepnutí na následující konverzaci."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Instant Messaging"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Vyberte osobu z vašeho adresáře níže nebo přidejte novou osobu."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Skupina:"
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+msgid "New Person"
+msgstr "Nová osoba"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+msgid "Select Buddy"
+msgstr "Vybrat kamaráda"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Vyberte osobu z vašeho adresáře, ke které přidat tohoto kamaráda, nebo "
+"vytvořte novou osobu."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
+msgid "User _details"
+msgstr "_Podrobnosti o uživateli"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
+msgid "_Associate Buddy"
+msgstr "_Přiřadit kamaráda"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "Nemohu odeslat e-mail"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
+msgid "The evolution executable was not found in the PATH."
+msgstr "Program evolution nebyl nalezen v PATH."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:247
+msgid "An e-mail address was not found for this buddy."
+msgstr "Pro tohoto kamaráda nebyla nalezena e-mailová adresa."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:273
+msgid "Add to Address Book"
+msgstr "Přidat do adresáře"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:285
+msgid "Send E-Mail"
+msgstr "Odeslat e-mail"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:412
+msgid "Evolution Integration Configuration"
+msgstr "Nastavení integrace s Evolution"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:415
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Vyberte všechny účty, ke kterým se mají automaticky přidat kamarádi."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Integrace s Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Poskytuje integraci s Evolution."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+msgid "Please enter the person's information below."
+msgstr "Zadejte prosím níže informace o osobě."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Zadejte prosím níže jméno uživatele kamaráda a typ účtu."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+msgid "Account type:"
+msgstr "Typ účtu:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+msgid "Optional information:"
+msgstr "Nepovinné informace:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+msgid "First name:"
+msgstr "Křestní jméno:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+msgid "Last name:"
+msgstr "Příjmení:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr "\n<b>Poznámka o kamarádovi:</b> %s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Test signálů GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Test pro zjištění, jestli všechny signály ui fungují správně."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Historie"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Ikonifikovat při nepřítomnosti"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Ikonifikuje seznam kamarádů a vaše konverzace, když jdete pryč."
 
-#: ../src/protocols/silc/silc.c:1647
-msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;příkaz&gt;: Zavolat libovolný příkaz klienta silc"
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Kontrola pošty"
 
-#: ../src/protocols/silc/silc.c:1653
-msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;přezdívka&gt; [-pubkey|&lt;důvod&gt;]: Zabít přezdívku"
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Kontroluje novou místní poštu."
 
-#: ../src/protocols/silc/silc.c:1657
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;novápřezdívka&gt;: Změnit vaši přezdívku"
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Přidá do seznamu kamarádů malý obdélník, který zobrazuje, jestli máte novou "
+"poštu."
 
-#: ../src/protocols/silc/silc.c:1661
-msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;přezdívka&gt;: Zobrazit informace o přezdívce"
+#: ../pidgin/plugins/markerline.c:23
+#, fuzzy
+msgid "Markerline"
+msgstr "Podtržené"
 
-#: ../src/protocols/silc/silc.c:1665
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanál&gt; [+|-&lt;režimy&gt]; [parametry]: Změnit nebo zobrazit "
-"režimy kanálu"
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Kreslit čáru indikující nové zprávy konverzacích"
 
-#: ../src/protocols/silc/silc.c:1669
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
 msgstr ""
-"cumode &lt;kanál&gt; +|-&lt;režimy&gt; &lt;přezdívka&gt;: Změnit režimy "
-"přezdívky v kanálu"
 
-#: ../src/protocols/silc/silc.c:1673
-msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;uživatelskérežimy&gt;: Nastavit vaše režimy v síti"
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+msgid "_IM windows"
+msgstr "Okna _IM"
 
-#: ../src/protocols/silc/silc.c:1677
-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;přezdívka&gt; [-pubkey]: Získat privilegia operátora serveru"
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+msgid "C_hat windows"
+msgstr "Okna _chatu"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
 msgstr ""
-"invite &lt;kanál&gt; [-|+]&lt;přezdíva&gt;: pozvat přezdívku nebo přidat/"
-"odstranit ze seznamu pozvaných do kanálu"
+"Bylo vyžádáno sezení music messaging. Přijměte prosím kliknutím na ikonu MM."
 
-#: ../src/protocols/silc/silc.c:1685
-msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;kanál&gt; &lt;přezdívk&gt; [poznámka]: Vykopnout klienta z kanálu"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Sezení music messaging potvrzeno."
 
-#: ../src/protocols/silc/silc.c:1689
-msgid "info [server]:  View server administrative details"
-msgstr "info [server]: Zobrazit administrativní podrobnosti o serveru"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
+msgid "Music Messaging"
+msgstr "Music Messaging"
 
-#: ../src/protocols/silc/silc.c:1693
-msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;kanál&gt; +|-&lt;přezdívka&gt;]:  Zakázat klientovi kanál"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
+msgid "There was a conflict in running the command:"
+msgstr "Při spouštění příkazu došlo ke konfliktu:"
 
-#: ../src/protocols/silc/silc.c:1697
-msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;přezdívka|server&gt;: Získat veřejný klíč klienta nebo serveru"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
+msgid "Error Running Editor"
+msgstr "Chyba při spouštění editoru"
 
-#: ../src/protocols/silc/silc.c:1701
-msgid "stats:  View server and network statistics"
-msgstr "stats: Zobrazit statistku o serveru a síti"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
+msgid "The following error has occurred:"
+msgstr "Došlo k následující chybě:"
 
-#: ../src/protocols/silc/silc.c:1705
-msgid "ping:  Send PING to the connected server"
-msgstr "ping: Poslat PING připojenému serveru"
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
+msgid "Music Messaging Configuration"
+msgstr "Nastavení Music Messaging"
 
-#: ../src/protocols/silc/silc.c:1710
-msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;kanál&gt;: Vypsat uživatele v kanálu"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
+msgid "Score Editor Path"
+msgstr "Cesta editoru skóre"
 
-#: ../src/protocols/silc/silc.c:1714
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanál(y)&gt;: Vypsat "
-"konkrétní uživatele v kanálech"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
+msgid "_Apply"
+msgstr "_Použít"
 
 #. *< type
 #. *< ui_requirement
@@ -11244,449 +15902,444 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: ../src/protocols/silc/silc.c:1823
-msgid "SILC Protocol Plugin"
-msgstr "Zásuvný modul protokolu SILC"
-
-#. *  description
-#: ../src/protocols/silc/silc.c:1825
-msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Protokol Secure Internet Live Conferencing (SILC)"
-
-#: ../src/protocols/silc/silc.c:1862
-msgid "Public Key file"
-msgstr "Soubor veřejného klíče"
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Zásuvný modul music messaging pro spolupráci při skládání."
 
-#: ../src/protocols/silc/silc.c:1866
-msgid "Private Key file"
-msgstr "Soubor soukromého klíče"
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"Zásuvný modul music messaging umožňuje několika uživatelům zároveň pracovat "
+"na hudebním díle upravováním společné partitury v reálném čase."
 
-#: ../src/protocols/silc/silc.c:1876
-msgid "Cipher"
-msgstr "Šifra"
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:678
+msgid "Notify For"
+msgstr "Upozorňovat na"
 
-#: ../src/protocols/silc/silc.c:1886
-msgid "HMAC"
-msgstr "HMAC"
+#: ../pidgin/plugins/notify.c:697
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Jen když někdo řekne vaši přezdívku"
 
-#: ../src/protocols/silc/silc.c:1889
-msgid "Public key authentication"
-msgstr "Autentizace veřejným klíčem"
+#: ../pidgin/plugins/notify.c:707
+msgid "_Focused windows"
+msgstr "_Aktivní okna"
 
-#: ../src/protocols/silc/silc.c:1892
-msgid "Reject watching by other users"
-msgstr "Odmítnout sledování jinými uživateli"
-
-#: ../src/protocols/silc/silc.c:1895
-msgid "Block invites"
-msgstr "Blokovat pozvání"
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:715
+msgid "Notification Methods"
+msgstr "Metody upozornění"
 
-#: ../src/protocols/silc/silc.c:1898
-msgid "Block IMs without Key Exchange"
-msgstr "Blokovat IM bez výměny klíčů"
+#: ../pidgin/plugins/notify.c:722
+msgid "Prepend _string into window title:"
+msgstr "Připojit _řetězec před nadpis okna:"
 
-#: ../src/protocols/silc/silc.c:1901
-msgid "Reject online status attribute requests"
-msgstr "Odmítat požadavky na stav atributu stavu online"
+#. Count method button
+#: ../pidgin/plugins/notify.c:741
+msgid "Insert c_ount of new messages into window title"
+msgstr "Vložit _počet zpráv do nadpisu okna"
 
-#: ../src/protocols/silc/silc.c:1904
-msgid "Block messages to whiteboard"
-msgstr "Blokovat zprávy na tabuli"
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:750
+msgid "Insert count of new message into _X property"
+msgstr "Vložit počet nových zpráv do vlastnosti _X"
 
-#: ../src/protocols/silc/silc.c:1907
-msgid "Automatically open whiteboard"
-msgstr "Automaticky otevírat tabuli"
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:758
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Nastavit hint manažera oken \"_URGENT\""
 
-#: ../src/protocols/silc/silc.c:1910
-msgid "Digitally sign and verify all messages"
-msgstr "Digitálně podepisovat a ověřovat všechny zprávy"
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:767
+msgid "R_aise conversation window"
+msgstr "Z_výšit okno konverzace"
 
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
-msgid "Creating SILC key pair..."
-msgstr "Vytvářím pár klíčů SILC..."
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:775
+msgid "Notification Removal"
+msgstr "Odstranění upozornění"
 
-#. Hint for translators: Please check the tabulator width here and in
-#. the next strings (short strings: 2 tabs, longer strings 1 tab,
-#. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
-#, c-format
-msgid "Real Name: \t%s\n"
-msgstr "Skutečné jméno: \t%s\n"
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:780
+msgid "Remove when conversation window _gains focus"
+msgstr "Odstranit, když se okno konverzace stane _aktivní"
 
-#: ../src/protocols/silc/util.c:316
-#, c-format
-msgid "User Name: \t%s\n"
-msgstr "Jméno uživatele: \t%s\n"
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:787
+msgid "Remove when conversation window _receives click"
+msgstr "Odstranit, když okno konverzace _přijme kliknutí"
 
-#: ../src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "E-mail: \t\t%s\n"
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:795
+msgid "Remove when _typing in conversation window"
+msgstr "Odstranit při _psaní do okna konverzace"
 
-#: ../src/protocols/silc/util.c:320
-#, c-format
-msgid "Host Name: \t%s\n"
-msgstr "Název počítače: \t%s\n"
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:803
+msgid "Remove when a _message gets sent"
+msgstr "Odstranit, když je _odeslána zpráva"
 
-#: ../src/protocols/silc/util.c:322
-#, c-format
-msgid "Organization: \t%s\n"
-msgstr "Organizace: \t%s\n"
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:812
+msgid "Remove on switch to conversation ta_b"
+msgstr "Odstranit při přepnutí na zá_ložku konverzace"
 
-#: ../src/protocols/silc/util.c:324
-#, c-format
-msgid "Country: \t%s\n"
-msgstr "Země: \t%s\n"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:907
+msgid "Message Notification"
+msgstr "Upozornění na zprávu"
 
-#: ../src/protocols/silc/util.c:325
-#, c-format
-msgid "Algorithm: \t%s\n"
-msgstr "Algoritmus: \t%s\n"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Poskytuje několik způsobů, jak vás upozornit na nepřečtené zprávy."
 
-#: ../src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
-msgstr "Délka klíče: \t%d bitů\n"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Ukázkový zásuvný modul Pidginu"
 
-#: ../src/protocols/silc/util.c:328
-#, c-format
-msgid ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"Otisk veřejného klíče:\n"
-"%s\n"
-"\n"
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Ukázkový zásuvný modul, který něco dělá - viz popis."
 
-#: ../src/protocols/silc/util.c:329
-#, c-format
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
-"Public Key Babbleprint:\n"
-"%s"
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Babbleprint veřejného klíče:\n"
-"%s"
-
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
-msgid "Public Key Information"
-msgstr "Informace o veřejném klíči"
-
-#: ../src/protocols/silc/util.c:516
-msgid "Paging"
-msgstr "Pager"
-
-#: ../src/protocols/silc/util.c:540
-msgid "Computer"
-msgstr "Počítač"
-
-#: ../src/protocols/silc/util.c:544
-msgid "PDA"
-msgstr "PDA"
-
-#: ../src/protocols/silc/util.c:546
-msgid "Terminal"
-msgstr "Terminál"
-
-#: ../src/protocols/silc/wb.c:284
-#, c-format
-msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr "%s odeslal zprávu na tabuli. Chcete otevřít tabuli?"
-
-#: ../src/protocols/silc/wb.c:288
-#, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr "%s odeslal zprávu na tabuli na kanálu %s. Chcete otevřít tabuli?"
-
-#: ../src/protocols/silc/wb.c:302
-msgid "Whiteboard"
-msgstr "Tabule"
-
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
-msgid "Could not write"
-msgstr "Nemohu zapisovat"
+"Toto je opravdu skvělý zásuvný modul, který dělá spoustu věcí:\n"
+"- Říká vám, kdo napsal program, když se přihlásíte\n"
+"- Obrací všechen příchozí text\n"
+"- Odešle zprávu lidem ve vašem seznamu okamžitě, když se přihlásí"
 
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
-msgid "Could not connect"
-msgstr "Nemohu se připojit"
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Barva kurzoru"
 
-#: ../src/protocols/simple/simple.c:994
-msgid "Wrong Password"
-msgstr "Špatné heslo"
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Sekundární barva kurzoru"
 
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
-msgid "Could not create listen socket"
-msgstr "Nemohu vytvořit socket pro poslouchání"
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Barva odkazu"
 
-#: ../src/protocols/simple/simple.c:1474
-msgid "Couldn't resolve host"
-msgstr "Nemohu najít počítač"
+#: ../pidgin/plugins/pidginrc.c:54
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Vodorovné oddělení GtkTreeView"
 
-#: ../src/protocols/simple/simple.c:1572
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
+#: ../pidgin/plugins/pidginrc.c:73
+msgid "Conversation Entry"
+msgstr "Pole konverzace"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../src/protocols/simple/simple.c:1734
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Zásuvný modul protokolu SIP/SIMPLE"
+#: ../pidgin/plugins/pidginrc.c:74
+msgid "Conversation History"
+msgstr "Historie konverzace"
 
-#. *  summary
-#: ../src/protocols/simple/simple.c:1735
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Zásuvný modul protokolu SIP/SIMPLE"
+#: ../pidgin/plugins/pidginrc.c:75
+msgid "Log Viewer"
+msgstr "Prohlížeč záznamů"
 
-#: ../src/protocols/simple/simple.c:1757
-msgid "Publish status (note: everyone may watch you)"
-msgstr "Zveřejnit stav (upozornění: všichni vás mohou sledovat)"
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Request Dialog"
+msgstr "Dialog požadavku"
 
-#: ../src/protocols/simple/simple.c:1763
-msgid "Use UDP"
-msgstr "Používat UDP"
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Notify Dialog"
+msgstr "Dialog upozornění"
 
-#: ../src/protocols/simple/simple.c:1765
-msgid "Use proxy"
-msgstr "Používat proxy"
+#: ../pidgin/plugins/pidginrc.c:253
+msgid "Select Color"
+msgstr "Vyberte barvu"
 
-#: ../src/protocols/simple/simple.c:1767
-msgid "Proxy"
-msgstr "Proxy"
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Vyberte písmo rozhraní"
 
-#: ../src/protocols/simple/simple.c:1769
-msgid "Auth User"
-msgstr "Uživatel pro autentizaci"
+#: ../pidgin/plugins/pidginrc.c:303
+#, c-format
+msgid "Select Font for %s"
+msgstr "Vyberte písmo pro %s"
 
-#: ../src/protocols/simple/simple.c:1771
-msgid "Auth Domain"
-msgstr "Doména autentizace"
+#: ../pidgin/plugins/pidginrc.c:371
+msgid "GTK+ Interface Font"
+msgstr "Písmo rozhraní GTK+"
 
-#: ../src/protocols/toc/toc.c:139
-#, c-format
-msgid "Looking up %s"
-msgstr "Vyhledávám %s"
+#: ../pidgin/plugins/pidginrc.c:391
+msgid "GTK+ Text Shortcut Theme"
+msgstr "Téma GTK+ textu odkazu"
 
-#: ../src/protocols/toc/toc.c:148
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Spojení k %s selhalo"
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:428
+msgid "Interface colors"
+msgstr "Barvy rozhraní"
 
-#: ../src/protocols/toc/toc.c:200
-#, c-format
-msgid "Signon: %s"
-msgstr "Přihlásit: %s"
+#: ../pidgin/plugins/pidginrc.c:452
+msgid "Widget Sizes"
+msgstr "Velikosti widgetů"
 
-#: ../src/protocols/toc/toc.c:482
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Nemohu zapsat soubor %s."
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "Fonts"
+msgstr "Písma"
 
-#: ../src/protocols/toc/toc.c:485
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Nemohu číst soubor %s."
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Nástroje souboru Gtkrc"
 
-#: ../src/protocols/toc/toc.c:488
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Zpráva příliš dlouhá, posledních %s bajtů useknuto."
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Zapsat nastavení do %s%sgtkrc-2.0"
 
-#: ../src/protocols/toc/toc.c:491
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s není momentálně přihlášen."
+#: ../pidgin/plugins/pidginrc.c:511
+msgid "Re-read gtkrc files"
+msgstr "Znovu načíst soubory gtkrc"
 
-#: ../src/protocols/toc/toc.c:494
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "Varování %s není povoleno."
+#: ../pidgin/plugins/pidginrc.c:544
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Ovládání tématu GTK+ Pidginu"
 
-#: ../src/protocols/toc/toc.c:497
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Zpráva byla zahozena, překračujete limit rychlosti serveru."
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Poskytuje přístup k často používaným nastavením gtkrc."
 
-#: ../src/protocols/toc/toc.c:500
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Chat v %s není dostupný."
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Přímý"
 
-#: ../src/protocols/toc/toc.c:503
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Odesíláte zprávy pro %s příliš rychle."
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "Nechá vás odeslat přímý vstup protokolům založeným na textu."
 
-#: ../src/protocols/toc/toc.c:506
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Přišli jste IM od %s, protože byla příliš dlouhá."
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr "Nechá vás odeslat přímý vstup protokolům založeným na textu (XMPP, MSN, IRC, TOC). Pro odeslání stiskněte 'Enter' ve vstupním poli. Sledujte ladicí okno."
 
-#: ../src/protocols/toc/toc.c:509
+#: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Přišli jste o IM %s, protože byla odeslána příliš rychle."
-
-#: ../src/protocols/toc/toc.c:512
-msgid "Failure."
-msgstr "Selhání."
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr "Používáte %s verze %s. Aktuální verze je %s. Můžete ji získat z <a href=\\\"%s\\\">%s</a><hr>"
 
-#: ../src/protocols/toc/toc.c:515
-msgid "Too many matches."
-msgstr "Příliš mnoho odpovědí."
+#: ../pidgin/plugins/relnot.c:79
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Seznam změn:</b><br>%s"
 
-#: ../src/protocols/toc/toc.c:518
-msgid "Need more qualifiers."
-msgstr "Potřebuji více kvalifikátorů."
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Je k dispozici nová verze"
 
-#: ../src/protocols/toc/toc.c:521
-msgid "Dir service temporarily unavailable."
-msgstr "Adresářová služba momentálně není k dispozici."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Upozornění na verzi"
 
-#: ../src/protocols/toc/toc.c:524
-msgid "E-mail lookup restricted."
-msgstr "Vyhledávání podle e-mailu omezeno."
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Pravidelně hledá nové verze."
 
-#: ../src/protocols/toc/toc.c:527
-msgid "Keyword ignored."
-msgstr "Klíčové slovo ignorováno."
+#. *  description
+#: ../pidgin/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "Pravidelně hledá nové verze a upozorní uživatele se seznamem změn.."
 
-#: ../src/protocols/toc/toc.c:530
-msgid "No keywords."
-msgstr "Žádné klíčové slovo."
+#: ../pidgin/plugins/spellchk.c:1962
+msgid "Duplicate Correction"
+msgstr "Duplikátní oprava"
 
-#: ../src/protocols/toc/toc.c:533
-msgid "User has no directory information."
-msgstr "Uživatel nemá žádné informace v adresáři."
+#: ../pidgin/plugins/spellchk.c:1963
+msgid "The specified word already exists in the correction list."
+msgstr "Zadané slovo již v seznamu oprav existuje."
 
-#: ../src/protocols/toc/toc.c:537
-msgid "Country not supported."
-msgstr "Země není podporována."
+#: ../pidgin/plugins/spellchk.c:2177
+msgid "Text Replacements"
+msgstr "Náhrady textu"
 
-#: ../src/protocols/toc/toc.c:540
-#, c-format
-msgid "Failure unknown: %s."
-msgstr "Neznámé selhání: %s."
+#: ../pidgin/plugins/spellchk.c:2200
+msgid "You type"
+msgstr "Píšete"
 
-#: ../src/protocols/toc/toc.c:546
-msgid "The service is temporarily unavailable."
-msgstr "Služba je dočasně nedostupná."
+#: ../pidgin/plugins/spellchk.c:2214
+msgid "You send"
+msgstr "Odesíláte"
 
-#: ../src/protocols/toc/toc.c:549
-msgid "Your warning level is currently too high to log in."
-msgstr "Vaše úroveň výstrahy je momentálně příliš vysoká pro přihlášení."
+#: ../pidgin/plugins/spellchk.c:2228
+msgid "Whole words only"
+msgstr "Jen celá slova"
 
-#: ../src/protocols/toc/toc.c:552
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Připojovali a odpojovali jste se příliš často. Počkejte deset minut a zkuste "
-"to znovu. Pokud to budete dále zkoušet, budete muset čekat ještě déle."
+#: ../pidgin/plugins/spellchk.c:2240
+msgid "Case sensitive"
+msgstr "Rozlišovat velikost písmen"
 
-#: ../src/protocols/toc/toc.c:554
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Došlo k neznámé chybě při přihlašování: %s."
+#: ../pidgin/plugins/spellchk.c:2266
+msgid "Add a new text replacement"
+msgstr "Přidat novou náhradu textu"
 
-#: ../src/protocols/toc/toc.c:557
-#, c-format
-msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Došlo k neznámé chybě, %d. Informace: %s"
+#: ../pidgin/plugins/spellchk.c:2282
+msgid "You _type:"
+msgstr "_Píšete:"
 
-#: ../src/protocols/toc/toc.c:584
-msgid "Invalid Groupname"
-msgstr "Neplatný název skupiny"
+#: ../pidgin/plugins/spellchk.c:2299
+msgid "You _send:"
+msgstr "_Odesíláte:"
 
-#: ../src/protocols/toc/toc.c:668
-msgid "Connection Closed"
-msgstr "Spojení uzavřeno"
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2311
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"_Zachovat velikost písmen (zrušte volbu pro automatické zpracovávání "
+"velikosti písmen)"
 
-#: ../src/protocols/toc/toc.c:708
-msgid "Waiting for reply..."
-msgstr "Čekám na odpověď..."
+#: ../pidgin/plugins/spellchk.c:2313
+msgid "Only replace _whole words"
+msgstr "Nahrazovat jen _celá slova"
 
-#: ../src/protocols/toc/toc.c:786
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC se vrátil z přestávky. Nyní můžete zase odesílat zprávy."
+#: ../pidgin/plugins/spellchk.c:2338
+msgid "General Text Replacement Options"
+msgstr "Obecné možnosti náhrady textu"
 
-#: ../src/protocols/toc/toc.c:989
-msgid "Password Change Successful"
-msgstr "Změna hesla úspěšná"
+#: ../pidgin/plugins/spellchk.c:2339
+msgid "Enable replacement of last word on send"
+msgstr "Povolit náhradu posledního slova při odesílání"
 
-#: ../src/protocols/toc/toc.c:993
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC odeslal příkaz PAUSE."
+#: ../pidgin/plugins/spellchk.c:2370
+msgid "Text replacement"
+msgstr "Náhrada textu"
 
-#: ../src/protocols/toc/toc.c:994
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Když se to stane, TOC ignoruje všechny jemu posílané zprávy a může vás "
-"vykopnout, pokud odešlete zprávu. Gaim zabrání, aby něco prošlo. Je to jen "
-"dočasné, buďte prosím trpěliví."
+"Nahrazuje text v odchozích zprávách podle uživatelem definovaných pravidel."
 
-#: ../src/protocols/toc/toc.c:1549
-msgid "Get Dir Info"
-msgstr "Získat informace adresáře"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+msgid "Buddy Ticker"
+msgstr "Ticker kamarádů"
 
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Nastavit informace o uživateli"
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Vodorovně se posunující verze seznamu kamarádů."
 
-#: ../src/protocols/toc/toc.c:1689
-msgid "Set Dir Info"
-msgstr "Nastavit informace adresáře"
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Zobrazovat časové značky každých"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Časová značka"
 
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Změnit heslo"
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "Zobrazovat časové značky ve stylu iChat"
 
-#: ../src/protocols/toc/toc.c:1811
-#, c-format
-msgid "Could not open %s for writing!"
-msgstr "Nemohu otevřít %s pro zápis!"
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Každých N minut přidává ke konverzacím časové značky ve stylu iChat."
 
-#: ../src/protocols/toc/toc.c:1847
-msgid "File transfer failed; other side probably canceled."
-msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Možnosti formátu časové značky"
 
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
-msgid "Could not connect for transfer."
-msgstr "Nemohu se připojit pro přenos."
+#: ../pidgin/plugins/timestamp_format.c:26
+msgid "_Force 24-hour time format"
+msgstr "_Vnutit 24-hodinový formát času"
 
-#: ../src/protocols/toc/toc.c:2089
-msgid "Could not write file header.  The file will not be transferred."
-msgstr "Nemohu zapsat hlavičku souboru. Soubor nebude přenesen."
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Zobrazovat data v..."
 
-#: ../src/protocols/toc/toc.c:2189
-msgid "Gaim - Save As..."
-msgstr "Gaim - Uložit jako..."
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Konverzace:"
 
-#: ../src/protocols/toc/toc.c:2223
-#, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-msgstr[0] "%s požaduje, aby %s přijal %d soubor: %s (%.2f %s)%s%s"
-msgstr[1] "%s požaduje, aby %s přijal %d soubory: %s (%.2f %s)%s%s"
-msgstr[2] "%s požaduje, aby %s přijal %d souborů: %s (%.2f %s)%s%s"
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Pro zpožděné zprávy"
 
-#: ../src/protocols/toc/toc.c:2230
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vás žádá, abyste jim poslali soubor"
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Pro zpožděné zprávy a v chatech"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "_Záznamy zpráv:"
 
 #. *< type
 #. *< ui_requirement
@@ -11694,813 +16347,691 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: ../pidgin/plugins/timestamp_format.c:151
+msgid "Message Timestamp Formats"
+msgstr "Formáty časových značek zpráv"
+
 #. *< name
 #. *< version
 #. *  summary
+#: ../pidgin/plugins/timestamp_format.c:154
+msgid "Customizes the message timestamp formats."
+msgstr "Upravit formáty časových značek zpráv."
+
 #. *  description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
-msgid "TOC Protocol Plugin"
-msgstr "Zásuvný modul protokolu TOC"
+#: ../pidgin/plugins/timestamp_format.c:156
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Tento zásuvný modul umožňuje uživateli upravit formáty časových značek zpráv "
+"v konverzacích a záznamech."
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "Počítač TOC"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "Port TOC"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
+msgid "Opacity:"
+msgstr "Krytí:"
 
-#: ../src/protocols/yahoo/yahoo.c:712
-msgid "Your Yahoo! message did not get sent."
-msgstr "Vaše zpráva Yahoo! nebyla odeslána."
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
+msgid "IM Conversation Windows"
+msgstr "Okna IM konverzace"
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
-msgid "Buzz!!"
-msgstr "Crr!!"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
+msgid "_IM window transparency"
+msgstr "Průhlednost okna _IM"
 
-#: ../src/protocols/yahoo/yahoo.c:810
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr "Zpráva systému Yahoo! pro %s:"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
+msgid "_Show slider bar in IM window"
+msgstr "_Zobrazovat posuvný pruh v okně IM"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: ../src/protocols/yahoo/yahoo.c:906
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů%s%s"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
+msgid "Remove IM window transparency on focus"
+msgstr "Odstranit průhlednost okna IM při aktivaci"
 
-#: ../src/protocols/yahoo/yahoo.c:912
-msgid "Message (optional) :"
-msgstr "Zpráva (nepovinná):"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
+msgid "Always on top"
+msgstr "Vždy nahoře"
 
-#: ../src/protocols/yahoo/yahoo.c:954
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s (zpětně) odmítl váš požadavek přidat jej do vašeho seznamu kontaktů."
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
+msgid "Buddy List Window"
+msgstr "Okno seznamu kamarádů"
 
-#: ../src/protocols/yahoo/yahoo.c:957
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s (zpětně) zamítl váš požadavek přidat jej do vašeho seznamu kontaktů z "
-"následujícího důvodu: %s."
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
+msgid "_Buddy List window transparency"
+msgstr "Průhlednost okna _seznamu kamarádů"
 
-#: ../src/protocols/yahoo/yahoo.c:960
-msgid "Add buddy rejected"
-msgstr "Přidání kamaráda zamítnuto"
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Odstranit průhlednost okna seznamu kamarádů při aktivaci"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Server Yahoo požádal o použití neznámé metody autentizace. Tato verze Gaim "
-"se pravděpodobně nebude moci úspěšně přihlásit k Yahoo. Hledejte aktualizace "
-"na %s."
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+msgid "Transparency"
+msgstr "Průhlednost"
 
-#: ../src/protocols/yahoo/yahoo.c:1706
-msgid "Failed Yahoo! Authentication"
-msgstr "Selhala autentizace Yahoo!"
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Proměnlivá průhlednost pro seznam kamarádů a konverzace."
 
-#: ../src/protocols/yahoo/yahoo.c:1772
-#, c-format
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Pokusili jste se ignorovat %s, ale tento uživatel je na vašem seznamu "
-"kamarádů.  Kliknutím na \"Ano\" kamaráda odstraníte a budete ignorovat."
-
-#: ../src/protocols/yahoo/yahoo.c:1775
-msgid "Ignore buddy?"
-msgstr "Ignorovat kamaráda?"
-
-#: ../src/protocols/yahoo/yahoo.c:1809
-msgid "Invalid username."
-msgstr "Neplatné jméno uživatele."
-
-#: ../src/protocols/yahoo/yahoo.c:1820
-msgid "Normal authentication failed!"
-msgstr "Normální autentizace selhala!"
-
-#: ../src/protocols/yahoo/yahoo.c:1821
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"Normální metoda autentizace selhala. To znamená, že buď bylo vaše heslo "
-"nesprávné, nebo se změnilo schéma autentizace Yahoo!. Gaim se nyní pokusí "
-"přihlásit pomocí autentizace Web Messenger, což způsobí omezené funkce."
+"Tento zásuvný modul umožňuje proměnlivou alfa průhlednost oken konverzace a "
+"seznamu kamarádů.\n"
+"\n"
+"* Poznámka: Tento zásuvný modul vyžaduje Win2000 nebo vyšší."
 
-#: ../src/protocols/yahoo/yahoo.c:1829
-msgid "Incorrect password."
-msgstr "Nesprávné heslo."
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
+msgid "GTK+ Runtime Version"
+msgstr "Verze runtime GTK+"
 
-#: ../src/protocols/yahoo/yahoo.c:1832
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Váš účet je uzamčen, přihlaste se prosím na WWW stránkách Yahoo!."
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
+msgid "Startup"
+msgstr "Spuštění"
 
-#: ../src/protocols/yahoo/yahoo.c:1835
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Neznámá chyba číslo %d. Přihlášení se na WWW Yahoo! to možná opraví."
+msgid "_Start %s on Windows startup"
+msgstr "_Spouštět %s při spuštění Windows"
 
-#: ../src/protocols/yahoo/yahoo.c:1889
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Nemohu přidat kamaráda %s do skupiny %s do seznamu serveru na účtu %s."
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
+msgid "_Dockable Buddy List"
+msgstr "_Dokovatelný seznam kamarádů"
 
-#: ../src/protocols/yahoo/yahoo.c:1892
-msgid "Could not add buddy to server list"
-msgstr "Nemohu přidat kamaráda do seznamu na serveru"
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Keep Buddy List window on top:"
+msgstr "_Udržovat okno seznamu kamarádů nahoře:"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
-#, c-format
-msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ Slyšitelné %s/%s/%s.swf ] %s"
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
+msgid "Only when docked"
+msgstr "Jen při zadokování"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
-msgid "Unable to read"
-msgstr "Nemohu číst"
-
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
-msgid "Connection problem"
-msgstr "Problém se spojením"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
+msgid "_Flash window when chat messages are received"
+msgstr "_Bliknout oknem, když jsou přijaty zprávy chatu"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Windows Pidgin Options"
+msgstr "Možnosti Pidginu ve Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
+msgid "Options specific to Pidgin for Windows."
+msgstr "Možnosti specifické pro Pidgin pro Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Poskytuje možnosti specifické pro Pidgin pro Windows, například dokování seznamu kamarádů."
+
+#: ../pidgin/plugins/xmppconsole.c:667
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Odhlášen.</font>"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
-msgid "Not at Home"
-msgstr "Nejsem doma"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "Konzola XMPP"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Účet: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>Nepřipojen k XMPP</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Vložte sekci <iq/>."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "Vložte sekci <presence/>."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "Vložte sekci <message/>."
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
-msgid "Not at Desk"
-msgstr "Nejsem u stolu"
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Přijímat a odesílat přímo sekce XMPP."
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
-msgid "Not in Office"
-msgstr "Nejsem v kanceláři"
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
-msgid "On Vacation"
-msgstr "Na dovolené"
+#~ msgid "Crazychat"
+#~ msgstr "Crazychat"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
-msgid "Stepped Out"
-msgstr "Šel jsem ven"
+#~ msgid "Plugin to establish a Crazychat session."
+#~ msgstr "Zásuvný modul pro vytvoření sezení Crazychat."
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
-msgid "Not on server list"
-msgstr "Není na seznamu serveru"
+#~ msgid "Network Configuration"
+#~ msgstr "Nastavení sítě"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
-msgid "Appear Online"
-msgstr "Vypadat připojen"
+#~ msgid "TCP port"
+#~ msgstr "Port TCP"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
-msgid "Appear Permanently Offline"
-msgstr "Vypadat vždy odpojen"
+#~ msgid "UDP port"
+#~ msgstr "Port UDP"
 
-#: ../src/protocols/yahoo/yahoo.c:2888
-msgid "Presence"
-msgstr "Přítomnost"
+#~ msgid "Feature Calibration"
+#~ msgstr "Kalibrace funkcí"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
-msgid "Appear Offline"
-msgstr "Vypadat odpojen"
+#~ msgid "Disabled"
+#~ msgstr "Zakázáno"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
-msgid "Don't Appear Permanently Offline"
-msgstr "Nevypadat vždy odpojen"
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr "Blikat ikonou v oznamovací oblasti pro nepřečtené..."
 
-#: ../src/protocols/yahoo/yahoo.c:2988
-msgid "Join in Chat"
-msgstr "Připojit se k chatu"
+#~ msgid "_Instant Messages:"
+#~ msgstr "_Instant Message:"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
-msgid "Initiate Conference"
-msgstr "Začít konferenci"
+#~ msgid "C_hat Messages:"
+#~ msgstr "Zprávy _chatu:"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
-msgid "Presence Settings"
-msgstr "Nastavení přítomnosti"
+#~ msgid "When my nick is said"
+#~ msgstr "Když je vyslovena má přezdívka"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
-msgid "Start Doodling"
-msgstr "Začít kreslit"
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "Velikost rozbalovače GtkTreeView"
 
-#: ../src/protocols/yahoo/yahoo.c:3060
-msgid "Active which ID?"
-msgstr "Které ID aktivovat?"
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "Odsadit rozbalovače GtkTreeView"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
-msgid "Join who in chat?"
-msgstr "Připojit koho k chatu?"
+#~ msgid "Tools"
+#~ msgstr "Nástroje"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
-msgid "Activate ID..."
-msgstr "Aktivovat ID..."
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr "Určený kamarád nebyl nalezen v kontaktech Evolution."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
-msgid "Join User in Chat..."
-msgstr "Připojit se k uživateli v chatu..."
+#~ msgid "Delay"
+#~ msgstr "Zpoždění"
 
-#: ../src/protocols/yahoo/yahoo.c:3621
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
+#~ msgid ""
+#~ "%d buddy from group %s was not removed because it belongs to an account "
+#~ "which is disabled or offline.  This buddy and the group were not "
+#~ "removed.\n"
+#~ msgid_plural ""
+#~ "%d buddies from group %s were not removed because they belong to accounts "
+#~ "which are currently disabled or offline.  These buddies and the group "
+#~ "were not removed.\n"
+#~ msgstr[0] ""
+#~ "%d kamarád ze skupiny %s nebyl odstraněn, protože patří k účtu, který je "
+#~ "zakázán nebo odpojen. Tento kamarád a skupina nebyli odstraněni.\n"
+#~ msgstr[1] ""
+#~ "%d kamarádi ze skupiny %s nebyli odstraněni, protože patří k účtu, který "
+#~ "je zakázán nebo odpojen. Tito kamarádi a skupina nebyli odstraněni.\n"
+#~ msgstr[2] ""
+#~ "%d kamarádů ze skupiny %s nebylo odstraněno, protože patří k účtu, který "
+#~ "je zakázán nebo odpojen. Tito kamarádi a skupina nebyli odstraněni.\n"
 
-#: ../src/protocols/yahoo/yahoo.c:3626
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vypsat místnosti v síti Yahoo"
+#~ msgid "Group not removed"
+#~ msgstr "Skupina neodstraněna"
 
-#: ../src/protocols/yahoo/yahoo.c:3630
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Získat pozornost uživatele zabzučením"
+#~ msgid "Buddy icon:"
+#~ msgstr "Ikona kamaráda:"
 
-#: ../src/protocols/yahoo/yahoo.c:3634
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
+#~ msgid "Alias..."
+#~ msgstr "Alias..."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
-msgid "Yahoo Protocol Plugin"
-msgstr "Zásuvný modul protokolu Yahoo"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Nickname:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Přezdívka:</b> %s"
 
-#: ../src/protocols/yahoo/yahoo.c:3746
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonsko"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Logged In:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Přihlášen:</b> %s"
 
-#: ../src/protocols/yahoo/yahoo.c:3749
-msgid "Pager host"
-msgstr "Počítač pageru"
-
-#: ../src/protocols/yahoo/yahoo.c:3752
-msgid "Japan Pager host"
-msgstr "Počítač pageru v Japonsku"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Nečinný:</b> %s"
 
-#: ../src/protocols/yahoo/yahoo.c:3755
-msgid "Pager port"
-msgstr "Port pageru"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Offline"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Stav:</b> Odpojen"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
-msgid "File transfer host"
-msgstr "Počítač přenosu souborů"
-
-#: ../src/protocols/yahoo/yahoo.c:3761
-msgid "Japan file transfer host"
-msgstr "Počítač přenosu souborů v Japonsku"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Description:</b> Spooky"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Popis:</b> Vystrašený"
 
-#: ../src/protocols/yahoo/yahoo.c:3764
-msgid "File transfer port"
-msgstr "Port přenosu souborů"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Awesome"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Stav:</b> Skvělý"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
-msgid "Chat room locale"
-msgstr "Locale místnosti chatu"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Stav:</b> Žůžo"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorovat pozvání do konferencí a místností chatu"
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/Nástroje/Sledování kamarádů"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
-msgid "Chat room list URL"
-msgstr "URL seznamu místností chatu"
+#~ msgid "Screen Name:"
+#~ msgstr "Jméno uživatele:"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
-msgid "YCHT host"
-msgstr "Počítač YCHT"
-
-#: ../src/protocols/yahoo/yahoo.c:3780
-msgid "YCHT port"
-msgstr "Port YCHT"
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
-msgid "Write Error"
-msgstr "Chyba při zápisu"
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Možnosti/Zobrazovat _ikonu kamaráda"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:707
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP adresa:</b> %s<br>"
+#~ msgid "IM the user"
+#~ msgstr "IM uživatele"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:783
-msgid "Yahoo! Japan Profile"
-msgstr "Profil Yahoo! Japonsko"
+#~ msgid "Ignore the user"
+#~ msgstr "Ignorovat uživatele"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:784
-msgid "Yahoo! Profile"
-msgstr "Profil Yahoo!"
+#~ msgid "Get the user's information"
+#~ msgstr "Získat informace o uživateli"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:828
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Lituji, v současné době nejsou podporovány profily označené jako obsahující "
-"obsah pro dospělé."
+#~ msgid "Smaller font size"
+#~ msgstr "Menší velikost písma"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:830
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr ""
-"Pokud si přejete zobrazit tento profil, musíte navštívit tento odkaz ve svém "
-"WWW prohlížeči"
+#~ msgid "Insert link"
+#~ msgstr "Vložit odkaz"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
-msgid "Yahoo! ID"
-msgstr "ID Yahoo!"
+#~ msgid "Insert image"
+#~ msgstr "Vložit obrázek"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
-msgid "Hobbies"
-msgstr "Koníčky"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Chyba při spouštění <b>%s</b>: %s"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
-msgid "Latest News"
-msgstr "Nejnovější zprávy"
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "Odesílat neznámé příkazy s \"_lomítkem\" jako zprávy"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
-msgid "Home Page"
-msgstr "Domovská stránka"
+#~ msgid "Show buddy _icons"
+#~ msgstr "Zobrazovat _ikony kamarádů"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
-msgid "Cool Link 1"
-msgstr "Skvělý odkaz 1"
+#~ msgid "Tab Options"
+#~ msgstr "Možnosti záložek"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
-msgid "Cool Link 2"
-msgstr "Skvělý odkaz 2"
+#~ msgid "_Sounds while away"
+#~ msgstr "Z_vuky při nepřítomnosti"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
-msgid "Cool Link 3"
-msgstr "Skvělý odkaz 3"
+#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
+#~ msgstr "Nemohu přehrát zvuk, protože zvolený soubor (%s) neexistuje."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
-msgid "Last Update"
-msgstr "Poslední aktualizace"
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "Nemohu přehrávat zvuk, protože byla zvolena metoda zvuku 'Příkaz', ale "
+#~ "příkaz nebyl nastaven."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Informace o uživateli %s nedostupné"
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "Nemohu přehrávat zvuk, protože nastavený příkaz zvuku nemohl být spuštěn: "
+#~ "%s"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr "Lituji, tento profil je zřejmě v jazyce nebo formátu, který momentálně není podporován."
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "Můžete tento obrázek odeslat jako přenos souboru, vložit jej do této "
+#~ "zprávy, nebo jej používat jako ikonu kamaráda pro tohoto uživatele."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Nemohu získat profil uživatele. To je pravděpodobně dočasný problém na "
-"straně serveru. Zkuste to prosím znovu později."
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Stav</b>: %s"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr "Nemohu získat profil uživatele. To pravděpodobně znamená, že uživatel neexistuje; někdy ale Yahoo! opravdu nemůže najít profil uživatele. Pokud více, že uživatel existuje, zkuste to prosím znovu později."
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Zpráva:</b> %s"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
-msgid "The user's profile is empty."
-msgstr "Profil uživatele je prázdný."
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "Nemohu začít nové hledání"
 
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s odmítl vaše pozvání ke konferenci do místnosti \"%s\", protože \"%s\"."
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "Probíhá pro vás hledání. Počkejte prosím, než skončí."
 
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Pozvání odmítnuto"
+#~ msgid "Connection Failed"
+#~ msgstr "Spojení selhalo"
 
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Nemohu se připojit k chatu"
+#~ msgid "SSL Handshake Failed"
+#~ msgstr "Vyjednávání SSL selhalo"
 
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Neznámá místnost"
+#~ msgid "<b>%s:</b> %s"
+#~ msgstr "<b>%s:</b> %s"
 
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Možná je místnost plná"
+#~ msgid "<b>%s:</b> %s<br>"
+#~ msgstr "<b>%s:</b> %s<br>"
 
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Není k dispozici"
+#~ msgid "Realname"
+#~ msgstr "Skutečné jméno"
 
-#: ../src/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr "Neznámá chyba. Možná se budete muset odhlásit a počkat pět minut, než se budete moci znovu připojit k místnosti chatu"
+#~ msgid "Cannot join %s:"
+#~ msgstr "Nemohu se připojit k %s:"
 
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Nyní diskutujete v %s."
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "Server pro přihlášení vyžaduje TLS/SSL. Zvolte \"Používat TLS, pokud je k "
+#~ "dispozici\" ve vlastnostech účtu"
 
-#: ../src/protocols/yahoo/yahoochat.c:626
-msgid "Failed to join buddy in chat"
-msgstr "Nemohu připojit kamaráda k chatu"
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "Server vás nemohl bez hesla autentizovat"
 
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Maybe they're not in a chat?"
-msgstr "Možná nejsou v chatu?"
+#~ msgid "Use TLS if available"
+#~ msgstr "Používat TLS, pokud je k dispozici"
 
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Fetching the room list failed."
-msgstr "Získávání seznamu místností selhalo."
+#~ msgid "Require TLS"
+#~ msgstr "Vyžadovat TLS"
 
-#: ../src/protocols/yahoo/yahoochat.c:1433
-msgid "Voices"
-msgstr "Hlasy"
+#~ msgid "The user %s wants to add %s to his or her buddy list."
+#~ msgstr "Uživatel %s chce přidat %s do svého seznamu kamarádů."
 
-#: ../src/protocols/yahoo/yahoochat.c:1436
-msgid "Webcams"
-msgstr "WWW kamery"
+#~ msgid "_Authorize"
+#~ msgstr "_Autorizovat"
 
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
-msgid "Unable to fetch room list."
-msgstr "Nemohu získat seznam místností."
+#~ msgid "_Deny"
+#~ msgstr "_Zamítnout"
 
-#: ../src/protocols/yahoo/yahoochat.c:1510
-msgid "User Rooms"
-msgstr "Místnosti uživatele"
+#~ msgid ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
 
-#: ../src/protocols/yahoo/ycht.c:456
-msgid "Connection problem with the YCHT server."
-msgstr "Problém se spojením k servery YCHT."
+#~ msgid "Login server"
+#~ msgstr "Přihlašovací server"
 
-#: ../src/protocols/zephyr/zephyr.c:331
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Při konverzi této zprávy došlo k chybě. Zkontrolujte volbu 'Kódování' v "
-"Editoru účtů)"
+#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
+#~ msgstr "Uživatel %s (%s) chce přidat %s do svého seznamu kamarádů."
 
-#: ../src/protocols/zephyr/zephyr.c:686
-#, c-format
-msgid "Unable to send to chat %s,%s,%s"
-msgstr "Nemohu do chatu poslat %s,%s,%s"
+#~ msgid "Unable to read header from server"
+#~ msgstr "Nemohu číst hlavičku ze serveru"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>Uživatel:</b> %s<br>"
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr "Nemohu číst zprávu ze serveru: %s. Příkaz je %hd, délka je %hd."
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
-msgid "<br>Hidden or not logged-in"
-msgstr "<br>Skrytý nebo nepřihlášen"
+#~ msgid "Unknown server error."
+#~ msgstr "Neznámá chyba serveru."
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
-#, c-format
-msgid "<br>At %s since %s"
-msgstr "<br>Na %s od %s"
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "uživatelé: %s, soubory: %s, velikost: %sGB"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
-msgid "Anyone"
-msgstr "Kdokoli"
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "Nemohu přidat \"%s\" do vašeho seznamu Napsteru"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
-msgid "_Class:"
-msgstr "_Třída:"
+#~ msgid "%s requested your information"
+#~ msgstr "%s požádal o informace o vás"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
-msgid "_Instance:"
-msgstr "_Instance:"
+#~ msgid "%s requested a PING"
+#~ msgstr "%s požádal o PING"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
-msgid "_Recipient:"
-msgstr "_Příjemce:"
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "Zásuvný modul protokolu NAPSTER"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
-#, c-format
-msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Pokus přihlásit se k %s,%s,%s selhal"
+#~ msgid "Invalid password"
+#~ msgstr "Neplatné heslo"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
-msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;přezdívka&gt;: Najít uživatele"
+#~ msgid "Invalid username or password"
+#~ msgstr "Neplatné jméno uživatele nebo heslo"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
-msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;přezdívka&gt;: Najít uživatele"
+#~ msgid "Email Address"
+#~ msgstr "Emailová adresa"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
-msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"instance &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "Přímé IM s %s zavřeno"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
-msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "Přímé IM s %s selhalo"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
-msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instance&gt;: Nastavit instanci, kterou používat v této třídě"
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "Nemohu otevřít Přímé IM"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
-msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Připojit se k novému "
-"chatu"
+#~ msgid "_Connect"
+#~ msgstr "_Připojit"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instance&gt;: Odeslat zprávu na &lt;zpráva,<i>instance</i>,*&gt;"
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Ztratili jste spojení s místností chatu %s."
 
-#: ../src/protocols/zephyr/zephyr.c:2644
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;třída&gt; &lt;instance&gt;: Odeslat zprávu na &lt;<i>třída</i>,"
-"<i>instance</i>,*&gt;"
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "Chat je momentálně nedostupný"
 
-#: ../src/protocols/zephyr/zephyr.c:2650
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;třída&gt; &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;"
-"<i>třída</i>,<i>instance</i>,<i>příjemce</i>&gt;"
+#~ msgid ""
+#~ "Transfer of file %s timed out.\n"
+#~ " Try enabling proxy servers for file transfers in Accounts->%s->Edit "
+#~ "Account->Advanced."
+#~ msgstr ""
+#~ "Přenosu souboru %s vypršel čas.\n"
+#~ " Zkuste povolit proxy servery pro přenos souborů v Účty->%s->Upravit účet-"
+#~ ">Pokročilé."
 
-#: ../src/protocols/zephyr/zephyr.c:2656
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;příjemce&gt;: Odeslat zprávu na &lt;MESSAGE,"
-"<i>instance</i>,<i>příjemce</i>&gt;"
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "Nemohu se přihlásit k proxy pro přenos souborů."
 
-#: ../src/protocols/zephyr/zephyr.c:2661
-msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;třída&gt;: Odeslat zprávu na &lt;<i>třída</i>,PERSONAL,*&gt;"
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr ""
+#~ "Nemohu vytvořit naslouchající socket nebo chybí připojení k proxy AOL."
 
-#: ../src/protocols/zephyr/zephyr.c:2767
-msgid "Resubscribe"
-msgstr "Znovu se přihlásit"
+#~ msgid ""
+#~ "The user %s requires authorization before being added to a buddy list.  "
+#~ "Do you want to send an authorization request?"
+#~ msgstr ""
+#~ "Uživatel %s vyžaduje autorizaci před přidáním do seznamu kamarádů. Chcete "
+#~ "odeslat požadavek na autorizaci?"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
-msgid "Retrieve subscriptions from server"
-msgstr "Získat přihlášení od serveru"
+#~ msgid "Request Authorization"
+#~ msgstr "Požadovat autorizaci"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
-msgid "Zephyr Protocol Plugin"
-msgstr "Zásuvný modul protokolu Zephyr"
+#~ msgid "_Request Authorization"
+#~ msgstr "_Požádat o autorizaci"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
-msgid "Export to .anyone"
-msgstr "Exportovat do .anyone"
+#~ msgid ""
+#~ "The user %u wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Uživatel %u chce přidat %s do svého seznamu kamarádů z následujícího "
+#~ "důvodu:\n"
+#~ "%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
-msgid "Export to .zephyr.subs"
-msgstr "Exportovat do .zephyr.subs"
+#~ msgid "Authorization Request"
+#~ msgstr "Požadavek na autorizaci"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
-msgid "Import from .anyone"
-msgstr "Importovat z .anyone"
+#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>UIN:</B> %s<BR><B>Stav:</B> %s<HR>%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
-msgid "Import from .zephyr.subs"
-msgstr "Importovat z .zephyr.subs"
+#~ msgid "SNAC threw error: %s\n"
+#~ msgstr "SNAC hodil chybu: %s\n"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
-msgid "Realm"
-msgstr "Realm"
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Informace o uživateli %s nedostupné:"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
-msgid "Exposure"
-msgstr "Vystavení"
+#~ msgid "Rate limiting error."
+#~ msgstr "Chyba omezení rychlosti."
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Chyba připojení k proxy %d"
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "Byli jste odpojeni z neznámého důvodu."
 
-#. Forbidden
-#: ../src/proxy.c:1327
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Přístup odepřen: proxy server zakazuje tunelování portu %d."
+#~ msgid ""
+#~ "Your screen name is currently formatted as follows:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Vaše jméno uživatele je aktuálně formátováno následovně:\n"
+#~ "%s"
 
-#: ../src/proxy.c:2327
-msgid "Invalid proxy settings"
-msgstr "Neplatná nastavení proxy"
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "Z neznámého důvodu nemohu přidat kamaráda %s. Nejčastější důvod je, že "
+#~ "máte ve svém seznamu kamarádů maximální počet povolených kamarádů."
 
-#: ../src/proxy.c:2327
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Buď jméno počítače nebo číslo portu uvedené pro vámi zadaný typ proxy je "
-"neplatné."
+#~ msgid ""
+#~ "The user %s wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Uživatel %s chce přidat %s do svého seznamu kamarádů z následujícího "
+#~ "důvodu:\n"
+#~ "%s"
 
-#: ../src/savedstatuses.c:514
-msgid "saved statuses"
-msgstr "uložené stavy"
+#~ msgid "New screen name formatting:"
+#~ msgstr "Nové formátování jména uživatele:"
 
-#: ../src/savedstatuses.c:767
-msgid "I'm not here right now"
-msgstr "Teď tu zrovna nejsem"
+#~ msgid "Format Screen Name..."
+#~ msgstr "Formátovat jméno uživatele..."
 
-#: ../src/server.c:227
-#, c-format
-msgid "%s is now known as %s.\n"
-msgstr "%s je teď znám jako %s.\n"
+#~ msgid "Auth host"
+#~ msgstr "Počítač autentizace"
 
-#: ../src/server.c:681
-#, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr ""
-"%s zve %s do místnosti chatu %s:\n"
-"%s"
+#~ msgid "Auth port"
+#~ msgstr "Port autentizace"
 
-#: ../src/server.c:686
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s zve %s do místnosti chatu %s\n"
+#~ msgid ""
+#~ "Use AIM/ICQ proxy server\n"
+#~ "(slower, but usually works)"
+#~ msgstr ""
+#~ "Používat proxy server AIM/ICQ\n"
+#~ "(pomalejší, ale obvykle funguje)"
 
-#: ../src/server.c:690
-msgid "Accept chat invitation?"
-msgstr "Přijmout pozvání k chatu?"
+#~ msgid ""
+#~ "\n"
+#~ "<b>Supports:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Podporuje:</b> %s"
 
-#: ../src/status.c:153
-msgid "Unset"
-msgstr "Nenastaveno"
+#~ msgid "<b>External User</b><br>"
+#~ msgstr "<b>Externí uživatel</b><br>"
 
-#: ../src/status.c:156
-msgid "Unavailable"
-msgstr "Nedostupný"
+#~ msgid "<b>Full Name:</b> %s<br>"
+#~ msgstr "<b>Celé jméno:</b> %s<br>"
 
-#: ../src/status.c:160
-msgid "Mobile"
-msgstr "Mobilní"
+#~ msgid "<b>Supports:</b> %s<br>"
+#~ msgstr "<b>Podporuje:</b> %s<br>"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s se přihlásil"
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>Stav</b>: %s"
 
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s se vrátil"
+#~ msgid "EMail"
+#~ msgstr "E-mail"
 
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s se odhlásil"
+#~ msgid "Re-type Passphrase"
+#~ msgstr "Heslo (znovu)"
 
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s šel pryč"
+#~ msgid "Reject watching by other users"
+#~ msgstr "Odmítnout sledování jinými uživateli"
 
-#: ../src/status.c:1317
-#, c-format
-msgid "%s became idle"
-msgstr "%s se stal nečinným"
+#~ msgid "Block invites"
+#~ msgstr "Blokovat pozvání"
 
-#: ../src/status.c:1330
-#, c-format
-msgid "%s became unidle"
-msgstr "%s se stal činným"
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Odmítat požadavky na stav atributu stavu online"
 
-#: ../src/status.c:1392
-#, c-format
-msgid "+++ %s became idle"
-msgstr "+++ %s se stal nečinným"
+#~ msgid "Wrong Password"
+#~ msgstr "Špatné heslo"
 
-#: ../src/status.c:1394
-#, c-format
-msgid "+++ %s became unidle"
-msgstr "+++ %s se stal činným"
+#~ msgid "TOC has sent a PAUSE command."
+#~ msgstr "TOC odeslal příkaz PAUSE."
 
-#: ../src/util.c:679
-#, c-format
-msgid "%x %X"
-msgstr "%x %X"
+#~ msgid "TOC host"
+#~ msgstr "Počítač TOC"
 
-#: ../src/util.c:2459
-#, c-format
-msgid "Error Reading %s"
-msgstr "Chyba při čtení %s"
+#~ msgid "TOC port"
+#~ msgstr "Port TOC"
 
-#: ../src/util.c:2460
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr "Při čtení vašeho %s došlo k chybě. Nebylo načteno a starý soubor byl přejmenován na %s~."
+#~ msgid "Message (optional) :"
+#~ msgstr "Zpráva (nepovinná):"
 
-#: ../src/util.c:2899
-msgid "Calculating..."
-msgstr "Počítám..."
+#~ msgid "Normal authentication failed!"
+#~ msgstr "Normální autentizace selhala!"
 
-#: ../src/util.c:2902
-msgid "Unknown."
-msgstr "Neznámá."
+#~ msgid "Unable to read"
+#~ msgstr "Nemohu číst"
 
-#: ../src/util.c:2928
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunda"
-msgstr[1] "%d sekundy"
-msgstr[2] "%d sekund"
+#~ msgid "Pager host"
+#~ msgstr "Počítač pageru"
 
-#: ../src/util.c:2940
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d den"
-msgstr[1] "%d dny"
-msgstr[2] "%d dnů"
+#~ msgid "YCHT host"
+#~ msgstr "Počítač YCHT"
 
-#: ../src/util.c:2948
-#, c-format
-msgid "%s, %d hour"
-msgid_plural "%s, %d hours"
-msgstr[0] "%s, %d hodina"
-msgstr[1] "%s, %d hodiny"
-msgstr[2] "%s, %d hodin"
+#~ msgid "YCHT port"
+#~ msgstr "Port YCHT"
 
-#: ../src/util.c:2954
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hodina"
-msgstr[1] "%d hodiny"
-msgstr[2] "%d hodin"
+#~ msgid "<b>IP Address:</b> %s<br>"
+#~ msgstr "<b>IP adresa:</b> %s<br>"
 
-#: ../src/util.c:2962
-#, c-format
-msgid "%s, %d minute"
-msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d minuta"
-msgstr[1] "%s, %d minuty"
-msgstr[2] "%s, %d minut"
+#~ msgid "%s came back"
+#~ msgstr "%s se vrátil"
 
-#: ../src/util.c:2968
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuta"
-msgstr[1] "%d minuty"
-msgstr[2] "%d minut"
+#~ msgid "%s went away"
+#~ msgstr "%s šel pryč"
 
-#: ../src/util.c:3443
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Chyba při otevírání spojení.\n"
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: Chyba při otevírání spojení.\n"
diff -ru pidgin-2.1.1/po/da.po pidgin-2.2.0/po/da.po
--- pidgin-2.1.1/po/da.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/da.po	2007-09-14 00:45:41.000000000 -0400
@@ -14318,7 +14318,7 @@
 msgstr "Aktivér hvilket ID?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Deltag med hvem i chat?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/de.po pidgin-2.2.0/po/de.po
--- pidgin-2.1.1/po/de.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/de.po	2007-09-14 00:45:41.000000000 -0400
@@ -8,12 +8,13 @@
 # This file is distributed under the same license as the Pidgin package.
 #
 # Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007.
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-16 20:05+0200\n"
-"PO-Revision-Date: 2007-08-16 20:04+0200\n"
+"POT-Creation-Date: 2007-09-11 22:46+0200\n"
+"PO-Revision-Date: 2007-09-11 22:46+0200\n"
 "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +26,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 #: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -67,13 +68,15 @@
 "Migration per Hand. Bitte melden Sie diesen Fehler auf http://developer."
 "pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -89,74 +92,78 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Es sind keine Protokoll-Plugins installiert."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Benutzername:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -168,12 +175,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -190,110 +197,112 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989
+#: ../pidgin/gtkdialogs.c:1009 ../pidgin/gtkdialogs.c:1033
+#: ../pidgin/gtkdialogs.c:1055 ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1239 ../pidgin/gtkdialogs.c:1266
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Speichern"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Konto löschen"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Sie können Konten auf der folgenden Liste (de)aktivieren."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s hat %s zu seinem Buddy gemacht%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s möchte %s zu seiner oder ihrer Buddy-Liste hinzufügen%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorisieren"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Sperren"
 
@@ -317,19 +326,19 @@
 msgid "Error adding buddy"
 msgstr "Fehler beim Hinzufügen des Buddys"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Benutzername"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -338,11 +347,11 @@
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
@@ -355,7 +364,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
@@ -369,9 +378,10 @@
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -383,7 +393,7 @@
 msgid "Auto-join"
 msgstr "Automatisch beitreten"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
@@ -404,8 +414,8 @@
 msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
@@ -437,7 +447,7 @@
 msgid "Retrieving..."
 msgstr "Empfange..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -448,10 +458,10 @@
 msgstr "Buddy-Alarm hinzufügen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1602
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Datei versenden"
 
@@ -496,15 +506,15 @@
 msgid "Confirm Remove"
 msgstr "Entfernen bestätigen"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Buddy-Liste"
@@ -518,15 +528,20 @@
 msgstr "Markierung umkehren"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -536,29 +551,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Am Handy"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -567,12 +582,12 @@
 "Online: %d\n"
 "Gesamt: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -581,49 +596,53 @@
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Neu..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Gespeichert..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:739
+#: ../pidgin/gtkdialogs.c:878 ../pidgin/gtkdialogs.c:959
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:744
+#: ../pidgin/gtkdialogs.c:883 ../pidgin/gtkdialogs.c:964
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:752
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:754
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -640,43 +659,157 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Optionen"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Zeige leere Gruppen"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Nach Status sortieren"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Alphabetisch sortieren"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Nach Größe der Logs sortieren"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Zertifikat-Import"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Geben Sie einen Hostnamen an"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Geben Sie einen Hostnamen für dieses Zertifikat an."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"Die Datei %s kann nicht importiert werden.\n"
+"Stellen Sie sicher, dass die Datei lesbar und im PEM-Format ist.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Zertifikat-Importfehler"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509-Zertifikat-Import gescheitert"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Wählen Sie ein PEM-Zertifikat"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Der Export der Datei %s ist gescheitert.\n"
+"Stellen Sie sicher, dass Sie Schreibrechte auf dem Zielpfad haben\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Zertifikat-Exportfehler"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509-Zertifikat-Export gescheitert"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509-Zertifikat-Export"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Zertifikat für %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL-Host-Zertifikat"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Möchten Sie wirklich das Zertifikat für %s löschen?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Bestätigung des Löschens des Zertifikats"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Zertifikat-Manager"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Rechnername"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Schließen"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -700,42 +833,46 @@
 "Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Nachricht konnte nicht gesendet werden, da Sie nicht angemeldet sind."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -744,48 +881,69 @@
 "\n"
 "%s tippt gerade..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Sie haben diesen Chat verlassen."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
+"mitgeschnitten."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
+"nicht mitgeschnitten."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Senden an"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Gesprächsfenster leeren"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Zeige Zeitstempel"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Buddy-Alarm hinzufügen..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Mitschnitt einschalten"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Klänge aktivieren"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Unterstützte Debug-Optionen sind:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -794,7 +952,7 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -802,13 +960,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-ähnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -816,43 +974,43 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Liste der Benutzer im Chat anzeigen."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Plugin-Fenster anzeigen."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Die Kontaktliste anzeigen."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Das Konten-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Das Einstellungs-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
@@ -878,99 +1036,95 @@
 msgstr "Dateiübertragungen - %d%% von %d Dateien"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Größe"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Verbleibend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Schließe dieses Fenster, wenn alle Übertragungen abgeschlossen sind"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Entferne komplette Übertragungen"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Stopp"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Schließen"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Dateiübertragung"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Die Datei wurde unter %s gespeichert."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fertig"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Übertragung"
 
@@ -982,11 +1136,11 @@
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
-msgstr "Sender"
+msgstr "Abender"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Betreff"
 
@@ -997,17 +1151,17 @@
 msgstr[0] "%s (%s) hat %d neue Nachricht."
 msgstr[1] "%s (%s) hat %d neue Nachrichten."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Info über %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
@@ -1015,11 +1169,7 @@
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Nachricht"
 
@@ -1027,7 +1177,7 @@
 msgid "Join"
 msgstr "Betreten"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Einladen"
 
@@ -1086,7 +1236,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -1094,7 +1244,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
@@ -1108,7 +1257,7 @@
 msgstr "Bei wem alarmieren"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1117,7 +1266,7 @@
 msgstr "Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
@@ -1162,7 +1311,7 @@
 msgstr "eine Nachricht sendet"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Aktion"
 
@@ -1190,70 +1339,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Nur alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Kann Alarm nicht erzeugen"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Sie haben keine Kontos."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Sie müssen ein Konto anlegen, bevor Sie einen Alarm erzeugen können."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Wollen Sie die Alarmierung für %s (Konto %s) wirklich löschen?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s hat aufgehört, Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde untätig (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
@@ -1261,12 +1422,12 @@
 msgid "Based on keyboard use"
 msgstr "Abhängig von Tastaturbenutzung"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Von letzter gesendeter Nachricht"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Niemals"
@@ -1316,12 +1477,12 @@
 msgstr "Ändere Status zu"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Mitschnitt"
 
@@ -1329,106 +1490,106 @@
 msgid "Not implemented yet."
 msgstr "Noch nicht implementiert."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Datei speichern..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Buddy meldet sich an"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Buddy meldet sich ab"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Nachricht empfangen"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Nachricht beginnt neue Unterhaltung"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person betritt den Chat"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person verlässt den Chat"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sie sprechen im Chat"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Andere sprechen im Chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Jemand nennt Ihren Benutzernamen im Chat"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer-Fehler"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer konnte nicht initialisiert werden."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(Standard)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Klang-Datei auswählen..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Klang-Einstellungen"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Kommando"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Kein Klang"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Klang-Ausgabesystem"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Methode: "
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1438,62 +1599,62 @@
 "(%s für den Dateinamen)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Klang-Optionen"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Klang, wenn das Gespräch den Fokus hat"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Immer"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Nur wenn anwesend"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Nur wenn nicht verfügbar"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Lautstärke (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Klang-Ereignisse"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Datei"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Testen"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Auswählen..."
 
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Wollen Sie \"%s\" wirklich löschen"
+msgstr "Wollen Sie „%s“ wirklich löschen"
 
 #: ../finch/gntstatus.c:140
 msgid "Delete Status"
@@ -1503,9 +1664,9 @@
 msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1515,46 +1676,55 @@
 msgid "Type"
 msgstr "Typ"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Nachricht"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Benutzen"
 
@@ -1566,56 +1736,79 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Bitte geben Sie eine nicht-leere Bezeichnung für den Status ein."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Doppelte Bezeichnung"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Bitte geben sie eine andere Bezeichnung für den Status ein."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Unter-Status"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Status bearbeiten"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Benutze einen anderen Status für die folgenden Konten"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Speichern & Übernehmen"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Zertifikate"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Klänge"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Status-Meldungen"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Beim Laden des Plugins traten Fehler auf."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Konnte X-Display nicht finden"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Konnte Fenster nicht finden"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"Dieses Plugin kann nicht geladen werden, da es nicht mit X11-Unterstützung "
+"gebaut wurde."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Zwischenablage-Plugin"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1742,85 +1935,87 @@
 msgid "accounts"
 msgstr "Konten"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Passwort wird für die Anmeldung benötigt."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort für %s (%s) ein"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Bitte füllen Sie alle Felder aus."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändern des Passworts für %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändere die Benutzerinformation für %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddys"
@@ -1829,22 +2024,186 @@
 msgid "buddy list"
 msgstr "Buddy-Liste"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(stimmt nicht überein)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+"%s hat das folgende Zertifikat für den einmaligen Gebrauch präsentiert:"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Zertifikatsüberprüfung für den einmaligen Gebrauch"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Zertifizierungsstelle"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL-Peers-Zwischenspeicher"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Akzeptieren Sie das Zertifikat für %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "SSL-Zertifikatsüberprüfung"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Ablehnen"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "Ze_rtifikat ansehen..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
+"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
+"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Das Zertifikat von „%s“ ist selbstsigniert. Es kann nicht automatisch "
+"geprüft werden."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "SSL-Zertifikatfehler"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Ungültige Zertifikationskette"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
+"überprüft werden."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Das Root-Zertifikat, welches angegeben wird, ist für Pidgin ungültig."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"Die Zertifizierungskette, welche von %s präsentiert wird, hat keine gültige "
+"digitale Signatur von der Zertifizierungsstelle, zu der die Signatur gehört."
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Unbekannte Zertifizierungsstellensignatur"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Aktivierungsdatum: %s\n"
+"Ablaufdatum: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Zertifikat-Information"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registrierungsfehler"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Fehler beim Aufheben der Registrierung"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s hat sich angemeldet"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1868,40 +2227,40 @@
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "Nachricht _senden"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie heißen jetzt %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
@@ -2109,131 +2468,131 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Der Befehl, der \"aim\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „aim“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Der Befehl, der \"gg\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „gg“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Der Befehl, der \"icq\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „icq“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Der Befehl, der \"irc\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „irc“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Der Befehl, der \"msnim\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „msnim“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Der Befehl, der \"sip\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „sip“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Der Befehl, der \"xmpp\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „xmpp“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Der Befehl, der \"ymsgr\"-URLs verarbeitet, wenn aktiviert."
+msgstr "Der Befehl, der „ymsgr“-URLs verarbeitet, wenn aktiviert."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "Behandlungsroutine für \"aim\"-URLs"
+msgstr "Behandlungsroutine für „aim“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "Behandlungsroutine für \"gg\"-URLs"
+msgstr "Behandlungsroutine für „gg“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "Behandlungsroutine für \"icq\"-URLs"
+msgstr "Behandlungsroutine für „icq“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "Behandlungsroutine für \"irc\"-URLs"
+msgstr "Behandlungsroutine für „irc“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "Behandlungsroutine für \"msnim\"-URLs"
+msgstr "Behandlungsroutine für „msnim“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "Behandlungsroutine  für \"sip\"-URLs"
+msgstr "Behandlungsroutine  für „sip“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Behandlungsroutine für \"xmpp\"-URLs"
+msgstr "Behandlungsroutine für „xmpp“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Behandlungsroutine für \"ymsrg\"-URLs"
+msgstr "Behandlungsroutine für „ymsrg“-URLs"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"aim\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „aim“-"
+"URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, \"gg"
-"\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „gg“-"
+"URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"icq\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „icq“-"
+"URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"irc\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „irc“-"
+"URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"msnim\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, "
+"„msnim“-URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"sip\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, „sip“-"
+"URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"xmpp\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, "
+"„xmpp“-URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Aktivieren, wenn der Befehl, der im \"command\"-Schlüssel angegeben ist, "
-"\"ymsgr\"-URLs verarbeiten soll."
+"Aktivieren, wenn der Befehl, der im „command“-Schlüssel angegeben ist, "
+"„ymsgr“-URLs verarbeiten soll."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
@@ -2245,35 +2604,35 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"aim\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „aim“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"gg\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „gg“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"icq\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „icq“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"irc\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „irc“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"msnim\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „msnim“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"sip\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „sip“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"xmpp\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „xmpp“-URLs verarbeiten soll"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Legt fest, ob das angegebene Kommado \"ymsrg\"-URLs verarbeiten soll"
+msgstr "Legt fest, ob das angegebene Kommado „ymsrg“-URLs verarbeiten soll"
 
 #: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -2289,7 +2648,7 @@
 
 #: ../libpurple/log.c:625
 msgid "Old flat format"
-msgstr "Altes \"flaches\" Format"
+msgstr "Altes „flaches“ Format"
 
 #: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
@@ -2398,8 +2757,7 @@
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"Automatisch akzeptierte Übertragung der Datei \"%s\" von \"%s\" "
-"abgeschlossen."
+"Automatisch akzeptierte Übertragung der Datei „%s“ von „%s“ abgeschlossen."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2421,12 +2779,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "A_bbrechen"
@@ -2469,8 +2827,8 @@
 "Dateiübertragung abgeschlossen ist\n"
 "(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Notizen"
 
@@ -2895,27 +3253,27 @@
 "Die folgenden Nachrichten werden als Alarm gesichert. Sie können den Alarm "
 "im `Buddy-Alarm'-Dialog ändern oder löschen."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" ist im Moment offline. Möchten Sie die restlichen Nachrichten in "
-"einem Alarm sichern? Diese Nachrichten würden dann automatisch gesendet, "
-"wenn sich \"%s\" wieder anmeldet."
+"„%s“ ist im Moment offline. Möchten Sie die restlichen Nachrichten in einem "
+"Alarm sichern? Diese Nachrichten würden dann automatisch gesendet, wenn sich "
+"„%s“ wieder anmeldet."
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Offline-Nachrichten"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Sie können den Alarm im `Buddy-Alarm'-Dialog ändern/löschen"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2925,9 +3283,9 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2937,11 +3295,11 @@
 msgid "No"
 msgstr "Nein"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Sichere Offline-Nachricht als Alarm"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Nicht nachfragen. Immer als Alarm sichern."
 
@@ -3035,13 +3393,19 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests, um zu sehen, ob das meiste funktioniert."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "X.509-Zertifikate"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3049,8 +3413,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "Erlaubt SSL-Unterstützung mit GNUTLS."
 
@@ -3060,7 +3424,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
 msgid "NSS"
 msgstr "NSS"
 
@@ -3068,8 +3432,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Erlaubt SSL-Unterstützung mit Mozilla NSS."
 
@@ -3183,25 +3547,25 @@
 
 # old strings
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
 msgid "First name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3210,13 +3574,13 @@
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-Konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP-Konto"
 
@@ -3230,27 +3594,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-Protokoll-Plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple-Person"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Rechnername"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3262,32 +3617,32 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s hat das Gespräch beendet."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Kann die Socket nicht öffnen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Fehler beim Setzen der Socket-Optionen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Kann die Socket nicht an den Port binden"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Kann nicht an der Socket hören"
 
@@ -3363,47 +3718,49 @@
 msgid "Registration completed successfully!"
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Geben Sie das aktuelle Kürzel ein"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Aktuelles Kürzel"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Bitte füllen sie die folgenden Felder aus"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stadt"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3411,243 +3768,243 @@
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Männlich oder weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Männlich"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Nur online"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Suche Buddys"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Bitte geben Sie Ihre Suchkriterien unten ein"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Füllen Sie die Felder aus."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Ihr aktuelles Passwort ist anders als das angegebene."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Konnte das Passwort nicht ändern. Es trat ein Fehler auf.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Ändern des Passworts für dieses Gadu-Gadu-Konto"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Das Passwort wurde erfolgreich geändert!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu Passwort ändern"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Wählen sie einen Chat für den Benutzer: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Zum Chat hinzufügen..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Verfügbar"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Öffentliches Gadu-Gadu-Verzeichnis"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Keine entsprechenden Benutzer gefunden"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Buddy-Liste heruntergeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Ihre Buddy-Liste wurde von Server geladen."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Buddy-Liste hochgeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Sperren"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Chatfehler"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Nicht mit dem Server verbunden."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Passwort ändern..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Buddy-Liste zum Server hochladen"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Buddy-Liste vom Server herunterladen"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Löschen der Buddy-Liste vom Server"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Buddy-Liste in Datei speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
@@ -3662,16 +4019,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-Protokoll-Plugin"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Beliebter polnischer IM-Dienst"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
@@ -3728,7 +4085,8 @@
 msgstr "MOTD für %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Serververbindung wurde unterbrochen"
 
@@ -3742,7 +4100,7 @@
 msgstr "_Kanal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Passwort:"
 
@@ -3750,65 +4108,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-Nicknamen dürfen keine Leerzeichen enthalten"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Verbindung fehlgeschlagen"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake gescheitert"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Fehler beim Lesen"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Thema"
 
@@ -3820,47 +4175,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Das IRC-Protokoll-Plugin mit weniger Problemen"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3876,7 +4232,7 @@
 msgid "Username"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3886,7 +4242,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Benutze SSL"
 
@@ -3917,7 +4273,7 @@
 msgstr " <i>(identifiziert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4200,7 +4556,7 @@
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
@@ -4331,6 +4687,22 @@
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen."
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Unbekannter Fehler"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad Hoc-Kommando gescheitert"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "Ausführen"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
@@ -4343,8 +4715,8 @@
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
 "unverschlüsselten Kanal"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4354,33 +4726,33 @@
 "Verbindung.  Wollen Sie dies erlauben und mit der Authentifikation "
 "fortfahren?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Ungültige Serverantwort."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4388,113 +4760,114 @@
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
 "unverschlüsselten Kanal.  Wollen Sie dies erlauben und fortfahren?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL-Fehler"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Straße"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Ort"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Region"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Funktion"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "XMPP-vCard bearbeiten"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4502,116 +4875,385 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Letzte Aktivität"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Information zur Dienstsuche"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Elemente der Dienstsuche"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Erweiterte Blockadressierung"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Mehrbenutzer-Chat"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat "
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "Bandinterner Bytestrom("
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Ad Hoc-Kommando"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub-Dienst"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5-Bytestrom"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Bandexterne Daten"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "Bandinterne Registrierung"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Benutzerort"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Benutzer-Avatar"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Chat-Status-Benachrichtigung"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Software-Version"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Strom-Initialisierung"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Dateiübertragung"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Benutzerstimmung"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Benutzeraktivität"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Instanz-Fähigkeiten"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Aushandlung einer verschlüsselten Sitzung"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "Benutzer anpassen"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr "Mitgliedsverzeichnis-Eintragsaustausch"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr "Erreichbare Adresse"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Benutzerprofil"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle-Klang"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Benutzer-Spitzname"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr "Jingle Raw UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle-Video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Nachrichtempfänge"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Öffentliche Schlüssel-Veröffentlichung"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "Benutzer, die chatten"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "Benutzer, die im Web surfen"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "Benutzer, die spielen"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "Benutzer, die schauen"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Blockverschlüsselung"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Instanzzeit"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Verzögerte Lieferung"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Kooperative Datenobjekte"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "Speicherbereich und gemeinsame Benutzung von Dateien"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "STUN-Dienstsuche für Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Vereinfachte Aushandlung der verschlüsselten Sitzung"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Hop-Überprüfung"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Fähigkeiten"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Anmelden"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Abmelden"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "Dies sind die Ergebnisse Ihrer Suche"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4619,71 +5261,71 @@
 "Suchen Sie einen Kontakt durch Eingabe von Suchkriterien in den angegebenen "
 "Feldern. Hinweis: Jedes Feld unterstützt die Suche mit Platzhaltern (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "Konnte die Anfrage beim Verzeichnisdienst nicht durchführen."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Suche nach XMPP-Benutzern"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Wählen Sie ein Benutzerverzeichnis zum Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Raum:"
 
@@ -4774,25 +5416,30 @@
 msgid "Find Rooms"
 msgstr "Finde Räume"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Fehler bei Initialisieren der Sitzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Sie fordern Verschlüsselung, aber diese ist auf dem Server nicht verfügbar."
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:483
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4801,55 +5448,70 @@
 "Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "Ungültige XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Falsche XMPP-ID. Die Domain muss gesetzt werden."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Registrierung von %s erfolgreich"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Registrierung erfolgreich"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Unbekannter Fehler"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Registrierung von %s erfolgreich entfernt"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "Aufheben der Registrierung erfolgreich"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "Aufheben der Registrierung gescheitert"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Schon registriert"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4859,378 +5521,541 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "Aufheben der Registrierung"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Bitte füllen Sie die unten stehenden Kontoinformationen aus, um Ihr Konto zu "
+"registrieren."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Bitte füllen Sie die unten stehenden Informationen aus, um ein neues Konto "
 "zu registrieren."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Registrierung eines neuen XMPP-Kontos"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Ändern der Kontoregistrierung für %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Registrierung eines neuen Kontos von %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Ändere Registrierung"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "Fehler beim Aufheben der Kontenregistrierung"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "Kontenregistrierung erfolgreich aufgehoben"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Initialisiere SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "Von"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "Zu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Kein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Stimmung"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Stimmungstext"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "Künstler anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "Titel anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "Album anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "Genre anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Comment"
+msgstr "Kommentar anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "Track anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "Zeit anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "Jahr anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "URL anpassen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Allow Buzz"
+msgstr "Anklopfen erlauben"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "XMPP-Passwort ändern"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Passwort ändern..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Falsche Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Feature nicht implementiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Gegangen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "Falsche XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Empfänger nicht verfügbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Zeitüberschreitung beim Remote-Server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Server überlastet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Ungültige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Temporärer Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Präfix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Falsche Adressierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Ungültiger Namenraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Eingeschränkte Ressourcen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterstützt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterstützter Blocktyp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Nicht-unterstützte Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht „wohlgeformt“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugehörigkeit: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu „%s“ zuordnen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: „%s“"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kann die Rolle „%s“ für den Benutzer nicht setzen: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Kann den Benutzer %s nicht anpingen"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "Kann nicht anklopfen, da nichts über den Benutzer %s bekannt ist."
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr "Kann nicht anklopfen, da der Benutzer %s vielleicht offline ist."
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Kann nicht anklopfen, da der Benutzer %s dies nicht unterstützt."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5238,7 +6063,7 @@
 "affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
 "eine Benutzerzugehörigkeit für den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5246,26 +6071,35 @@
 "role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
 "Rolle für den Benutzer im Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tBenutzer/Kommponente/Server anpingen."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5276,84 +6110,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-Protokoll-Plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "SSL/TLS voraussetzen"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Verbindungsport"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Verbindungsserver"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s hat das Gespräch verlassen."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Nachricht von %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s hat das Thema zu %s abgeändert"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "Das Thema ist: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Nachrichtenzustellung an %s fehlgeschlagen: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "XMPP-Nachrichtenfehler"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s hat bei Ihnen angeklopft!"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5361,63 +6209,109 @@
 "Sie erstellen einen neuen Chat-Raum.  Möchten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Kann die Datei nicht an %s senden, da der Client des Benutzers keine "
 "Dateiübertragung unterstützt"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Senden der Datei gescheitert"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kann die Nachricht an %s nicht senden, ungültige JID"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kann die Datei nicht an %s senden, Benutzer ist nicht online"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Kann die Datei nicht an %s senden, Anwesenheit des Benutzers nicht abonniert"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 "Bitte wählen Sie, welcher Ressource von %s Sie eine Datei schicken möchten"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Wählen Sie eine Ressource"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "Benutzerstimmung ändern"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Bitte setzen Sie eine Stimmung aus der Liste"
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Setzen"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "Setze Stimmung..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "Setze Benutzer-Spitzname"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "Bitte geben Sie den neuen Spitznamen für ein."
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Diese Information ist sichtbar für alle Kontakte in Ihrer Kontaktliste. So "
+"wählen Sie passendes."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Setze Spitzname..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Aktionen"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Wählen Sie eine Aktion"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5672,39 +6566,49 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-Fehler: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Sie haben gerade angeklopft!"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Anstoßen"
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s hat Sie angestoßen!"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "%s anstoßen..."
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Ihr neuer MSN-Benutzername zu lang."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Setze Ihren Spitznamen."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Setze Ihre private Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Setze Ihre geschäftliche Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Setze Ihre Handynummer."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Erlaube die SMS-Seiten von MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5712,132 +6616,134 @@
 "Möchten Sie anderen Leuten in Ihrer Buddy-Liste erlauben oder verbieten, "
 "Ihnen Nachrichten an Ihre Handy oder an andere mobile Geräte zu senden?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Verbieten"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Eine SMS senden."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Nachricht"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Hat Sie"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Bin gleich zurück"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Setze geschäftliche Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Setze Handynummer..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Erlaube/verbiete mobile Geräte..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Erlaube/verbiete mobile Webseiten..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Öffne Hotmail-Posteingang"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Sende an mobiles Gerät"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiiere _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
 "unterstützte SSL-Bibliothek."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Allgemein"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alter"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5845,188 +6751,188 @@
 msgid "Location"
 msgstr "Ort"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Hobbys und Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "Einige Informationen über mich"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Sozial"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Haustiere"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Bisherige Wohnorte"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Kontakt-Info"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Privat"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Andere wichtige Dinge"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Telefon (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Handy (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "E-Mail (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "IM (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Geschäftlich"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Telefon (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Telefon 2 (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Handy (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Pager (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Fax (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "E-Mail (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "IM (geschäftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Lieblingsdinge"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein öffentliches Profil erstellt."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6036,7 +6942,7 @@
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein öffentliches Profil angelegt hat."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6044,7 +6950,7 @@
 "Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
 "existiert wahrscheinlich nicht."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL des Profils"
@@ -6059,19 +6965,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt anstoßen, um seine Aufmerksamkeit zu erhalten"
 
@@ -6090,8 +6996,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Verbindung nicht möglich"
 
@@ -6313,11 +7219,6 @@
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s hat Sie gerade angestoßen!"
-
 #: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -6337,6 +7238,405 @@
 msgid "The screen name specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Verschlüsselung fehlt"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Die RC4-Verschlüsselung konnte nicht gefunden werden"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Benutzen sie libpurple mit RC4-Unterstützung (>= 2.0.1). MySpaceIM-Plugin "
+"wird nicht geladen."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Passwörter mit mehr als %d Zeichen (Ihres hat %d) werden von MySpace leider "
+"nicht unterstützt."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-Fehler"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Lese Challenge"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Unerwartete Challenge-Länge vom Server"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Logge ein"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+"Verbindung zum Server verloren (seit %d Sekunden keine Daten empfangen)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Neue Mail-Nachrichten"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Neue Blog-Kommentare"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Neue Profil-Kommentare"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Neue Freundschaftsanfragen!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Neue Bild-Kommentare"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Verbunden"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Kein Benutzername gesetzt"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Bitte besuchen Sie http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username und wählen sie einen Benutzernamen und versuchen "
+"Sie sich erneut anzumelden."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokollfehler, Code %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Kontakt konnte nicht hinzugefügt werden"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy'-Kommando gescheitert."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "'persist'-Kommando gescheitert"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Kein solcher Benutzer: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Benutzersuche"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Kontakt konnte nicht entfernt werden"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy'-Kommando gescheitert"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "'blocklist'-Kommando gescheitert"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Ungültige Eingabebedingung"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Lesepuffer voll"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Kann die Nachricht nicht parsen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Konnte nicht zum Host verbinden: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "IM-Freunde"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d Buddys wurden vom Server hinzugefügt oder aktualisiert (inklusive der "
+"Buddys, die schon auf der Serverliste sind)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Kontakte vom Server hinzufügen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Freunde von MySpace.com hinzufügen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Importieren der Freunde fehlgeschlagen"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Finde Leute..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "IM-Namen ändern..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim-URL-Behandlungsroutine"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+"Es konnte kein geeignetes MySpaceIm-Konto zum öffnen dieser myim-URL "
+"gefunden werden."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+"Aktivieren Sie das passende MySpaceIM-Konto und versuchen Sie es erneut."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Displaynamen im Statustext anzeigen"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Überschrift im Statustext anzeigen"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Emoticons senden"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Bildschirmauflösung (dpi)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Basis-Schriftgrüße (Punkt)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Benutzer"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "Überschrift"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Lied"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Freunde insgesamt"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Client-Version"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Zappen"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s hat sich Dich abgeknallt!"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Knalle %s ab..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Schlag"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s hat Sie geschlagen!"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Schlage %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Abfackeln"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s hat Sie abgefackelt!"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "%s abfackeln..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Schmusen"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s hat mit Ihnen geschmust!"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Schmusen mit %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Umarmen"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s hat sich mit Ihnen umarmt!"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Umarme %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Klaps"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s hat Ihnen einen Klaps gegeben!"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Klopfe %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Gans"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s hat Sie zur Gans gemacht!"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "%s zur Gans machen..."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five (gegenseitiges Hände klatschen)"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s hat sich mit Ihnen in die Hände geklatscht!"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "In die Hände klatschen mit %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Punk"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s hat Sie zum Punk gemacht!"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr "%s zum Punk machen..."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Himbeere"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s hat Sie zur Himbeere gemacht!"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "%s zur Himbeere machen..."
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Erforderliche Parameter nicht übergeben"
@@ -6582,7 +7882,7 @@
 msgstr "Hauspostcode"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -6702,8 +8002,8 @@
 msgstr "Server-Port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6711,8 +8011,8 @@
 msgstr "Der Server hat die Verbindung beendet."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6761,7 +8061,7 @@
 msgstr "IRC-Protokoll-Plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodierung"
@@ -6793,7 +8093,7 @@
 msgid "Direct IM established"
 msgstr "Direkt-IM hergestellt"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datei %s (%s) ist größer als die maximale Größe von %s."
@@ -6917,8 +8217,8 @@
 "Client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
@@ -6940,7 +8240,7 @@
 msgstr "Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Datei abrufen"
 
@@ -7013,17 +8313,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Beschäftigt"
 
@@ -7033,8 +8333,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -7043,13 +8343,13 @@
 msgstr "Online"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-Adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Warnstufe"
 
@@ -7101,14 +8401,14 @@
 "Leerzeichen enthalten oder nur aus Ziffern bestehen."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Ungültiger Benutzername."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
@@ -7161,10 +8461,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -7201,33 +8501,33 @@
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Autorisierungsanfrage:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Bitte autorisiere mich!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7238,19 +8538,19 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ-Autorisierung verweigert."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %u hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7263,7 +8563,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7276,7 +8576,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7289,24 +8589,24 @@
 "Nachricht:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Möchten Sie diesen Buddy zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Ablehnen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -7314,7 +8614,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie ungültig waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -7322,7 +8622,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu groß waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7335,7 +8635,7 @@
 "Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
 "überschritten wurde."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -7344,7 +8644,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -7353,7 +8653,7 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7363,55 +8663,47 @@
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Unbekannter Grund."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Benutzerinformation nicht verfügbar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Online seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Fähigkeiten"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Verfügbarkeitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Profil"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung könnte unterbrochen sein."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7419,7 +8711,7 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
 "Zeichen enthält.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7428,84 +8720,84 @@
 "Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
 "Sie es erneut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Persönliche Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Die folgende Benutzername ist verbunden mit %s"
 msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
 "bestätigen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Konten-Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7514,14 +8806,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ungültig "
 "ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7530,7 +8822,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7539,7 +8831,7 @@
 "Error 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon eine "
 "laufende Anfrage für diesen Benutzernamen gibt."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7548,7 +8840,7 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon zu viele "
 "E-Mail-Adressen gibt, die zum Benutzernamen gehören."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7557,32 +8849,32 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie müssen direkt verbunden sein, um IM-"
 "Bilder senden zu können."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7592,7 +8884,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7607,11 +8899,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten.  Es wurde für Sie "
 "abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7626,11 +8918,11 @@
 "Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
 "überschritten.  Sie wurde für Sie abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7642,17 +8934,17 @@
 "beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
 "Ziffern bestehen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7661,15 +8953,15 @@
 "versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
 "ein paar Stunden wieder verfügbar sein."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7678,17 +8970,17 @@
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7697,24 +8989,24 @@
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
 "Möchten Sie ihn hinzufügen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7725,53 +9017,53 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie können keine IM-Bilder in AIM-Chats "
 "senden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7779,66 +9071,66 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortfahren?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
 "Leerzeichen ändern."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7847,73 +9139,73 @@
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7921,26 +9213,26 @@
 "Benutze immer den AIM/ICQ-Proxyserver\n"
 "(langsamer, aber zeigt Ihre IP-Adresse nicht)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Frage %s, ob er sich zu uns auf %s:%hu für Direkt-IM verbinden möchte."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Verbindungsversuch mit %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Verbindungsversuch über einen Proxyserver."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s hat nach einer direkten Verbindung zu %s gefragt"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8150,14 +9442,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Tut mir Leid, du bist nicht mein Typ..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Ablehnen"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlug"
@@ -8287,12 +9571,12 @@
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr "Sie [%d] haben die Gruppe \"%d\" verlassen"
+msgstr "Sie [%d] haben die Gruppe „%d“ verlassen"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "Sie [%d] wurden der Gruppe \"%d\" hinzugefügt"
+msgstr "Sie [%d] wurden der Gruppe „%d“ hinzugefügt"
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
@@ -8563,7 +9847,8 @@
 msgstr "Sie wurden von %s hinzugefügt"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8597,10 +9882,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Möchten Sie ihn hinzufügen?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Verbindung geschlossen (schreibend)"
@@ -8664,10 +9945,6 @@
 msgid "Starting Services"
 msgstr "Starte Dienste"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Verbunden"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8690,7 +9967,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Verbindung zum Server nicht möglich"
 
@@ -8711,37 +9988,33 @@
 msgid "Place Closed"
 msgstr "Platz geschlossen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Dateiübertragung"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Unterstützt"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Externer Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Konferenz mit dem Benutzer beginnen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8750,27 +10023,27 @@
 "Bitte geben sie ein Thema für die neue Konferenz und eine "
 "Einladungsnachricht für %s ein"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Neue Konferenz"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Erzeugen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Verfügbare Konferenzen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Neue Konferenz erzeugen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Benutzer zu einer Konferenz einladen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8781,27 +10054,27 @@
 "möchten. Wählen sie „Neue Konferenz erzeugen“, wenn Sie den Benutzer zu "
 "einer neuen Konferenz einladen möchten."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Zur Konferenz einladen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Thema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8810,42 +10083,42 @@
 "Es wurde kein Rechner für das Meanwhile-Konto %s angegeben. Bitte geben Sie "
 "einen Rechner an, um die Anmeldung fortzusetzen."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile-Verbindungseinstellungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unbekannt (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Letzter bekannter Client"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Eine mehrdeutige ID wurde angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8855,15 +10128,15 @@
 "beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Benutzer wählen"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Kann den Benutzer nicht hinzufügen: Benutzer nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8872,11 +10145,11 @@
 "Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
 "Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8885,63 +10158,63 @@
 "Fehler beim Lesen von %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Entfernt gespeicherte Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Buddy-Listen-Speicherungsmethode"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Nur lokale Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Mit Buddy-Liste vom Server zusammenführen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Buddy-Liste zusammenführen und zum Server exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Buddy-Liste mit Server abgleichen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s importieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe existiert"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Eine Gruppe mit dem Namen '%s' existiert bereits in Ihrer Buddy-Liste."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Kann die Gruppe nicht hinzufügen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Mögliche Übereinstimmungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes-Adressbuchgruppenergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8952,15 +10225,15 @@
 "Adressbuchgruppen. Bitte wählen Sie die richtige Gruppe aus der Liste, um "
 "sie Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Wählen Sie das Notes-Adressbuch"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8969,11 +10242,11 @@
 "Der Bezeichner '%s' stimmt mit keiner Notes-Adressbuchgruppe in Ihrer "
 "Sametime-Community überein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes-Adressbuchgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8981,12 +10254,12 @@
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
 "Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzufügen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Suchergebnisse für '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8998,31 +10271,30 @@
 "können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Der Bezeichner '%s' stimmt mit keinem Benutzer in Ihrer Sametime-Community "
 "überein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Suche nach einem Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -9030,32 +10302,32 @@
 "Geben die einen Namen oder den Teil einer ID in das folgende Feld ein, um "
 "nach entsprechenden Benutzern in Ihrer Sametime-Community zu suchen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Benutzersuche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Import der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Zum Notes-Adressbuch hinzufügen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Benutzersuche..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Erzwinge Login (ignoriere Serverumleitungen)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Client-Identität verbergen"
 
@@ -9445,14 +10717,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1545
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
-msgstr "Benutzermodi"
-
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Stimmung"
+msgstr "Benutzermodi"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
@@ -10122,13 +11387,6 @@
 msgstr "Netzwerkstatistik"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping fehlgeschlagen"
@@ -10288,7 +11546,7 @@
 msgstr "Ihre momentane Stimmung"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10689,7 +11947,7 @@
 msgstr "Sichere Internet Live Konferenz (SILC) Protokoll"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -10955,26 +12213,26 @@
 msgstr "Konnte nicht schreiben"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Verbinden nicht möglich"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Konnte den Hostnamen nicht auflösen"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -10986,36 +12244,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
@@ -11180,8 +12438,8 @@
 msgid "Password Change Successful"
 msgstr "Passwortänderung erfolgreich"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -11244,32 +12502,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesenden, die noch nicht unterstützt wird."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s hat Ihnen gerade einen Kick gegeben!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-Systemnachricht für %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Nachricht für die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
-"Buddy-Liste hinzufügen."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11278,11 +12530,18 @@
 "%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzufügen und zwar aus folgendem Grund: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s hat (rückwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
+"Buddy-Liste hinzufügen."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Hinzufügen des Buddys zurückgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11293,11 +12552,11 @@
 "Sie werden wahrscheinlich nicht in der Lage sein, Sich erfolgreich bei Yahoo "
 "anzumelden.  Prüfen Sie %s auf Updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo-Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11306,53 +12565,53 @@
 "Sie haben versucht %s zu ignorieren, aber der Benutzer ist in Ihrer Buddy-"
 "Liste.  Wenn Sie auf „Ja“ klicken, wird der Buddy entfernt und ignoriert."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
 "sich auf der Yahoo! Webseite anmelden."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
 "hinzufügen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Ungültige HTTP-Antwort vom Server empfangen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11361,7 +12620,7 @@
 "Verbindung zu %s verloren:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11370,111 +12629,112 @@
 "Die Verbindung mit %s konnte nicht hergestellt werden:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Nicht am Schreibtisch"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Nicht im Büro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "Hinausgegangen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Online erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Präsenz"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Chat betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Konferenz einleiten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Anwesenheitseinstellungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate which ID?"
 msgstr "Welche ID aktivieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Aktiviere ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Einen Benutzer zum Chat einladen..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Open Inbox"
 msgstr "Öffne Posteingang"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
-msgid "You have just sent a Buzz!"
-msgstr "Sie haben gerade einen Kick versandt!"
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Anklopfen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "%s anklopfen..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
@@ -11488,56 +12748,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Pager-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Pager-Server (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Pager-Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Server für Dateiübertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Server für Dateiübertragungen (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Port für Dateiübertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Chatraum-Gebiet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Yahoo-Chat-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Yahoo-Chat-Port"
 
@@ -11654,35 +12914,35 @@
 msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s lehnte Ihre Konferenzeinladung in den Raum „%s“ ab, da „%s“."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Einladung zurückgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Der Chat kann nicht betreten werden"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Unbekannter Raum"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Vielleicht ist der Raum voll"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11690,38 +12950,38 @@
 "Unbekannter Fehler. Sie müssen sich eventuell abmelden und fünf Minuten "
 "warten, bevor sie wieder einen Chatraum betreten können"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sie chatten jetzt in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Vielleicht sind sie nicht im Chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Abrufen der Raumliste gescheitert."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Stimmen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Kamm die Raumliste nicht abrufen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Benutzerräume"
 
@@ -11751,11 +13011,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kann nicht an den Chat %s,%s,%s senden"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Benutzer"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11980,7 +13235,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s heißt jetzt %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Bitte um %s's Aufmerksamkeit..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s hat um Ihre Aufmerksamkeit gebeten!"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11989,20 +13254,36 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s hat %s in den Chatraum %s eingeladen\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL-Verbindung gescheitert"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL-Verhandlung gescheitert"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "Der SSL-Peer hat ein ungültiges Zertifikat präsentiert"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Unbekannter SSL-Fehler"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Nicht stören"
 
@@ -12054,12 +13335,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12068,67 +13349,67 @@
 "Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
 "und die alte Datei wurde in %s~ umbenannt."
 
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Konnte %s nicht öffnen: Zu oft weitergeleitet"
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12137,17 +13418,17 @@
 "Nicht genug Speicher für die Inhalte von %s verfügbar.  Eventuell versucht "
 "der Web-Server etwas böses zu tun."
 
-#: ../libpurple/util.c:3727
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
@@ -12173,37 +13454,37 @@
 msgstr "Die Ausrichtung der Kontrollleiste."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Benutzer_name:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Lokaler _Alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Pass_wort speichern"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Benachrichtigung über neue _Mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Dieses Buddy-_Icon für dieses Konto benutzen:"
 
@@ -12237,7 +13518,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Benutze Umgebungsvariablen"
 
@@ -12259,15 +13540,15 @@
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -12275,32 +13556,44 @@
 msgid "_Username:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "P_asswort:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Kann neues Konto nicht speichern"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Ein Konto mit den angegebenen Daten existiert bereits."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Dieses neue Konto auf dem Server anlegen"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12324,11 +13617,11 @@
 "Kontaktlistenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12337,92 +13630,92 @@
 "wollen.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Sperren"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "_Sperrung aufheben"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -12431,126 +13724,138 @@
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Buddys/Zeige _Offline-Buddys"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Buddys/Zeige _leere Gruppen"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Buddys/Zeige Buddy-_Details"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Buddys/Zeige Untätigkeitszei_ten"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Buddys/Anzeigen"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Buddys/Anzeigen/_Offline-Buddys"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Buddys/Anzeigen/_leere Gruppen"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Buddys/Anzeigen/Buddy-_Details"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Buddys/Anzeigen/Untätigkeitszei_ten"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Buddys/Anzeigen/_Protokoll-Icons"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Werkzeuge/_Zertifikate"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_räume"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Hilfe/Ü_ber"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12559,132 +13864,132 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Buddy-Alias"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Angemeldet"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Zuletzt gesehen"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Gruselig"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Großartig"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Abgefahren"
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Untätig %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/Benutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/Buddy hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/Chat hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chaträume"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ungelesene Nachricht von %s\n"
 msgstr[1] "%d ungelesene Nachrichten von %s\n"
 
-#: ../pidgin/gtkblist.c:3805
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12703,23 +14008,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4566
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Buddys/Zeige Offline-Buddys"
-
-#: ../pidgin/gtkblist.c:4569
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Buddys/Zeige leere Gruppen"
-
-#: ../pidgin/gtkblist.c:4575
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Buddys/Zeige Buddy-Details"
-
-#: ../pidgin/gtkblist.c:4578
-msgid "/Buddies/Show Idle Times"
-msgstr "/Buddys/Zeige Untätigkeitszeiten"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Buddys/Anzeigen/Offline-Buddys"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Buddys/Anzeigen/leere Gruppen"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Buddys/Anzeigen/Buddy-Details"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Buddys/Anzeigen/Untätigkeitszeiten"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Buddys/Anzeigen/Protokoll-Icons"
 
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12731,25 +14040,25 @@
 "immer es möglich ist.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Benutzername:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-fähigen Protokoll angemeldet."
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12757,42 +14066,47 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL-Server"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12806,27 +14120,27 @@
 "%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../pidgin/gtkconv.c:488
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Unbekanntes Kommando."
 
-#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:863
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12834,201 +14148,188 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../pidgin/gtkconv.c:884
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
 
-#: ../pidgin/gtkconv.c:967
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1003
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Suchen"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../pidgin/gtkconv.c:1361
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
-"mitgeschnitten."
-
-#: ../pidgin/gtkconv.c:1369
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
-"nicht mitgeschnitten."
-
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../pidgin/gtkconv.c:1640
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../pidgin/gtkconv.c:1663
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../pidgin/gtkconv.c:2530
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../pidgin/gtkconv.c:2581
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../pidgin/gtkconv.c:2638
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: ../pidgin/gtkconv.c:2645
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Alle anzeigen"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Lin_k einfügen..."
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Bil_d einfügen..."
 
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../pidgin/gtkconv.c:2855
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Optionen/Buddy-_Icon anzeigen"
-
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:2858
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
-#: ../pidgin/gtkconv.c:3059
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Optionen"
 
@@ -13037,177 +14338,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../pidgin/gtkconv.c:3144
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../pidgin/gtkconv.c:3154
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Link einfügen..."
 
-#: ../pidgin/gtkconv.c:3186
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Bild einfügen..."
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:3195
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../pidgin/gtkconv.c:3211
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../pidgin/gtkconv.c:3214
-msgid "/Options/Show Buddy Icon"
-msgstr "/Optionen/Zeige Buddy-Icon"
-
-#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../pidgin/gtkconv.c:3343
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../pidgin/gtkconv.c:6354
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../pidgin/gtkconv.c:7358
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Leert alle Gesprächsfenster."
 
-#: ../pidgin/gtkconv.c:7522
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../pidgin/gtkconv.c:7554
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
 
-#: ../pidgin/gtkconv.c:8144
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8150
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8158
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../pidgin/gtkconv.c:8164
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../pidgin/gtkconv.c:8650
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../pidgin/gtkconv.c:9250
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../pidgin/gtkconv.c:9252
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../pidgin/gtkconv.c:9254 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../pidgin/gtkconv.c:9256
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../pidgin/gtkconv.c:9258
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -13271,7 +14568,7 @@
 msgid "Fatal Error"
 msgstr "Schwerer Fehler"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
@@ -13282,8 +14579,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "Entwickler"
 
@@ -13295,381 +14592,393 @@
 msgid "support/QA"
 msgstr "Support/Qualitätssicherung"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "Entwickler & Webmaster"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Senior-Beitragender/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "Maintainer"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim-Maintainer"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "Entwickler & Webmaster"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "Grafische Benutzeroberfläche"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP-Entwickler"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "Originalautor"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134
+msgid "Belarusian Latin"
+msgstr "Weißrussisch (Latin)"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valencianisch-Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Deutsch"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estnisch"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Euskera (Baskisch)"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Französisch"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galizisch"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujaratisch"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujaratisch-Team"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:244
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu-Georgisch-Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada-Übersetzungsteam"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:249
 msgid "Macedonian"
 msgstr "Makedonisch"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:250
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegisch"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Niederländisch, Flämisch"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:251
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:257
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:260
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:261
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:262
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:347
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:385
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s ist ein grafischer modularer Nachrichtendienst, basierend auf "
 "libpurple, , der AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu und QQ gleichzeitig "
-"unterstützt.  Er wird mit GTK+ entwickelt.<BR><BR>Sie können das Programm "
-"nach den Bedingungen der GPL (Version 2 oder später) modifizieren und "
-"weitergeben.  Eine Kopie der GPL ist in der Datei 'COPYING' enthalten, die "
-"mit %s ausgeliefert wird.  %s wird von seinen Mitwirkenden urheberrechtlich "
-"geschützt.  Die Datei 'COPYRIGHT' enthält die komplette Liste der "
-"Mitwirkenden.  Wir übernehmen keine Haftung für dieses Programm.<BR><BR>"
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu und QQ "
+"gleichzeitig unterstützt.  Er wird mit GTK+ entwickelt.<BR><BR>Sie können "
+"das Programm nach den Bedingungen der GPL (Version 2 oder später) "
+"modifizieren und weitergeben.  Eine Kopie der GPL ist in der Datei 'COPYING' "
+"enthalten, die mit %s ausgeliefert wird.  %s wird von seinen Mitwirkenden "
+"urheberrechtlich geschützt.  Die Datei 'COPYRIGHT' enthält die komplette "
+"Liste der Mitwirkenden.  Wir übernehmen keine Haftung für dieses Programm."
+"<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:403
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:408
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:423
 msgid "Crazy Patch Writers"
 msgstr "Verrückte Patchschreiber"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:438
 msgid "Retired Developers"
 msgstr "Zurückgetretene Entwickler"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Crazy Patch Writers"
 msgstr "Zurückgetretene verrückte Patchschreiber"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:468
 msgid "Artists"
 msgstr "Künstler"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:483
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:503
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:521
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:891
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:893
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13677,11 +14986,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen möchten."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:983
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:985
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13689,32 +14998,32 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "möchten."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1006
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1028
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1030
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1052
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1091
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13729,15 +15038,15 @@
 "Sie sind dabei, den Kontakt, der %s und %d andere Buddys enthält, aus Ihrer "
 "Buddy-Liste zu entfernen.  Möchten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1099
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1102
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1133
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13746,15 +15055,15 @@
 "Sie sind dabei, die Gruppe %s in die Gruppe %s einzufügen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1140
 msgid "Merge Groups"
 msgstr "Gruppe zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1143
 msgid "_Merge Groups"
 msgstr "_Gruppen zusammenführen"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1193
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13763,15 +15072,15 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. Möchten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1196
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1199
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1232
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -13779,15 +15088,15 @@
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1235
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1238
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1259
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13796,11 +15105,11 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1262
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1265
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
@@ -13909,7 +15218,7 @@
 msgstr "Dateiübertragungs-_Details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13922,7 +15231,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "Formatierung _zurücksetzen"
 
@@ -14005,27 +15314,27 @@
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Schriftart wählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Textfarbe auswählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe auswählen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Beschreibung"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -14033,91 +15342,155 @@
 "Bitte geben Sie die URL und die Beschreibung des Links an, den Sie einfügen "
 "möchten. Die Beschreibung ist optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Bitte geben Sie die URL des Links an, den Sie einfügen möchten."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Link einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Speichern des Bildes fehlgeschlagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Bild einfügen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Dieses Thema verfügt über keine Smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Lächeln!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "_Schrift"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Elemente gruppieren"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Elemente nicht gruppieren"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Fett"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Durchstreichen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Schrift vergrößern"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Schrift verkleinern"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Schriftart"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Hintergrundfarbe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Vordergrundfarbe"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Formatierung zurücksetzen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "IM-Bild einfügen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Smiley einfügen"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fett</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Unterstrichen</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Durchgestrichen</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Größer</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Kleiner</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "_Schriftart"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Vordergrundfarbe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "_Hintergrundfarbe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Bild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Link"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Horizontale Linie"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14288,44 +15661,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Alle Nachrichten öffnen"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s hat %d neue Nachricht."
 msgstr[1] "%s hat %d neue Nachrichten."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sie haben %d neue E-Mail.</b>"
 msgstr[1] "<b>Sie haben %d neue E-Mails.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Das Browser-Kommando „%s“ ist falsch."
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht öffnen"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fehler beim Aufruf von „%s“: %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14378,100 +15751,100 @@
 msgstr "Wählen Sie eine Datei"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "_hinausgeht"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "_untätig wird"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r untätig ist"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "zu _tippen beginnt"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "beim Tippen an_hält"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "aufhört _zu tippen"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "eine _Nachricht sendet"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Gesprächsfenster ö_ffnen"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Befeh_l ausführen"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "einen _Klang abspielen"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Aus_wählen..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Aus_wählen..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Vorschau"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Standard"
 
@@ -14515,7 +15888,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
@@ -14612,11 +15985,11 @@
 msgid "Conversation _font:"
 msgstr "Gesprächsschri_ftart:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Standard-Formatierung"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14624,119 +15997,119 @@
 "So wird der ausgehende Nachrichtentext aussehen, wenn Sie "
 "Protokollebenutzen, die Formatierung unterstützen."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "IP-Adresse _automatisch erkennen"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Öffentliche _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Start-Port:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_End-Port:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME-Standard"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Browserauswahl"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "Ö_ffne Link in:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Standard-Browser"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Existierendes Fenster"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Neuer Reiter"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14745,63 +16118,63 @@
 "_Manuell:\n"
 "(%s für die URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Mitschnitt-_Format:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Leiser"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Leise"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Laut"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Lauter"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Am lautesten"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Keine Klänge"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14810,82 +16183,82 @@
 "Klang-_Abspielbefehl:\n"
 "(%s für den Dateinamen)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Klänge aktivieren:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Lautstärke:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "Inaktivitätszei_ten anzeigen:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Abhängig von Tastatur- oder Mausbenutzung"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Wenn abwesend und untätig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Ändere Status, wenn _inaktiv"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Ändere _Status zu:"
 
 #
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Status beim Start"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Status beim Neu_start wiederherstellen"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Beim Starten folgenden Status _benutzen:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Status / Untätig"
 
@@ -14980,23 +16353,23 @@
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie sie überschreiben?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Einen neuen Namen wählen"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Ordner auswählen..."
 
@@ -15037,7 +16410,7 @@
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -15052,7 +16425,7 @@
 msgstr "S_peichern & Übernehmen"
 
 #
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Status für %s"
@@ -15065,21 +16438,21 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Beim Laden von %s ist folgender Fehler aufgetreten: %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15087,12 +16460,12 @@
 msgstr ""
 "%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15100,23 +16473,23 @@
 "Sie können dieses Bild senden, es in diese Nachricht einfügen oder es als "
 "Buddy-Icon für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "In Nachricht einfügen"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Möchten Sie es als Buddy-Icon für diesen Benutzer verwenden?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15124,7 +16497,7 @@
 "Sie können dieses Bild als Dateiübertragung senden oder es als Buddy-Icon "
 "für diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15137,11 +16510,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Kann Verknüpfung nicht senden"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15149,7 +16522,7 @@
 "Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15160,26 +16533,26 @@
 "<b>Dateigröße:</b> %s\n"
 "<b>Bildgröße:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Die Datei '%s' ist zu groß für %s.  Bitte versuchen Sie ein kleineres Bild.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15195,31 +16568,31 @@
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "Alia_s"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "_Reiter schließen"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Benutzer-Info"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Einladen"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-Smileys"
 
@@ -15260,7 +16633,7 @@
 #. last_seen spinner
 #: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
-msgstr "Maximale \"zuletzt-gesehen\"-Differenz:"
+msgstr "Maximale „zuletzt-gesehen“-Differenz:"
 
 #. threshold spinner
 #: ../pidgin/plugins/cap/cap.c:828
@@ -15396,18 +16769,6 @@
 msgid "Select Color for %s"
 msgstr "Textfarbe für %s auswählen"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Fett"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Unterstrichen"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Eingehendes Format ignorieren"
@@ -15434,8 +16795,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Bemerkung: Die Einstellung für \"Neue Unterhaltungen\" muss auf \"Nach der "
-"Zahl der Gespräche\" gesetzt werden."
+"Bemerkung: Die Einstellung für „Neue Unterhaltungen“ muss auf „Nach der Zahl "
+"der Gespräche“ gesetzt werden."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -15730,11 +17091,11 @@
 msgid "Draw Markerline in "
 msgstr "Zeichne eine Markierunglinie in "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_IM-Fenstern"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "C_hat-Fenstern"
 
@@ -15750,32 +17111,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Musik-Nachrichten-Sitzung bestätigt."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Musik-Nachrichten"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Es gab einen Konflikt beim Ausführen des Kommandos:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Fehler beim Ausführen des Editors"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Der folgende Fehler ist aufgetreten:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Musik-Nachrichten-Konfiguration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Pfad zum Partitur-Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Anwenden"
 
@@ -15787,12 +17148,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15801,74 +17162,74 @@
 "Benutzern, simultan an einem Musikstück in Echtzeit zu arbeiten."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Benachrichtigung für"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Nur wenn jemand Ihren Benutzernamen nennt"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fokussierte Fenster"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Benachrichtigungsmethoden"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Stelle die _Zeichenkette vor den Fenstertitel:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Füge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Füge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Setze den „_URGENT“-Hinweis für den Window-Manager"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "G_esprächsfenster in den Vordergrund bringen"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Entfernung von Benachrichtigungen"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Entferne, wenn das _Gesprächsfenster den Fokus bekommt"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Entferne, wenn das Gesprächsfenster ge_klickt wird"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Entferne, wenn im Gesprächsfenster ge_tippt wird"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Entferne, wenn eine _Nachricht gesendet wird"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Entfernen bei der Umschaltung zum Gesprächs_reiter"
 
@@ -15878,7 +17239,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Benachrichtigung"
 
@@ -15886,7 +17247,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Gibt Ihnen eine Reihe von Möglichkeiten, über ungelesene Nachrichten "
@@ -16263,44 +17624,44 @@
 "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
 "im Mitschnitt anzupassen."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Durchlässigkeit:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "IM Gesprächsfenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_IM Fenstertransparenz"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Zeige _Schiebebalken im IM-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Transparenz des Unterhaltungsfensters beim Aktivieren aufheben"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Immer im Vordergrund"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparenz des _Buddy-Listen-Fensters"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Transparenz des Buddy-Listen-Fensters beim Aktivieren aufheben"
 
@@ -16310,19 +17671,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparenz"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparenz für die Buddy-Liste und die Gespräche."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
diff -ru pidgin-2.1.1/po/dz.po pidgin-2.2.0/po/dz.po
--- pidgin-2.1.1/po/dz.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/dz.po	2007-09-14 00:45:42.000000000 -0400
@@ -13959,7 +13959,7 @@
 msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3220
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "ག་ ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ་ཡི?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3230
diff -ru pidgin-2.1.1/po/el.po pidgin-2.2.0/po/el.po
--- pidgin-2.1.1/po/el.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/el.po	2007-09-14 00:45:42.000000000 -0400
@@ -10628,7 +10628,7 @@
 msgstr "Ενεργοποίηση ποιανού ID;"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3239
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Ποιανού συμμετοχή στη συζήτηση;"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3251
diff -ru pidgin-2.1.1/po/en_AU.po pidgin-2.2.0/po/en_AU.po
--- pidgin-2.1.1/po/en_AU.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/en_AU.po	2007-09-14 00:45:42.000000000 -0400
@@ -10735,8 +10735,8 @@
 msgstr "Active which ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
-msgstr "Join who in chat?"
+msgid "Join whom in chat?"
+msgstr "Join whom in chat?"
 
 #: src/protocols/yahoo/yahoo.c:2982
 msgid "Activate ID..."
diff -ru pidgin-2.1.1/po/en_CA.po pidgin-2.2.0/po/en_CA.po
--- pidgin-2.1.1/po/en_CA.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/en_CA.po	2007-09-14 00:45:42.000000000 -0400
@@ -10715,8 +10715,8 @@
 msgstr "Active which ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
-msgstr "Join who in chat?"
+msgid "Join whom in chat?"
+msgstr "Join whom in chat?"
 
 #: src/protocols/yahoo/yahoo.c:2982
 msgid "Activate ID..."
diff -ru pidgin-2.1.1/po/en_GB.po pidgin-2.2.0/po/en_GB.po
--- pidgin-2.1.1/po/en_GB.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/en_GB.po	2007-09-14 00:45:42.000000000 -0400
@@ -3,11 +3,12 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-27 13:59+0100\n"
+"POT-Creation-Date: 2007-09-11 23:42+0100\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -16,12 +17,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Try `%s -h' for more information.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -42,13 +50,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -59,462 +61,510 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
-#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "Account was not added"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Screen name of an account must not be empty."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:599
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:528
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Remember password"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:484
+msgid "There's no protocol plugins installed."
+msgstr "There are no protocol plugins installed."
+
+#: ../finch/gntaccount.c:485
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(You probably forgot to 'make install'.)"
+
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Modify Account"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "New Account"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:429 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:437
-#: ../pidgin/gtkblist.c:5389
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:528
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Screen name:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6007
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3244 ../pidgin/gtkaccount.c:1911
-#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5831
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
-#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
-#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989
+#: ../pidgin/gtkdialogs.c:1009 ../pidgin/gtkdialogs.c:1033
+#: ../pidgin/gtkdialogs.c:1055 ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1239 ../pidgin/gtkdialogs.c:1266
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Save"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1903
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Delete Account"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1910 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Delete"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "You can enable/disable accounts from the following list."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5830 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Add"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modify"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2448
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s"
 
-#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2500
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 
-#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Authorise buddy?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Authorise"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Deny"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "You must provide a screen name for the buddy."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "You must provide a group."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "You must select an account."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "The selected account is not online."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Error adding buddy"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2846
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
-#: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1392
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
-#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Group"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3146 ../pidgin/gtkblist.c:5343
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Please enter buddy information."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1537 ../libpurple/protocols/msn/msn.c:1602
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Auto-join"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "You can edit more information from the context menu later."
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Error adding group"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "You must give a name for the group to add."
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "A group with that name already exists."
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5827
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Add Group"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Enter the name of the group"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Edit Chat"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Please update the necessary fields."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Edit"
 
-#: ../finch/gntblist.c:786
-msgid "Auto-join"
-msgstr "Auto-join"
-
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Edit Settings"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Retrieving..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Get Info"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Add Buddy Pounce"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Send File"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "View Log"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Please enter the new name for %s"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Rename"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Set Alias"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Enter empty string to reset the name."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Removing this contact will also remove all the buddies in the contact"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Removing this group will also remove all the buddies in the group"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Are you sure you want to remove %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1057
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Confirm Remove"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Remove"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1540
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2900
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1810
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Idle"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1333
+msgid "On Mobile"
+msgstr "On Mobile"
+
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -523,12 +573,12 @@
 "Online: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -537,101 +587,231 @@
 "\n"
 "Last Seen: %s ago"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "New..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Saved..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:739
+#: ../pidgin/gtkdialogs.c:878 ../pidgin/gtkdialogs.c:959
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:744
+#: ../pidgin/gtkdialogs.c:883 ../pidgin/gtkdialogs.c:964
 msgid "_Account"
 msgstr "_Account"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:752
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:754
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Please enter the screen name or alias of the person you would like to IM."
 
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6006
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
-#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Send IM..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2250
+msgid "Show empty groups"
+msgstr "Show empty groups"
+
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Show offline buddies"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Sort by status"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Sort alphabetically"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Sort by log size"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Certificate Import"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Specify a hostname"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Type the host name this certificate is for."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Certificate Import Error"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509 certificate import failed"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Select a PEM certificate"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Certificate Export Error"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509 certificate export failed"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 Certificate Export"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificate for %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL Host Certificate"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Really delete certificate for %s?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Confirm certificate delete"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Certificate Manager"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Hostname"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Close"
+
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s disconnected."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -644,46 +824,46 @@
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "No such command."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "That command only works in chats, not IMs."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not chats."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Commands are not supported yet. Message was NOT sent."
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Message was not sent because you are not signed on."
 
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -692,48 +872,66 @@
 "\n"
 "%s is typing..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "You have left this chat."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Logging started. Future messages in this conversation will be logged."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Logging stopped. Future messages in this conversation will not be logged."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Send To"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Clear Scrollback"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Show Timestamps"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Add Buddy Pounce..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Enable Logging"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Enable Sounds"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "List of users:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -741,7 +939,7 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -749,11 +947,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -761,43 +959,43 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Clears the conversation scrollback."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Show the list of users in the chat."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Show the plugins window"
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Show the buddy list."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Show the accounts window."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Show the debug window."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Show the preference window."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Show the saved-statuses window."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug Window"
 
@@ -805,15 +1003,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Clear"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
@@ -822,175 +1020,169 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "File Transfers - %d%% of %d files"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progress"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Filename"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Size"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Speed"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Remaining"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2659
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3051 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Close this window when all transfers finish"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Clear finished transfers"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Stop"
 
-#. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2475 ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Close"
-
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Failed"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "The file was saved as %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Finished"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "You have e-mail!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
-msgid "From"
-msgstr "From"
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+msgid "Sender"
+msgstr "Sender"
 
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Subject"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) has %d new message."
 msgstr[1] "%s (%s) has %d new messages."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "New Mail"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continue"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Join"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invite"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(none)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "loading plugin failed"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "unloading plugin failed"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1007,382 +1199,600 @@
 "Website: %s\n"
 "Filename: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Plugin needs to be loaded before you can configure it."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "No configuration options for this plugin."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "You are (un)load plugins from the following list."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Configure Plugin"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1954
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Pounce on Whom"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Account:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Buddy name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Pounce When Buddy..."
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "Signs on"
 
-#: ../finch/gntpounce.c:374
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "Signs off"
 
-#: ../finch/gntpounce.c:375
+#: ../finch/gntpounce.c:377
 msgid "Goes away"
 msgstr "Goes away"
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:378
 msgid "Returns from away"
 msgstr "Returns from away"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:379
 msgid "Becomes idle"
 msgstr "Becomes idle"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "Is no longer idle"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "Starts typing"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "Pauses while typing"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "Stops typing"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "Sends a message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Action"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Open a message window"
 
-#: ../finch/gntpounce.c:414
+#: ../finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Pop up a notification"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Send a message"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Execute a command"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "Pounce only when my status is not available"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Cannot create pounce"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "You do not have any accounts."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "You must create an account first before you can create a pounce."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Are you sure you want to delete the pounce on %s for %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Buddy Pounces"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s has paused while typing to you (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Based on keyboard use"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1815
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "From last sent message"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1814 ../pidgin/gtkprefs.c:1828
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Never"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Show Idle Time"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Show Offline Buddies"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Notify buddies when you are typing"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Log format"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Log IMs"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Log chats"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Log status change events"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Report Idle time"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Change status when idle"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minutes before changing status"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Change status to"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1918
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1929
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Logging"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Save File..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Open File..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Buddy logs in"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Buddy logs out"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Message received"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Message received begins conversation"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Message sent"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Person enters chat"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Person leaves chat"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "You talk in chat"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Others talk in chat"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Someone says your screen name in chat"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer Failure"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer failed to initialize."
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(default)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "Select Sound File ..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "Sound Preferences"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "Profiles"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "Automatic"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "Console Beep"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "Command"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "No Sounds"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "Sound Method"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "Method: "
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Sound Command\n"
+"(%s for filename)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "Sound Options"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "Sounds when conversation has focus"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Always"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "Only when available"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "Only when not available"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "Volume(0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "Sound Events"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "Event"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "File"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "Test"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "Reset"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "Choose..."
+
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Are you sure you want to delete \"%s\"?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Delete Status"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Title"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Type"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5467
-#: ../libpurple/protocols/oscar/oscar.c:5685
-#: ../libpurple/protocols/oscar/oscar.c:5699
-#: ../libpurple/protocols/oscar/oscar.c:5715
-#: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5729
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3479
-#: ../libpurple/protocols/yahoo/yahoo.c:3485
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Use"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Invalid title"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "Please enter a non-empty title for the status."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Duplicate title"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Please enter a different title for the status."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sub-status"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Message:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Edit Status"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Use different status for the following accounts"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Save & Use"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificates"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "Sounds"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Statuses"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Error loading the plugin."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Couldn't find X display"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Couldn't find window"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"This plugin cannot be loaded because it was not built with X11 support."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Clipboard plugin"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1508,185 +1918,352 @@
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Password is required to sign on."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Save password"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plug-in for %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3961
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Original password"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "New password"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddies"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "buddy list"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(DOES NOT MATCH)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s has presented the following certificate for just-this-once use:"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Single-use Certificate Verification"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Certificate Authorities"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL Peers Cache"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Accept certificate for %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "SSL Certificate Verification"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Accept"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Reject"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_View Certificate..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "The certificate chain presented for %s is not valid."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "SSL Certificate Error"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Invalid certificate chain"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Invalid certificate authority signature"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Certificate Information"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Unregistration Error"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s signed on"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s signed off"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Unable to send message: The message is too large."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Unable to send message to %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "The message is too large."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Send Message"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Send Message"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Failed to get connection: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Failed to get name: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Failed to get serv name: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is not running for the reason listed below"
 
@@ -1739,7 +2316,7 @@
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1748,7 +2325,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1757,7 +2334,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1766,39 +2343,39 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Directory is not writable."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1809,60 +2386,60 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s is offering to send file %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starting transfer of %s from %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "File transfer to %s failed."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "File transfer from %s failed."
@@ -2039,31 +2616,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Whether the specified command should handle \"ymsgr\" URLs"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Plain text"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Old flat format"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Logging of this conversation failed."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2072,7 +2649,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2081,16 +2658,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2181,13 +2758,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2234
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5799
-#: ../libpurple/protocols/oscar/oscar.c:5854
-#: ../libpurple/protocols/oscar/oscar.c:6080
-#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancel"
@@ -2204,12 +2781,12 @@
 msgid "Auto Reject"
 msgstr "Auto Reject"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaccept File Transfers..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2217,11 +2794,11 @@
 "Path to save the files in\n"
 "(Please provide the full path)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatically reject from users not in buddy list"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2229,8 +2806,8 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1613
-#: ../libpurple/protocols/msn/msn.c:1643
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Notes"
 
@@ -2238,7 +2815,7 @@
 msgid "Enter your notes below..."
 msgstr "Enter your notes below..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Edit Notes..."
 
@@ -2250,18 +2827,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Store notes on particular buddies."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Adds the option to store notes for buddies on your buddy list."
 
@@ -2454,34 +3031,34 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "User is offline."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Auto-response sent:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s has signed off."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "One or more messages may not have been delivered."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2489,69 +3066,77 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Message could not be sent because the maximum length was exceeded."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Message could not be sent."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "General Log Reading Configuration"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Fast size calculations"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Use name heuristics"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Log Directory"
 
@@ -2561,19 +3146,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Log Reader"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Includes other IM clients' logs in the log viewer."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2640,7 +3225,7 @@
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2649,39 +3234,43 @@
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Offline Message"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Yes"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Save offline messages in pounce"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Do not ask. Always save in pounce."
 
@@ -2744,7 +3333,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -2752,8 +3341,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -2775,23 +3364,30 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "X.509 Certificates"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Provides a wrapper around SSL support libraries."
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Provides SSL support through GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -2799,18 +3395,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Provides SSL support through GNUTLS."
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Provides SSL support through Mozilla NSS."
 
 #. *< type
 #. *< ui_requirement
@@ -2818,18 +3414,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Provides SSL support through Mozilla NSS."
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Provides a wrapper around SSL support libraries."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -2903,7 +3498,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plug-ins"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2912,34 +3507,53 @@
 "install ActiveTCL from http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Unable to listen for incoming IM connections\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Unable to establish connection with the local mDNS server - is it running?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4500
-#: ../libpurple/protocols/oscar/oscar.c:5545
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3382
-#: ../libpurple/protocols/yahoo/yahoo.c:3455 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1824
-#: ../pidgin/gtkstatusbox.c:1052
-msgid "Away"
-msgstr "Away"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
+msgid "First name"
+msgstr "Forename"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
+msgid "Last name"
+msgstr "Surname"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM Account"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP Account"
 
 #. *< type
 #. *< ui_requirement
@@ -2951,86 +3565,61 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protocol Plug-in"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple Person"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
-msgid "Hostname"
-msgstr "Hostname"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
-msgid "First name"
-msgstr "Forename"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
-msgid "Last name"
-msgstr "Surname"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM Account"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
-msgid "XMPP Account"
-msgstr "XMPP Account"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s has closed the conversation."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Unable to send the message: the conversation couldn't be started."
+
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Cannot open socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Error setting socket options"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Could not bind socket to port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Could not listen on socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Unable to send the message: the conversation couldn't be started."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3100,267 +3689,292 @@
 msgid "Registration completed successfully!"
 msgstr "Registration completed successfully!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Password"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Password (retype)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Enter current token"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Current token"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Please fill in the following fields"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "City"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1542
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Gender"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Male or female"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Male"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Female"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Only online"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Find buddies"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Please enter your search criteria below"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Fill in the fields."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Your current password is different from the one that you specified."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Unable to change password. An error occured.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Change password for the Gadu-Gadu account"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Password successfully changed!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Current password"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Change Gadu-Gadu password"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Select a chat for buddy: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Available"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2658
-#: ../libpurple/protocols/oscar/oscar.c:3689
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Away"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Forename"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3901
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Unable to display the search results."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Public Directory"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Search results"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "No matching users found"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "There are no users matching your search criteria."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Your buddy list was downloaded from the server."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Buddy list uploaded"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Connection failed."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Blocked"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Add to chat"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Unblock"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Block"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Chat error"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Not connected to the server."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Find buddies..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Change password..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Upload buddylist to Server"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Download buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Delete buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Save buddylist to file..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
@@ -3375,43 +3989,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plug-in"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Polish popular IM system"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "No topic is set"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
@@ -3438,7 +4055,8 @@
 msgstr "MOTD for %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
@@ -3447,11 +4065,12 @@
 msgstr "View MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Channel:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Password:"
 
@@ -3459,63 +4078,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2747
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Connecting"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Failed"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Read error"
 
-#: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Users"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Topic"
 
@@ -3527,55 +4145,66 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plug-in that Sucks Less"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2140
-#: ../libpurple/protocols/oscar/oscar.c:6587
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Encodings"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Username"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Real name"
 
@@ -3583,7 +4212,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:961
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Use SSL"
 
@@ -3614,13 +4243,15 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3690
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Nick"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Currently on"
 
@@ -3640,98 +4271,99 @@
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s has cleared the topic."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "The IRC server received a message it did not understand."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Time Response"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "no such channel"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Could not send"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../libpurple/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3739,7 +4371,7 @@
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3747,43 +4379,44 @@
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: ../libpurple/protocols/irc/msgs.c:1107
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Cannot join %s: Registration required."
 
-#: ../libpurple/protocols/irc/msgs.c:1108
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: ../libpurple/protocols/irc/msgs.c:1142
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick or channel is temporarily unavailable."
 
-#: ../libpurple/protocols/irc/msgs.c:1154
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -3891,7 +4524,7 @@
 msgstr "names [channel]:  List the users currently in a channel."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
@@ -3999,26 +4632,42 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nick&gt;: Get information on a user that has logged off."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Disconnected."
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Unknown Error"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc Command Failed"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "execute"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4027,8 +4676,8 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4037,33 +4686,33 @@
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4071,120 +4720,114 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL error"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Family Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Given Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Street Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Locality"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Region"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Postal Code"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Country"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Role"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1611
-#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Birthday"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Edit XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4192,113 +4835,385 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Operating System"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Last Activity"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Service Discovery Info"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Service Discovery Items"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Extended Stanza Addressing"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Multi-User Chat"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Multi-User Chat Extended Presence Information"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "In-Band Bytestreams"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Ad-Hoc Commands"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub Service"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 Bytestreams"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Out of Band Data"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "In-Band Registration"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "User Location"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "User Avatar"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Chat State Notifications"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Software Version"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Stream Initiation"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "File Transfer"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "User Mood"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "User Activity"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Entity Capabilities"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Encrypted Session Negotiations"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "User Tune"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr "Roster Item Exchange"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr "Reachability Address"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "User Profile"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle Audio"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "User Nickname"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr "Jingle Raw UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle Video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Message Receipts"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Public Key Publishing"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "User Chatting"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "User Browsing"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "User Gaming"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "User Viewing"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Stanza Encryption"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Entity Time"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Delayed Delivery"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Collaborative Data Objects"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "File Repository and Sharing"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "STUN Service Discovery for Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Simplified Encrypted Session Negotiation"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Hop Check"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Resource"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "Priority"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Log In"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Log Out"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5721
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4306,69 +5221,69 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Directory Query Failed"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "Could not query the directory server."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server Instructions: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Fill in one or more fields to search for any matching XMPP users."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3704
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Search for XMPP users"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Search"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Invalid Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Enter a User Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Select a user directory to search"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Search Directory"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5227
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Room:"
 
@@ -4437,7 +5352,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
@@ -4457,439 +5373,642 @@
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "You require encryption, but it is not available on this server."
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Write error"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Read Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:483
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Could not establish a connection with the server:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Invalid XMPP ID. Domain must be set."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Registration to %s successful"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Unknown Error"
-
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Registration from %s successfully removed"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "Unregistration Successful"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "Unregistration Failed"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "County/State"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:973
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "Unregister"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Please fill out the information below to change your account registration."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Register New XMPP Account"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "Register"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Change Account Registration at %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Register New Account at %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Change Registration"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "Error unregistering account"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "Account successfully unregistered"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Initialising SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5515
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "Both"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1442
+msgid "From"
+msgstr "From"
+
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
-msgid "None (To pending)"
-msgstr "None (To pending)"
+#: ../libpurple/protocols/jabber/jabber.c:1447
+msgid "None (To pending)"
+msgstr "None (To pending)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "None"
+
+#: ../libpurple/protocols/jabber/jabber.c:1452
+msgid "Subscription"
+msgstr "Subscription"
+
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Mood"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Mood Text"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "Tune Artist"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "Tune Title"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "Tune Album"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "Tune Genre"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Comment"
+msgstr "Tune Comment"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "Tune Track"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "Tune Time"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "Tune Year"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
-msgid "None"
-msgstr "None"
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "Tune URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
-msgid "Subscription"
-msgstr "Subscription"
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Allow Buzz"
+msgstr "Allow Buzz"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6301
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6312
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Change Password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Search for Users..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "Malformed XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unknown affiliation: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Unable to affiliate user %s as \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unknown role: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Unable to set role \"%s\" for user: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Unable to ping user %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "Unable to buzz, because there is nothing known about user %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr "Unable to buzz, because user %s might be offline."
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Unable to buzz, because the user %s does not support it."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4897,7 +6016,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4905,24 +6024,33 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tPing a user/component/server."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Buzz a user to get their attention"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4933,83 +6061,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP Protocol Plug-in"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:501
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "Require SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Force old (port 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Connect port"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866 ../pidgin/gtkaccount.c:830
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Connect server"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s has left the conversation."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "XMPP Message Error"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s has buzzed you!"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: ../libpurple/protocols/jabber/presence.c:352
-#: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5017,34 +6160,105 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configure Room"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Unable to send file to %s, user does not support file transfers"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
+#: ../libpurple/protocols/jabber/si.c:838
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Unable to send file to %s, invalid JID"
+
+#: ../libpurple/protocols/jabber/si.c:840
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Unable to send file to %s, user is not online"
+
+#: ../libpurple/protocols/jabber/si.c:842
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "Unable to send file to %s, not subscribed to user presence"
+
+#: ../libpurple/protocols/jabber/si.c:857
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Please select which resource of %s you would like to send a file to"
+
+#: ../libpurple/protocols/jabber/si.c:873
+msgid "Select a Resource"
+msgstr "Select a Resource"
+
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "Edit User Mood"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Please select your mood from the list."
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Set"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "Set Mood..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "Set User Nickname"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "Please specify a new nickname for yourself."
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Set Nickname..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Actions"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Select an action"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5261,9 +6475,10 @@
 msgstr "Server too busy"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -5297,39 +6512,49 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "You have just sent a Nudge!"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Nudge"
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s has nudged you!"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Nudging %s..."
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Set your home telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Set your work telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5337,315 +6562,321 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Allow"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Disallow"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "This Hotmail account may not be active."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Page"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Has you"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Set Home Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Set Work Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Set Mobile Phone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Enable/Disable Mobile Devices..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Allow/Disallow Mobile Pages..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail Inbox"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL support is needed for MSN. Please install a supported SSL library."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: ../libpurple/protocols/msn/msn.c:1463 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#: ../libpurple/protocols/msn/msn.c:1534 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1541
-#: ../libpurple/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Age"
 
-#: ../libpurple/protocols/msn/msn.c:1543
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1544
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Location"
 
-#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1747 ../libpurple/protocols/msn/msn.c:1754
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1555 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1681 ../libpurple/protocols/msn/msn.c:1688
-#: ../libpurple/protocols/msn/msn.c:1696 ../libpurple/protocols/msn/msn.c:1703
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1574
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Pets"
 
-#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Home town"
 
-#: ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Places Lived"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Fashion"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Music"
 
-#: ../libpurple/protocols/msn/msn.c:1582 ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Contact Info"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Partner"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Home Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Home Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Home Address"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Personal Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "Personal E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "Personal IM"
 
-#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Work"
 
-#: ../libpurple/protocols/msn/msn.c:1630
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1674
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Company"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Department"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Work Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Work Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1636
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Work Address"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Work Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Work Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "Work E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1641
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "Work IM"
 
-#: ../libpurple/protocols/msn/msn.c:1642
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1718
-#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5655,7 +6886,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5663,8 +6894,8 @@
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profile URL"
 
@@ -5678,19 +6909,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2108 ../libpurple/protocols/msn/msn.c:2110
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plug-in"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: ../libpurple/protocols/msn/msn.c:2149
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2157
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
@@ -5709,8 +6940,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
@@ -5721,7 +6952,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -5759,15 +6990,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Service Temporarily Unavailable."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: ../libpurple/protocols/msn/notification.c:1323
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5824,8 +7055,8 @@
 msgstr "Error parsing HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3457
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
@@ -5838,35 +7069,35 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Unable to authenticate: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Starting authentication"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Getting cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Sending cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
@@ -5904,38 +7135,435 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Message could not be sent because an error with the switchboard occurred:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s just sent you a Nudge!"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s has added you to his or her buddy list."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s has removed you from his or her buddy list."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Unable to add \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "The screen name specified is invalid."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Missing Cipher"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "The RC4 cipher could not be found"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM Error"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Reading challenge"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Unexpected challenge length from server"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Logging in"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Connection to server lost (no data received within %d seconds)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "New mail messages"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "New blog comments"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "New profile comments"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "New friend requests!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "New picture comments"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Connected"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "No username set"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protocol error, code %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Failed to add buddy"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' command failed."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "persist command failed"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "No such user: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "User lookup"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Failed to remove buddy"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' command failed"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "blocklist command failed"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Invalid input condition"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Read buffer full"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Unparseable message"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Couldn't connect to host: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "IM Friends"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Add contacts from server"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Add friends from MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Importing friends failed"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Find people..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Change IM name..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim URL handler"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "No suitable MySpaceIM account could be found to open this myim URL."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Enable the proper MySpaceIM account and try again."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Show display name in status text"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Show headline in status text"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Send emoticons"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Screen resolution (dots per inch)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Base font size (points)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "User"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Profile"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "Headline"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Song"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Total Friends"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Client Version"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Zap"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s has zapped you!"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Zapping %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Whack"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s has whacked you!"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Whacking %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Torch"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s has torched you!"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "Torching %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Smooch"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s has smooched you!"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Smooching %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Hug"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s has hugged you!"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Hugging %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Slap"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s has slapped you!"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Slapping %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Goose"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s has goosed you!"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "Goosing %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s has high-fived you!"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "High-fiving %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Punk"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s has punk'd you!"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr "Punking %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Raspberry"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s has raspberried you!"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Raspberrying %s..."
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Required parameters not passed in"
@@ -6290,20 +7918,20 @@
 msgid "Server port"
 msgstr "Server port"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2451
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Server closed the connection."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2445 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6312,22 +7940,13 @@
 "Lost connection with server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Received invalid data on connection with server."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Could not establish a connection with the server:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6359,7 +7978,7 @@
 msgstr "ICQ Protocol Plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Encoding"
@@ -6389,7 +8008,7 @@
 msgid "Direct IM established"
 msgstr "Direct IM established"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "File %s is %s, which is larger than the maximum size of %s."
@@ -6490,7 +8109,7 @@
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6502,7 +8121,7 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6512,144 +8131,147 @@
 "different encodings selected, or %s has a buggy client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2306
-#: ../pidgin/gtkutils.c:2336
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Voice"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Get File"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Games"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP User"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5693
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5714
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Occupied"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2849
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6658,7 +8280,7 @@
 "Could not connect to authentication server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6667,53 +8289,53 @@
 "Could not connect to BOS server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Finalising connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Invalid screen name."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6721,44 +8343,44 @@
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Enter the 6 digit number from the digital display."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:5798
-#: ../libpurple/protocols/oscar/oscar.c:6079 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6767,53 +8389,53 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Unable to get a valid AIM login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "You may be disconnected shortly.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Unable to get a valid login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1642
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Password sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1698
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Unable to initialise connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:2406
-#: ../libpurple/protocols/oscar/oscar.c:5196
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "No reason given."
 
-#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6824,17 +8446,17 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "The user %u has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6847,7 +8469,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6860,7 +8482,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2438
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6873,38 +8495,38 @@
 "Message is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2459
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2465
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "You missed %hu message from %s because it was invalid."
 msgstr[1] "You missed %hu messages from %s because they were invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "You missed %hu message from %s because it was too large."
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6915,21 +8537,21 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "You missed %hu message from %s because he/she was too evil."
 msgstr[1] "You missed %hu messages from %s because he/she was too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "You missed %hu message from %s because you are too evil."
 msgstr[1] "You missed %hu messages from %s because you are too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2600
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6937,61 +8559,47 @@
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#: ../libpurple/protocols/oscar/oscar.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2825
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "User information for %s unavailable:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Online Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-msgid "Capabilities"
-msgstr "Capabilities"
-
-#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Available Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:2920
-msgid "Profile"
-msgstr "Profile"
-
-#: ../libpurple/protocols/oscar/oscar.c:2997
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3184
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -6999,7 +8607,7 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3387
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7007,85 +8615,82 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:3459
-msgid "You have been signed off for an unknown reason."
-msgstr "You have been signed off for an unknown reason."
-
 #: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3719
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3781
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Work Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3867
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3907
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "The following screen name is associated with %s"
 msgstr[1] "The following screen names are associated with %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3912
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Screen name"
 
-#: ../libpurple/protocols/oscar/oscar.c:3938
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No results found for e-mail address %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3959
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "You should receive an e-mail asking to confirm %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7094,12 +8699,12 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Error 0x%04x: Unable to format screen name because it is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7108,7 +8713,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7117,7 +8722,7 @@
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7126,7 +8731,7 @@
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7135,31 +8740,31 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "The e-mail address for %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4197
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: ../libpurple/protocols/oscar/oscar.c:4443
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7169,7 +8774,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: ../libpurple/protocols/oscar/oscar.c:4457
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7184,11 +8789,11 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7203,32 +8808,32 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4512
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4581
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:4583
-#: ../libpurple/protocols/oscar/oscar.c:5006
-#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:4687
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:4688
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7236,16 +8841,15 @@
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 
-#: ../libpurple/protocols/oscar/oscar.c:4892
-#: ../libpurple/protocols/oscar/oscar.c:4893
-#: ../libpurple/protocols/oscar/oscar.c:4898
-#: ../libpurple/protocols/oscar/oscar.c:5074
-#: ../libpurple/protocols/oscar/oscar.c:5075
-#: ../libpurple/protocols/oscar/oscar.c:5080
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Orphans"
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7254,23 +8858,17 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:5004
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(no name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Could not add the buddy %s for an unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:5111
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7279,22 +8877,22 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5119
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "The user %s has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7305,51 +8903,51 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: ../libpurple/protocols/oscar/oscar.c:5233
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: ../libpurple/protocols/oscar/oscar.c:5343
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: ../libpurple/protocols/oscar/oscar.c:5482
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Away Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:5487
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(retrieving)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5847
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7357,63 +8955,64 @@
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5853
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Get AIM Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5894
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:5902
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Require authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:5999
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (enabling this will cause you to receive spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privacy Options"
 
-#: ../libpurple/protocols/oscar/oscar.c:6023
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6126
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7421,73 +9020,73 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Find Buddy by E-Mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Type the e-mail address of the buddy you are searching for."
 
-#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Search"
 
-#: ../libpurple/protocols/oscar/oscar.c:6307
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6322
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6332
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Display Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Change Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6354
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Search for Buddy by E-mail Address..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Use recent buddies group"
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Show how long you have been idle"
 
-#: ../libpurple/protocols/oscar/oscar.c:6591
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7495,26 +9094,26 @@
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Attempting to connect to %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect via proxy server."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s has just asked to directly connect to %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7524,10 +9123,6 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Connect"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Primary Information"
@@ -7708,13 +9303,12 @@
 msgstr "Invalid QQ Face"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "You rejected %d's request"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Enter your reason:"
 
@@ -7724,65 +9318,59 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Sorry, you are not my type..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "Reject"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "Add buddy with auth request failed"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "You have successfully removed a buddy"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "You have successfully removed yourself from a buddy"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "You have successfully removed yourself from your friend's buddy list"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "User %d needs authentication"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Enter request here"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Would you like to be my friend?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Send"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
-msgstr "You have added %d to your buddy list"
+msgid "You have added %d to buddy list"
+msgstr "You have added %d to buddy list"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid Error"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Invalid QQid"
 
@@ -7811,71 +9399,71 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
-msgstr "Please input external group ID"
+msgid "Please enter external group ID"
+msgstr "Please enter external group ID"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "You can only search for permanent QQ groups\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
-msgstr "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
+msgstr "User %d requested to join group %d"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Reason: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Approve"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Your request to join group %d has been rejected by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Your request to join group %d has been approved by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "You [%d] have left group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
+msgid "You [%d] have been added to group \"%d\""
 msgstr "You [%d] have been added to group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "This group has been added to your buddy list"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "I am not a member"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -7894,31 +9482,31 @@
 msgid "Unknown status"
 msgstr "Unknown status"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "This group does not allow others to join"
 
-#: ../libpurple/protocols/qq/group_join.c:231
-msgid "You have successfully exited the group"
+#: ../libpurple/protocols/qq/group_join.c:233
+msgid "You have successfully left the group"
 msgstr "You have successfully left the group"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ Group Auth"
 
-#: ../libpurple/protocols/qq/group_join.c:256
-msgid "Your authorization operation has been accepted by the QQ server"
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Your authorisation request has been accepted by the QQ server"
 
-#: ../libpurple/protocols/qq/group_join.c:327
-msgid "You inputted a group id outside the acceptable range"
-msgstr "You inputted a group ID outside the permitted range"
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered a group ID outside the acceptable range"
+msgstr "You entered a group ID outside the acceptable range"
 
-#: ../libpurple/protocols/qq/group_join.c:358
-msgid "Are you sure to exit this Qun?"
+#: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure you want to leave this Qun?"
 msgstr "Are you sure you want to leave this Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7926,79 +9514,69 @@
 "Note: if you are the creator \n"
 "this operation will eventually remove this Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:365
-msgid "Go ahead"
-msgstr "Continue"
-
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Group Operation Error"
 
-#. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#. we want to see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "Do you want to approve the request?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
-msgid "You have successfully modify Qun member"
-msgstr "You have successfully modified the Qun member"
-
-#: ../libpurple/protocols/qq/group_opt.c:304
-msgid "You have successfully modify Qun information"
-msgstr "You have successfully modified the Qun information"
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Enter your reason:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+msgid "You have successfully modified Qun member"
+msgstr "You have successfully modified Qun member"
+
+#: ../libpurple/protocols/qq/group_opt.c:305
+msgid "You have successfully modified Qun information"
+msgstr "You have successfully modified Qun information"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "You have successfully created a Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Would you like to set up the Qun details now?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "System Message"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Server ACK"
-msgstr "Server ACK"
-
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "IM send failed\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr "Keep alive error; connection appears to be lost!"
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Failed to send IM."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+msgid "Keep alive error"
+msgstr "Keep alive error"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "Request login token error!"
+msgid "Error requesting login token"
+msgstr "Error requesting login token"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Unable to login; check debug log"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2380
-#: ../libpurple/protocols/yahoo/yahoo.c:2408
-#: ../libpurple/protocols/yahoo/yahoo.c:2515
-#: ../libpurple/protocols/yahoo/yahoo.c:2536
-#: ../libpurple/protocols/yahoo/yahoo.c:2620
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Unable to connect."
@@ -8008,96 +9586,83 @@
 msgid "Unknown-%d"
 msgstr "Unknown-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s Address"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP Address"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP Address"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Level"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Available"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Away"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Invisible"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Offline"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Invalid name"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Currently Online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Last Refreshed</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Connection Mode</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>My Public IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Login Time</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Last Login IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Last Login Time</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Login Information"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Modify My Information"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Set My Information"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Change Password"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Show Login Information"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Leave this QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Block this buddy"
 
@@ -8111,25 +9676,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protocol\tPlugin"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "Login using TCP"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Login Hidden"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Socket send error"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Connection refused"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Connect using TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8139,80 +9692,76 @@
 msgid "Unable to read from socket"
 msgstr "Unable to read from socket"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d has declined the file %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "File Send"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelled the transfer of %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Connection lost"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Login failed; no reply"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "Do you want to add this buddy to your buddy list?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "Do you want to add this buddy?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "You have been added by %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Would you like to add this person?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s has added you [%s]"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s has added you [%s] to his or her buddy list"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "User %s rejected your request"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
-msgstr "User %s has approved your request"
+msgid "User %s approved your request"
+msgstr "User %s approved your request"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s wants to add you [%s] as a friend"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Message: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s is not in your buddy list"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "Would you like to add this person?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Connection closed (writing)"
@@ -8276,10 +9825,6 @@
 msgid "Starting Services"
 msgstr "Starting Services"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Connected"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8335,10 +9880,6 @@
 msgid "Video Camera"
 msgstr "Video Camera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "File Transfer"
-
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -8405,7 +9946,7 @@
 msgid "Send TEST Announcement"
 msgstr "Send TEST Announcement"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Topic:"
 
@@ -8430,7 +9971,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "No Sametime Community Server Specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3966
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Connect"
 
@@ -8608,7 +10149,7 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Search Results"
 
@@ -8668,60 +10209,85 @@
 msgstr "Hide client identity"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s is not present in the network"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Cannot perform the key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Error occurred during key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Key Agreement failed"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Timeout during key agreement"
 
-#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Key agreement was aborted"
 
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Key agreement is already started"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Key agreement cannot be started with yourself"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "The remote user is not present in the network any more"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8730,7 +10296,8 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8741,69 +10308,99 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Key Agreement Request"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM With Password"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Cannot set IM key"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Set IM Password"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "User Information"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "The %s buddy is not trusted"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8812,16 +10409,19 @@
 "You can use the Get Public Key command to get the public key."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "The %s buddy is not present in the network"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8829,15 +10429,18 @@
 "To add the buddy you must import their public key. Press Import to import a "
 "public key."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Select correct user"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8845,7 +10448,8 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8854,237 +10458,311 @@
 "from the list to add to the buddy list."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Detached"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposed"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Happy"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Sad"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Angry"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Jealous"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Ashamed"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincible"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "In Love"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sleepy"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Bored"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Excited"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Anxious"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "User Modes"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
-msgid "Mood"
-msgstr "Mood"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Device"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Timezone"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Kill User"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Draw On Whiteboard"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Channel Information"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9098,332 +10776,445 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Group name"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Invite List"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "You are channel founder on <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Call Command"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Secure File Transfer"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Error during file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Remote disconnected"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Permission denied"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Key agreement failed"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Connection timed out"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Connection creation failed"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "File transfer session does not exist"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "No file transfer session active"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "File transfer already started"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Could not perform key agreement for file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Could not start the file transfer"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Error occurred"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s has changed the topic of <I>%s</I> to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Date of Birth"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Job Role"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unit"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "You are channel founder on <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Real Name"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Status Text"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_More..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Room List"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Network is empty"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "No server statistics available"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9458,104 +11249,59 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Error during connecting to SILC Server"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Key Exchange failed"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Disconnected by server"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Cannot watch user"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Failure: Version mismatch, upgrade your client"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Failure: Remote does not trust/support your public key"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Failure: Remote does not support proposed KE group"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Failure: Remote does not support proposed cipher"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Failure: Remote does not support proposed PKCS"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Failure: Remote does not support proposed hash function"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Failure: Remote does not support proposed HMAC"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Failure: Incorrect signature"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Failure: Invalid cookie"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Failure: Authentication failed"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9564,12 +11310,12 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Received %s's public key. Would you like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9582,73 +11328,99 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verify Public Key"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_View..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: ../libpurple/protocols/silc/silc.c:153
-msgid "Connection failed"
-msgstr "Connection failed"
-
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Cannot initialise SILC Client connection"
-
-#: ../libpurple/protocols/silc/silc.c:185
-msgid "Performing key exchange"
-msgstr "Performing key exchange"
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Disconnected by server"
 
-#: ../libpurple/protocols/silc/silc.c:271
-msgid "Out of memory"
-msgstr "Out of memory"
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "No name"
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Key Exchange failed"
 
-#: ../libpurple/protocols/silc/silc.c:317
-msgid "Cannot initialize SILC protocol"
-msgstr "Cannot initialise SILC protocol"
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Cannot find/access ~/.silc directory"
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
+msgid "Connection failed"
+msgstr "Connection failed"
+
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
+msgid "Performing key exchange"
+msgstr "Performing key exchange"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Could not load SILC key pair: %s"
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Could not load SILC key pair"
 
-#: ../libpurple/protocols/silc/silc.c:359
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Unable to create connection"
 
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
+msgid "Out of memory"
+msgstr "Out of memory"
+
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
+msgid "Cannot initialize SILC protocol"
+msgstr "Cannot initialise SILC protocol"
+
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Error loading SILC key pair"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "In love"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9656,46 +11428,63 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Video conferencing"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online Services"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Your vCard File"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Timezone (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9705,169 +11494,213 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Create New SILC Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Passphrases do not match"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Key Pair Generation failed"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Key length"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Public key file"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Private key file"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Passphrase (retype)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generate Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Online Status"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Create SILC key pair..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unknown command: %s, (may be a client bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9875,7 +11708,8 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9883,15 +11717,18 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9899,35 +11736,43 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9944,116 +11789,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plug-in"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1921
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Network"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Public Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Private Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Use Perfect Forward Secrecy"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Reject watching by other users"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Block invites"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Reject online status attribute requests"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Block messages to whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Automatically open whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Digitally sign and verify all messages"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Cannot create SILC key pair\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Real Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "User Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Host Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Country: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Key Length: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Version: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10064,7 +11934,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10073,37 +11944,44 @@
 "Public Key Babbleprint:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Public Key Information"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Paging"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s sent message to whiteboard. Would you like to open the whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10112,36 +11990,97 @@
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "No server statistics available"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Failure: Version mismatch, upgrade your client"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Failure: Remote does not trust/support your public key"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Failure: Remote does not support proposed KE group"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Failure: Remote does not support proposed cipher"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Failure: Remote does not support proposed PKCS"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Failure: Remote does not support proposed hash function"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Failure: Remote does not support proposed HMAC"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Failure: Incorrect signature"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Failure: Invalid cookie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Failure: Authentication failed"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Cannot initialise SILC Client connection"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "No name"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Cannot find/access ~/.silc directory"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Could not load SILC key pair: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Could not write"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Could not create listen socket"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Couldn't resolve host"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Could not resolve hostname"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP screen names may not contain whitespaces or @ symbols"
 
@@ -10153,36 +12092,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE Protocol Plug-in"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publish status (note: anyone can watch you)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Use UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Use proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Auth User"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
@@ -10341,7 +12280,8 @@
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -10401,30 +12341,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s has sent you a webcam invitation, which is not yet supported."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s just sent you a Buzz!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Authorisation denied message:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s has (retroactively) denied your request to add them to your list."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10433,11 +12368,16 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s has (retroactively) denied your request to add them to your list."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10448,11 +12388,11 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10461,149 +12401,171 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked, please log in to the Yahoo! website."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Received unexpected HTTP response from server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2490
-#: ../libpurple/protocols/yahoo/yahoo.c:2669
-#: ../libpurple/protocols/yahoo/yahoo.c:2772
-#: ../libpurple/protocols/yahoo/yahoo.c:2782
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Lost connection with %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Could not establish a connection with %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Not at Home"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Not at Desk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Not in Office"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2989
-#: ../libpurple/protocols/yahoo/yahoo.c:3019
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3036
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Appear Online"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3039
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Presence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3157
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3163
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3191
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Presence Settings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-msgid "Active which ID?"
-msgstr "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+msgid "Activate which ID?"
+msgstr "Activate which ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3241
-msgid "Join who in chat?"
-msgstr "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
+msgstr "Join whom in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3257
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
-msgid "You have just sent a Buzz!"
-msgstr "You have just sent a Buzz!"
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Open Inbox"
+msgstr "Open Inbox"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Buzz"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzzing %s..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3828
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  List rooms on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Buzz a user to get their attention"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3836
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -10617,130 +12579,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4072
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4075
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Japan Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4078
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Pager port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4081
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "File transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Japan file transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Chat room locale"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4101
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "Chat room list URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4104
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4107
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chat port"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "Failed to join chat"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "Unknown room"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "Perhaps the room is full"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "Not available"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "You are now chatting in %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "Failed to join buddy in chat"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "Perhaps they're not in a chat?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Fetching the room list failed."
-msgstr "Fetching the room list failed."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
-msgid "Voices"
-msgstr "Voices"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-msgid "Unable to fetch room list."
-msgstr "Unable to fetch room list."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
-msgid "User Rooms"
-msgstr "User Rooms"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -10748,26 +12639,26 @@
 msgid "Sent Doodle request."
 msgstr "Sent Doodle request."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Write Error"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10775,7 +12666,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -10783,47 +12674,47 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Latest News"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Last Update"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -10831,7 +12722,7 @@
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10839,7 +12730,7 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10849,10 +12740,81 @@
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Invitation Rejected"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Failed to join chat"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Unknown room"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Perhaps the room is full"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Not available"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Failed to join buddy in chat"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Perhaps they're not in a chat?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Voices"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "User Rooms"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
@@ -10879,11 +12841,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Unable to send to chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "User"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11031,7 +12988,7 @@
 msgstr "Exposure"
 
 #: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11061,7 +13018,7 @@
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Could not resolve host name"
 
@@ -11086,11 +13043,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "I'm not here right now"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "saved statuses"
 
@@ -11099,7 +13056,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Requesting %s's attention..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s has requested your attention!"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11108,22 +13075,42 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL Connection Failed"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL Handshake Failed"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL peer presented an invalid certificate"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Unknown SSL error"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Unset"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Unavailable"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+msgid "Do not disturb"
+msgstr "Do not disturb"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Extended away"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11154,27 +13141,27 @@
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s became idle"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is no longer idle"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error reading %s"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11183,62 +13170,67 @@
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Unknown."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hour"
 msgstr[1] "%s, %d hours"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3365 ../libpurple/util.c:3663
+#: ../libpurple/util.c:3550
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Could not open %s: Redirected too many times"
+
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Unable to connect to %s"
 
-#: ../libpurple/util.c:3491
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11247,17 +13239,17 @@
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 
-#: ../libpurple/util.c:3526
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error reading from %s: %s"
 
-#: ../libpurple/util.c:3557
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error writing to %s: %s"
 
-#: ../libpurple/util.c:3582
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s: %s"
@@ -11283,55 +13275,71 @@
 msgstr "The orientation of the tray."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:408
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../pidgin/gtkaccount.c:524
-msgid "Local alias:"
-msgstr "Local alias:"
+#: ../pidgin/gtkaccount.c:428
+msgid "Pro_tocol:"
+msgstr "Pro_tocol:"
+
+#: ../pidgin/gtkaccount.c:439
+msgid "Screen _name:"
+msgstr "Screen _name:"
+
+#: ../pidgin/gtkaccount.c:529
+msgid "_Local alias:"
+msgstr "_Local alias:"
+
+#: ../pidgin/gtkaccount.c:533
+msgid "Remember pass_word"
+msgstr "Remember pass_word"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:586
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "User Options"
 
-#. Buddy icon
 #: ../pidgin/gtkaccount.c:604
-msgid "Use this buddy icon for this account:"
-msgstr "Use this buddy icon for this account:"
+msgid "New _mail notifications"
+msgstr "New _mail notifications"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:609
+msgid "Use this buddy _icon for this account:"
+msgstr "Use this buddy _icon for this account:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:724
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
-#: ../pidgin/gtkaccount.c:929
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Use GNOME Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:930
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: ../pidgin/gtkaccount.c:942
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:948
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:960 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -11340,60 +13348,72 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:999
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1002
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: ../pidgin/gtkaccount.c:1023
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1058
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../pidgin/gtkaccount.c:1065 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1471
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Unable to save new account"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "An account already exists with the specified criteria."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../pidgin/gtkaccount.c:1495
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../pidgin/gtkaccount.c:1506
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Create this new account on the server"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2200
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11416,11 +13436,11 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: ../pidgin/gtkblist.c:745
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11428,222 +13448,232 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Block"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Un_block"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Send File"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Join"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: ../pidgin/gtkblist.c:2838
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Buddies/Show _Offline Buddies"
-
-#: ../pidgin/gtkblist.c:2839
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Buddies/Show _Empty Groups"
-
-#: ../pidgin/gtkblist.c:2840
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Buddies/Show Buddy _Details"
-
-#: ../pidgin/gtkblist.c:2841
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Buddies/Show"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Buddies/Show/_Offline Buddies"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Buddies/Show/_Empty Groups"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Buddies/Show/Buddy _Details"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Buddies/Show/Idle _Times"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Buddies/Show/_Protocol Icons"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddies/_Sort Buddies"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6448
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Accounts/Add\\/Edit"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tools/Buddy _Pounces"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Tools/_Certificates"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Tools/System _Log"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
 #. Help
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -11652,127 +13682,132 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Buddy Alias"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Logged In"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Last Seen"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Spooky"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Awesome"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Rockin'"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3450
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Idle %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Idle %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Idle %dm"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddies/New Instant Message..."
 
-#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddies/Get User Info..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddies/Add Buddy..."
 
-#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddies/Add Chat..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Buddies/Add Group..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d unread messages from %s\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manually"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alphabetically"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "By status"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "By log size"
 
-#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s disconnected"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Re-enable Account"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s disconnected: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Username:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11790,23 +13825,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Buddies/Show Offline Buddies"
-
-#: ../pidgin/gtkblist.c:4508
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Buddies/Show Empty Groups"
-
-#: ../pidgin/gtkblist.c:4514
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Buddies/Show Buddy Details"
-
-#: ../pidgin/gtkblist.c:4517
-msgid "/Buddies/Show Idle Times"
-msgstr "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Buddies/Show/Offline Buddies"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Buddies/Show/ Empty Groups"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Buddies/Show/Buddy Details"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Buddies/Show/Idle Times"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Buddies/Show/Protocol Icons"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -11816,17 +13855,20 @@
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
-#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5790
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Group:"
+#. End of account box
+#: ../pidgin/gtkblist.c:5536
+msgid "_Screen name:"
+msgstr "_Screen name:"
+
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
+msgid "A_lias:"
+msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5686
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: ../pidgin/gtkblist.c:5702
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11834,7 +13876,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: ../pidgin/gtkblist.c:5743
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11842,42 +13884,47 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: ../pidgin/gtkblist.c:5828
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: ../pidgin/gtkblist.c:6468
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Accounts/"
 
-#: ../pidgin/gtkblist.c:6492
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
-#: ../pidgin/gtkblist.c:6505 ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "No actions available"
 
-#: ../pidgin/gtkblist.c:6513
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../pidgin/gtkblist.c:6525
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Enable Account"
 
-#: ../pidgin/gtkblist.c:6531
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Accounts/Enable Account"
 
-#: ../pidgin/gtkblist.c:6580
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Tools"
 
-#: ../pidgin/gtkblist.c:6650
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL Servers"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -11891,22 +13938,26 @@
 "%s will not attempt to reconnect the account until you correct the error and "
 "re-enable the account."
 
-#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:462
+msgid "Unknown command."
+msgstr "Unknown command."
+
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "That buddy is not on the same protocol as this chat."
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "You are not currently signed on with an account that can invite that buddy."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -11914,352 +13965,362 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Message:"
 
-#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Find"
 
-#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Logging started. Future messages in this conversation will be logged."
-
-#: ../pidgin/gtkconv.c:1366
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Logging stopped. Future messages in this conversation will not be logged."
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Last said"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animate"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Set Custom Icon..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Remove Custom Icon"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Show All"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/M_ore"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/_Unblock..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2903
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversation/Insert Lin_k..."
+
+#: ../pidgin/gtkconv.c:2905
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversation/Insert Imag_e..."
+
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: ../pidgin/gtkconv.c:2824
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Show Buddy _Icons"
-
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbars"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Conversation/More"
 
+#: ../pidgin/gtkconv.c:3100
+msgid "/Options"
+msgstr "/Options"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Unblock..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3223
+msgid "/Conversation/Insert Link..."
+msgstr "/Conversation/Insert Link..."
+
+#: ../pidgin/gtkconv.c:3227
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversation/Insert Image..."
+
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbars"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#: ../pidgin/gtkconv.c:3055
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Show Buddy Icons"
-
-#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "User has typed something and stopped"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Send To"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Typing"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Stopped Typing"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "New Event"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7550
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Clears all conversation scrollbacks."
+
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Confirm close"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "You have unread messages. Are you sure you want to close the window?"
 
-#: ../pidgin/gtkconv.c:7812
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Close other tabs"
 
-#: ../pidgin/gtkconv.c:7818
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Close all tabs"
 
-#: ../pidgin/gtkconv.c:7826
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Detach this tab"
 
-#: ../pidgin/gtkconv.c:7832
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Close this tab"
 
-#: ../pidgin/gtkconv.c:8216
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: ../pidgin/gtkconv.c:8737
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Last created window"
 
-#: ../pidgin/gtkconv.c:8739
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: ../pidgin/gtkconv.c:8741 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "New window"
 
-#: ../pidgin/gtkconv.c:8743
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "By group"
 
-#: ../pidgin/gtkconv.c:8745
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "By account"
 
@@ -12323,25 +14384,22 @@
 msgid "Fatal Error"
 msgstr "Fatal Error"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "lead developer"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "developer"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "support"
@@ -12350,367 +14408,388 @@
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Senior Contributor/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim maintainer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP developer"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "original author"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valencian Catalan"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Czech"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Danish"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "German"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Greek"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Australian English"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "British English"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonian"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Euskera (Basque)"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persian"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "French"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galician"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujarati Language Team"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
 msgid "Italian"
 msgstr "Italian"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:244
 msgid "Georgian"
 msgstr "Georgian"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgian Translators"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada Translation team"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Korean"
 msgstr "Korean"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdish"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:249
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:250
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Dutch, Flemish"
 
-#: ../pidgin/gtkdialogs.c:178
-msgid "Norwegian"
-msgstr "Norwegian"
+#: ../pidgin/gtkdialogs.c:189
+msgid "Norwegian Nynorsk"
+msgstr "Norwegian Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:251
 msgid "Polish"
 msgstr "Polish"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Russian"
 msgstr "Russian"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:257
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albanian"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:260
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:261
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinese"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:262
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:347
 #, c-format
 msgid "About %s"
 msgstr "About %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:385
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:403
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:389
+#: ../pidgin/gtkdialogs.c:408
 msgid "Current Developers"
 msgstr "Current Developers"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:423
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:438
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:453
+msgid "Retired Crazy Patch Writers"
+msgstr "Retired Crazy Patch Writers"
+
+#: ../pidgin/gtkdialogs.c:468
 msgid "Artists"
 msgstr "Artists"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:483
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:503
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:521
 msgid "Debugging Information"
 msgstr "Debugging Information"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:891
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: ../pidgin/gtkdialogs.c:858
+#: ../pidgin/gtkdialogs.c:893
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12718,11 +14797,11 @@
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:983
 msgid "View User Log"
 msgstr "View User Log"
 
-#: ../pidgin/gtkdialogs.c:950
+#: ../pidgin/gtkdialogs.c:985
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12730,32 +14809,32 @@
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 
-#: ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:1006
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1028
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkdialogs.c:1030
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1052
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1091
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12770,15 +14849,15 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1099
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1102
 msgid "_Remove Contact"
 msgstr "_Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1133
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12787,15 +14866,15 @@
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1140
 msgid "Merge Groups"
 msgstr "Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1143
 msgid "_Merge Groups"
 msgstr "_Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1193
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12804,30 +14883,30 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1196
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1199
 msgid "_Remove Group"
 msgstr "_Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1232
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1235
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1238
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1224
+#: ../pidgin/gtkdialogs.c:1259
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12836,11 +14915,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1262
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1265
 msgid "_Remove Chat"
 msgstr "_Remove Chat"
 
@@ -12935,66 +15014,66 @@
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Close this window when all transfers _finish"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "C_lear finished transfers"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "File transfer _details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Resume"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Paste as Plain _Text"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Reset formatting"
 
-#: ../pidgin/gtkimhtml.c:1284
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: ../pidgin/gtkimhtml.c:1285
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1288
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
 
-#: ../pidgin/gtkimhtml.c:1289
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
-#: ../pidgin/gtkimhtml.c:1505
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: ../pidgin/gtkimhtml.c:1517
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../pidgin/gtkimhtml.c:1527
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../pidgin/gtkimhtml.c:3200
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13004,7 +15083,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3203
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13014,7 +15093,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3216
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13025,7 +15104,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3219
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13036,35 +15115,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3299 ../pidgin/gtkimhtml.c:3311
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../pidgin/gtkimhtml.c:3339
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Select Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13072,85 +15151,156 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "_Font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Group Items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Ungroup Items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Bold"
 
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Italic"
 
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Underline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "Larger font size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "Smaller font size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "Font face"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "Foreground font colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "Background colour"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "Reset formatting"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "Insert link"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "Insert image"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "Insert smiley"
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Strikethrough"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Increase Font Size"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Decrease Font Size"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Font Face"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Background Colour"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Foreground Colour"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Reset Formatting"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Insert IM Image"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Insert Smiley"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>_Bold</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>_Italic</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>_Underline</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Strikethrough</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Larger</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Smaller</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "_Font face"
+msgstr "_Font face"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "Foreground _colour"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "Bac_kground colour"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1266
+msgid "_Smiley"
+msgstr "_Smiley"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1272
+msgid "_Image"
+msgstr "_Image"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1278
+msgid "_Link"
+msgstr "_Link"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Horizontal rule"
 
-#: ../pidgin/gtklog.c:267
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13159,7 +15309,7 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13168,7 +15318,7 @@
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13177,21 +15327,21 @@
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13199,7 +15349,7 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13207,45 +15357,45 @@
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "No logs were found"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Browse logs folder"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Total log size:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations in %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "System Log"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Try `%s -h' for more information.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13254,6 +15404,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13265,12 +15416,13 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13279,7 +15431,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13297,7 +15449,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13309,48 +15461,50 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Open All Messages"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Sender"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>You have %d new e-mail.</b>"
 msgstr[1] "<b>You have %d new e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13398,108 +15552,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plug-in Details</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Select a file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Si_gns on"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Signs o_ff"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "Goes a_way"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "Ret_urn from away"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Becomes _idle"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Is no longer i_dle"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Starts _typing"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "P_auses while typing"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Stops t_yping"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Sends a _message"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Ope_n a message window"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Pop up a notification"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Brows_e..."
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Br_owse..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "P_ounce only when my status is \"not available\""
+#: ../pidgin/gtkpounce.c:797
+msgid "P_ounce only when my status is not Available"
+msgstr "P_ounce only when my status is not Available"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Recurring"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Default"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley theme failed to unpack."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Install Theme"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -13507,239 +15670,252 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icon"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Show system tray icon:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1649
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Always"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "On unread messages"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Conversation Window Hiding"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "When away"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Placement"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Top"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Left"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Right"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Left Vertical"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Right Vertical"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_ew conversations:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Show _formatting on incoming messages"
 
-#: ../pidgin/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Show buddy _icons"
+#: ../pidgin/gtkprefs.c:997
+msgid "Show _detailed information"
+msgstr "Show _detailed information"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "Highlight _misspelled words"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Use smooth-scrolling"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "F_lash window when IMs are received"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_ze new conversation windows"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Font"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "Use document font from _theme"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "Use font from _theme"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "Conversation _font:"
+
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Autodetect IP address"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Start port:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_End port:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "No proxy"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_User:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME Default"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Browser default"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Existing window"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "New tab"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13748,80 +15924,63 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Log _format:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Log all _instant messages"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Log all _status changes to system log"
 
-#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1757
-msgid "(default)"
-msgstr "(default)"
-
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Quietest"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Quieter"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Quiet"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Loud"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Louder"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Loudest"
 
-#: ../pidgin/gtkprefs.c:1598
-msgid "Sound Method"
-msgstr "Sound Method"
-
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Console beep"
 
-#: ../pidgin/gtkprefs.c:1603
-msgid "Automatic"
-msgstr "Automatic"
-
-#: ../pidgin/gtkprefs.c:1607
-msgid "Command"
-msgstr "Command"
-
-#: ../pidgin/gtkprefs.c:1608
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "No sounds"
 
-#: ../pidgin/gtkprefs.c:1616
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13830,117 +15989,81 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: ../pidgin/gtkprefs.c:1642
-msgid "Sound Options"
-msgstr "Sound Options"
-
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Enable sounds:"
 
-#: ../pidgin/gtkprefs.c:1647
-msgid "Only when available"
-msgstr "Only when available"
-
-#: ../pidgin/gtkprefs.c:1648
-msgid "Only when not available"
-msgstr "Only when not available"
-
-#: ../pidgin/gtkprefs.c:1656
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1684
-msgid "Sound Events"
-msgstr "Sound Events"
-
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Play"
 
-#: ../pidgin/gtkprefs.c:1742
-msgid "Event"
-msgstr "Event"
-
-#: ../pidgin/gtkprefs.c:1761
-msgid "Test"
-msgstr "Test"
-
-#: ../pidgin/gtkprefs.c:1765
-msgid "Reset"
-msgstr "Reset"
-
-#: ../pidgin/gtkprefs.c:1769
-msgid "Choose..."
-msgstr "Choose..."
-
-#: ../pidgin/gtkprefs.c:1812
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
 
-#: ../pidgin/gtkprefs.c:1817
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-#: ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "When both away and idle"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1836
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: ../pidgin/gtkprefs.c:1838
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Change status when _idle"
 
-#: ../pidgin/gtkprefs.c:1842
-msgid "_Minutes before changing status:"
-msgstr "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutes before becoming idle:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1871
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Status at Startup"
 
-#: ../pidgin/gtkprefs.c:1873
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Use status from last _exit at startup"
 
-#: ../pidgin/gtkprefs.c:1879
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Status to a_pply at startup:"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: ../pidgin/gtkprefs.c:1920
-msgid "Sounds"
-msgstr "Sounds"
-
-#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:1930
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Status / Idle"
 
@@ -13964,63 +16087,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Permit User"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Permit"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Block User"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -14029,151 +16152,104 @@
 msgid "Apply"
 msgstr "Apply"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Choose New Name"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Select Folder..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Room List"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Get List"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Add Chat"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Are you sure you want to delete the selected saved statuses?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Use"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Title already in use.  You must choose a unique title."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Different"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Use a _different status for some accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Buddy logs in"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Buddy logs out"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Message received"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Message received begins conversation"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Message sent"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person enters chat"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person leaves chat"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "You talk in chat"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Others talk in chat"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Someone says your screen name in chat"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer Failure"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer failed to initialize."
-
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Waiting for network connection"
 
-#: ../pidgin/gtkutils.c:590
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1305 ../pidgin/gtkutils.c:1328
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: ../pidgin/gtkutils.c:1308 ../pidgin/gtkutils.c:1330
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: ../pidgin/gtkutils.c:1404
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: ../pidgin/gtkutils.c:1405
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14182,12 +16258,12 @@
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 
-#: ../pidgin/gtkutils.c:1437 ../pidgin/gtkutils.c:1449
-#: ../pidgin/gtkutils.c:1456
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: ../pidgin/gtkutils.c:1438
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14195,31 +16271,31 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../pidgin/gtkutils.c:1444 ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: ../pidgin/gtkutils.c:1445 ../pidgin/gtkutils.c:1466
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Send image file"
 
-#: ../pidgin/gtkutils.c:1446 ../pidgin/gtkutils.c:1466
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: ../pidgin/gtkutils.c:1450
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Would you like to set it as the buddy icon for this user?"
 
-#: ../pidgin/gtkutils.c:1457
+#: ../pidgin/gtkutils.c:1550
 msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
 msgstr ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
 
-#: ../pidgin/gtkutils.c:1459
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14232,11 +16308,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14244,7 +16320,7 @@
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 
-#: ../pidgin/gtkutils.c:2264
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14255,98 +16331,108 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2560
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "The file '%s' is too large for %s.  Please try a smaller image.\n"
 
-#: ../pidgin/gtkutils.c:2562
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Icon Error"
 
-#: ../pidgin/gtkutils.c:2563
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Could not set icon"
 
-#: ../pidgin/gtkutils.c:2663
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2712
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Failed to load image \"%s\": reason not known; probably a corrupt image file"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Save File"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Select colour"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Close _tabs"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Get Info"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Invite"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Modify"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin smileys"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Selecting this disables graphical emoticons."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "none"
+
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Display Statistics"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Responses Probability:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistics Configuration"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Maximum response timeout:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutes"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Maximum last-seen difference:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Threshold:"
 
@@ -14356,18 +16442,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Contact Availability Prediction"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Contact Availability Prediction plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14472,7 +16558,7 @@
 msgid "Received Messages"
 msgstr "Received Messages"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Select Colour for %s"
@@ -14597,24 +16683,29 @@
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Select a person from your address book below, or add a new person."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Group:"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -14623,43 +16714,43 @@
 "person."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "User _details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "Unable to send e-mail"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "The evolution executable was not found in the PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "An e-mail address was not found for this buddy."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Send E-Mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
@@ -14669,7 +16760,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -14677,37 +16768,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Provides integration with Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Please enter the buddy's screen name and account type below."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Account type:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Optional information:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Forename"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Surname"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -14730,6 +16821,15 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "Test to see that all UI signals are working properly."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Buddy Note</b>: %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "History"
@@ -14776,11 +16876,11 @@
 msgid "Draw Markerline in "
 msgstr "Draw Markerline in "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
@@ -14796,32 +16896,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Music messaging session confirmed."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Music Messaging"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "There was a conflict in running the command:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Error Running Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "The following error has occurred:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Music Messaging Configuration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Score Editor Path"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -14833,12 +16933,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging Plugin for collaborative composition."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -14847,74 +16947,74 @@
 "on a piece of music by editting a common score in real-time."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notify For"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Only when someone says your screen name"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insert c_ount of new messages into window title"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Insert count of new messages into _X property"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "R_aise conversation window"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -14924,7 +17024,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -14932,7 +17032,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -15002,24 +17102,24 @@
 msgid "Notify Dialog"
 msgstr "Notify Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Select Colour"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Select Interface Font"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Select Font for %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Select Interface Font"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Interface Font"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut Theme"
 
@@ -15043,36 +17143,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Interface colours"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget Sizes"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Tools"
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc File Tools"
 
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Write settings to %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Re-read gtkrc files"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Theme Control"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Provides access to commonly used gtkrc settings."
 
@@ -15094,28 +17194,19 @@
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "You are using %s version %s.  The current version is %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
 msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:82
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>ChangeLog:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "New Version Available"
 
@@ -15125,19 +17216,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Release Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Checks periodically for new releases."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15145,68 +17236,68 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duplicate Correction"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "The specified word already exists in the correction list."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "You type"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "You send"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Whole words only"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "You _type:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "You _send:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Exact case match (uncheck for automatic case handling)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Only replace _whole words"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "General Text Replacement Options"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Enable replacement of last word on send"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -15216,7 +17307,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -15224,7 +17315,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
@@ -15310,44 +17401,44 @@
 "This plug-in allows the user to customize conversation and logging message "
 "timestamp formats."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Remove IM window transparency on focus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Always on top"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Remove Buddy List window transparency on focus"
 
@@ -15357,19 +17448,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15381,53 +17472,53 @@
 "\n"
 "* Note: This plug-in requires Win2000 or greater."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Startup"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s on Windows startup"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Keep Buddy List window on top:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Only when docked"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Flash window when chat messages are received"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin Options"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Pidgin for Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Logged out.</font>"
 
@@ -15437,7 +17528,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP Console"
diff -ru pidgin-2.1.1/po/eo.po pidgin-2.2.0/po/eo.po
--- pidgin-2.1.1/po/eo.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/eo.po	2007-09-14 00:45:42.000000000 -0400
@@ -10243,7 +10243,7 @@
 msgstr "Ŝaltu kiun ID?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3234
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Kiun kuniĝi en babilejo?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3244
diff -ru pidgin-2.1.1/po/es.po pidgin-2.2.0/po/es.po
--- pidgin-2.1.1/po/es.po	2007-08-20 14:13:02.000000000 -0400
+++ pidgin-2.2.0/po/es.po	2007-09-14 00:45:42.000000000 -0400
@@ -7,7 +7,7 @@
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
 # 	      January 2005, January/February 2006, October 2006, January 2007,
-# 	      April 2007
+# 	      April 2007, August 2007, September 2007
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -49,12 +49,13 @@
 # - Smiley: Emoticono
 # - Tab: solapa (pestaña está descartado por los traductores de
 #        GNOME desde la versión 2.6)
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-23 03:23-0400\n"
-"PO-Revision-Date: 2007-07-24 02:25+0200\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
+"PO-Revision-Date: 2007-09-12 01:29+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -64,17 +65,17 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para más información.\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -97,7 +98,7 @@
 "  -n, --nologin        no conectarse de forma automática\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -108,15 +109,18 @@
 "el problema y complete la migración de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Error"
@@ -129,91 +133,95 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Recordar contraseña"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "No se han instalado complementos de protocolo."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Posiblemente se olvido de ejecutar 'make install'.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Modificar cuenta"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nueva cuenta"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nombre de usuario:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Apodo:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2199 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -230,109 +238,112 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1912
-#: ../pidgin/gtkaccount.c:2506 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Guardar"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1904
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Seguro que quiere borrar a %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Borrar cuenta"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1911 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2105 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2329 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puede (desh)habilitar cuentas de la lista a continuación."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2505
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1652
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Añadir"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2452
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha hecho a %s su amigo o amiga%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2504
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "¿Desea añadir el amigo a su lista?"
 
-#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2556
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quiere añadir a %s a su lista de amigos%s%s."
 
-#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2579
-#: ../pidgin/gtkaccount.c:2585
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "¿Autorizar al amigo?"
 
-#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
-#: ../pidgin/gtkaccount.c:2580 ../pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Denegar"
 
@@ -356,36 +367,36 @@
 msgid "Error adding buddy"
 msgstr "Error al añadir al amigo"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2860
-#: ../pidgin/gtkaccount.c:1985 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nombre de usuario"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1241
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apodo"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1293
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -394,7 +405,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Añadir amigo"
@@ -403,14 +414,15 @@
 msgid "Please enter buddy information."
 msgstr "Introduzca la información del amigo."
 
-#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -418,156 +430,161 @@
 msgid "Name"
 msgstr "Nombre"
 
-#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Conectarse automáticamente"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Añadir chat"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr ""
 "Puede editar más información más adelante a través del menú contextual."
 
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Error al añadir al grupo"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Debe dar un nombre al grupo a añadir."
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Ya existe un grupo con ese nombre"
 
-#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5911
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Añadir grupo"
 
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Introduzca el nombre del grupo"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Editar chat"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Por favor Actualice los campos necesarios."
 
-#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "Conectarse automáticamente"
-
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Editar configuración"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Información"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Obteniendo..."
 
 # No se traduce como «Obtener Información» porque sino hace muy grande el 
 # botón que utiliza este texto y, consecuentemente, la pantalla de Gaim, jfs
-#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Añadir aviso de amigo"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1600
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Ver registro"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduzca el nuevo nombre para %s"
 
-#: ../finch/gntblist.c:993 ../finch/gntblist.c:1241
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Fijar el apodo"
 
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Introduzca una cadena vacía para resetear el nombre."
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Si elimina este contacto también eliminará a todos los amigos en el contacto"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Si elimina este grupo también eliminará a todos los amigos en el grupo"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "¿Está seguro que quiere borrar a %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Confirmar borrado"
 
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1243 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Quitar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1217 ../finch/gntblist.c:2284 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../finch/gntblist.c:1248
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Lugares marcados"
 
-#: ../finch/gntblist.c:1253
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Cambiar marca"
 
 #. General
-#: ../finch/gntblist.c:1288 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -577,30 +594,30 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Apodo"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1308 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Está inactivo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../finch/gntblist.c:1321
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "En el móvil"
 
-#: ../finch/gntblist.c:1401
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -609,12 +626,12 @@
 "En línea: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1410
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cuenta: %s (%s)"
 
-#: ../finch/gntblist.c:1422
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -623,50 +640,54 @@
 "\n"
 "Visto por última vez: hace %s"
 
-#: ../finch/gntblist.c:1688 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../finch/gntblist.c:1695 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Guardado..."
 
-#: ../finch/gntblist.c:2073 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2180 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Nombre"
 
-#: ../finch/gntblist.c:2185 ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "_Cuenta"
 
-#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Mensaje instantáneo nuevo"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Introduzca el nombre de usuario o apodo de la persona con la que quiere "
 "comunicarse."
 
-#: ../finch/gntblist.c:2198 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -683,43 +704,157 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Aceptar"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2218 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Opciones"
 
-#: ../finch/gntblist.c:2224
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2228
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Mostrar grupos vacíos"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Mostrar amigos desconectados"
 
-#: ../finch/gntblist.c:2240
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Ordenar por estado"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabéticamente"
 
-#: ../finch/gntblist.c:2248
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Ordenar por tamaño de registro"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Importación de certificado"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Especifique un nombre de sistema"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Especifique el nombre de sistema para el que se utilizará este certificado."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"No se pudo importar el archivo %s.\n"
+"Asegúrese de que el fichero puede leerse y que está en formato PEM.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Error en la importación de certificado"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "Falló la importación del certificado X.509"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Seleccione un certificado PEM"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Falló la exportación al fichero %s.\n"
+"Asegúrese de que tiene permisos de escritura en la ruta destino\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Error en la exportación de certificado"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "Falló la exportación del certificado X.509"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "Exportación de certificado PEM X.509"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificado para %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Nombre común: %s\n"
+"\n"
+"Huella SHA1:\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "Certificado de equipo SSL"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "¿Seguro que desea borrar el certificado para %s?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Confirme el borrado del certificado"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Gestor de certificados"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Servidor"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Cerrar"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -743,42 +878,46 @@
 "Finch no intentará reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "No existe esa orden."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:493
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Error sintáctico:  Vd. no escribió suficientes argumentos para esa orden."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:499
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Su orden ha fallado por motivos desconocidos."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:506
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Esa orden sólo funciona en chats, no en MIs."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:509
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Esa orden sólo funciona en MIs, no en chats."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:514
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Esa orden no funciona en este protocolo."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "No se pudo enviar el mensaje porque no se ha conectado."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -787,48 +926,69 @@
 "\n"
 "%s está escribiendo..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Ha dejado este chat"
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Se inició el registro. A partir de ahora se registrarán todos los mensajes "
+"de esta conversación."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Se ha parado el registro. No se registrarán mensajes de esta conversación de "
+"ahora en adelante."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Conversación"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Limpiar histórico"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Mostrar marcas de tiempo"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Añadir aviso de amigo..."
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Habilitar registro"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Habilitar sonidos"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<RESPUESTA AUTOMÁTICA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Lista de usuarios:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:336
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Las opciones de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:385
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "No existe esa orden (en este contexto)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -836,7 +996,7 @@
 "Utilice \"/help &lt;orden&gt;\" para obtener ayuda de una orden concreta.\n"
 "Las siguientes órdenes están disponibles en este contexto:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7225
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -844,12 +1004,12 @@
 "say &lt;mensaje;gt;:  Enviar un mensaje como si no se estuviera utilizando "
 "una orden."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7228
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acción&gt;: enviar una acción estilo IRC a un amigo o a un chat."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7231
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -857,43 +1017,43 @@
 "debug &lt;opción&gt;: Enviar información de depuración sobre la conversación "
 "actual."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7234
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: limpia el histórico de la ventana de conversación."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7240
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;orden&gt;:  Recibir ayuda sobre una orden concreta."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Muestra la lista de usuarios en el chat."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostrar la ventana de complementos."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostrar la lista de amigos."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Muestra la ventana de cuentas."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Muestra la ventana de depuración."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Muestra la ventana de preferencias."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "status: Muestra la ventana «savedstatuses»."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Ventana de depuración"
 
@@ -919,99 +1079,95 @@
 msgstr "Trasferencias de archivo - %d%% de %d archivos"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferencia de archivos"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Velocidad"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2672
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Estado"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Cerrar esta ventana cuando todas las transferencias terminen"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Limpiar transferencias terminadas"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Parar"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2479
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Falló"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Se guardó el archivo como %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Terminado"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfiriendo"
 
@@ -1023,11 +1179,11 @@
 msgid "You have mail!"
 msgstr "¡Tiene correo!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1038,29 +1194,25 @@
 msgstr[0] "%s (%s) tiene %d mensaje nuevo."
 msgstr[1] "%s (%s) tiene %d nuevos mensajes."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Nuevo correo"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:915
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s:"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:916
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Información de amigos"
 
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1589
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "MI"
 
@@ -1068,7 +1220,7 @@
 msgid "Join"
 msgstr "Unirse"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invitar"
 
@@ -1127,7 +1279,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -1135,7 +1287,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Indique el amigo del que avisar."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nuevo aviso de amigo"
@@ -1149,7 +1300,7 @@
 msgstr "Avisar a quién"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1158,7 +1309,7 @@
 msgstr "Nombre del amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Avisar cuando un amigo..."
 
@@ -1203,7 +1354,7 @@
 msgstr "Envía un mensaje"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Acción"
 
@@ -1231,70 +1382,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Sólo avisar cuando mi estado es «no disponible»"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Recurrente"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "No se puede crear el aviso"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "No tiene ninguna cuenta."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Antes de poder crear un aviso debe crear primero una cuenta."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "¿Está seguro que desea borrar el aviso en %s para %s?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Avisos de amigos"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha comenzado a escribirle algo (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s ha parado mientras le escribía algo (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se ha conectado (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volvió de su inactividad (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ha dejado de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha dejado de escribirle (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se ha desconectado (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se ha marchado. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s le ha enviado un mensaje. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
 
@@ -1302,13 +1465,13 @@
 msgid "Based on keyboard use"
 msgstr "Basado en el uso del teclado"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Del último mensaje enviado"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
@@ -1357,12 +1520,12 @@
 msgstr "Cambiar estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversaciones"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Registro"
 
@@ -1370,16 +1533,167 @@
 msgid "Not implemented yet."
 msgstr "No implementado aún."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Enviar archivo.."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1532
-#: ../pidgin/gtkrequest.c:1578
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Abrir archivo..."
 
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Se conecta un amigo"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Se desconecta un amigo"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Se recibe un mensaje"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Se recibe un mensaje que comienza una conversación"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Se envía un mensaje"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Alguien entra al chat"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Alguien deja el chat"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Usted habla en el chat"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Otros hablan en el chat"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Alguien dice su nombre de usuario en el chat"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Fallo de gstreamer"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "No se pudo inicializar gstreamer."
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(por omisión)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "Seleccione un archivo de sonido..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "Preferencias de sonido"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "Perfiles"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "Automático"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "Timbre de la consola"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "Comando"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "Sin sonido"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "Método para reproducir sonidos"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "Método:"
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Orden para sonido:\n"
+"(%s para nombre de archivo)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "Opciones de sonido"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "Suena cuando la conversación obtiene el foco"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Siempre"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "Sólo cuando estoy disponible"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "Sólo cuando no estoy disponible"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "Volumen(0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "Eventos de sonido"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "Acontecimiento"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "Archivo"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "Probar"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "Restablecer"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "Seleccionar..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1393,9 +1707,9 @@
 msgid "Saved Statuses"
 msgstr "Estados guardados"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1405,46 +1719,55 @@
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Mensaje"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Usar"
 
@@ -1456,52 +1779,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduzca un título no vacío para el estado."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Introduzca un título distinto para el estado."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sub-estado"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para las siguientes cuentas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Guardar y usar"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificados"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "Sonidos"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Estados"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Erro al cargar el complemento."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "No se pudo encontrar la pantalla X"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "No se pudo encontrar la ventana"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "No se pudo cargar este complemento porque no se construyó con soporte de X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "PortapapelesGnt"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Complemento de portapapeles"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1629,86 +1977,88 @@
 msgid "accounts"
 msgstr "cuentas"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Para conectarse se necesita una contraseña."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduzca la contraseña para %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Introduzca la contraseña"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Guardar la contraseña"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta el complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Error de conexión"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "Las nuevas contraseñas no coinciden."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Rellene todos los campos completamente."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Contraseña original"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Nueva contraseña (otra vez)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar la contraseña de %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Introduzca su contraseña actual y la contraseña nueva."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar la información del usuario %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -1716,22 +2066,177 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(NO COINCIDE)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s ha presentado el certificado mostrado a continuación para este uso de una sola vez:"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Nombre comú: %s %s\n"
+"Huella (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Verificación de certificado de un solo uso"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Autoridades de certificación"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "Caché de servidores SSL"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "¿Desea aceptar el certificado para %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "Verificación de certificado SSL"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Rechazar"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_Ver certificado..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr "El certificado presentado por «%s» dice que pertenece a «%s» en lugar de a aquel. Esto puede significar que no se está conectando al servicio al que piensa que se está conectado."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "El certificado presentado por «%s» es autofirmado. No puede comprobarse de forma automática."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "La cadena de certificados presentada por %s no es válida."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "Error de certificado SSL"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Cadena de certificado inválida"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr "No tiene una base de datos de certificados raíz por lo que no se puede validar este certificado."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Pidgin no conoce el certificado raíz bajo el que este certificado dice haberse generado."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr "La cadena de certificado presentada por %s no tiene una firma digital válida de la Autoridad de Certificación de la que asegura tener la firma."
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Firma de autoridad de certificación inválida"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Nombre común: %s\n"
+"\n"
+"Huella (SHA1): %s\n"
+"\n"
+"Fecha de activación: %s\n"
+"Fecha de expiración: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Información del certificado"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Error de registro"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "Error de registro"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se ha conectado"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1750,45 +2255,45 @@
 msgid "The message is too large."
 msgstr "El mensaje es demasiado largo"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "No se pudo enviar el mensaje."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Enviar un mensaje"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "Enviar un _mensaje"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] ha entrado en la sala."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vd. ahora se llama %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ahora se llama %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha salido de la sala."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
@@ -2180,15 +2685,15 @@
 msgid "Old flat format"
 msgstr "Formato antiguo plano"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "No se pudo registrar esta conversación."
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2197,7 +2702,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2206,17 +2711,17 @@
 "<font color=\"#A82F2f\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPUESTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>¡No se pudo encontrar la ruta del registro!</b></font>"
 
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>No se pudo leer el archivo: %s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
@@ -2313,13 +2818,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1454
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2364,8 +2869,8 @@
 "ficheros autoaceptada\n"
 "(sólo cuando no hay ya una conversación con el que la envía)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Notas"
 
@@ -2385,18 +2890,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Notas de amigos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Guardar las notas de amigos concretos."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Añade la opción de guardar notas sobre los amigos en su lista de amigos."
@@ -2591,34 +3096,34 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(TCU)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "El usuario no está conectado."
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "_Enviar respuesta automática:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se ha desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o más mensajes puede no haber llegado a destino."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Ha sido desconectado del servidor."
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2626,78 +3131,78 @@
 "Actualmente está desconectado. No podrá recibir mensajes a menos que se "
 "conecte."
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "No se pudo enviar el mensaje porque excede la longitud máxima permitida."
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "No se envió su mensaje."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2343
-#: ../libpurple/plugins/log_reader.c:2466
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2356
-#: ../libpurple/plugins/log_reader.c:2471
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2368
-#: ../libpurple/plugins/log_reader.c:2475
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2382
-#: ../libpurple/plugins/log_reader.c:2480
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2394
-#: ../libpurple/plugins/log_reader.c:2484
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2406
-#: ../libpurple/plugins/log_reader.c:2488
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2448
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Configuración general de lectura del registro"
 
-#: ../libpurple/plugins/log_reader.c:2452
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../libpurple/plugins/log_reader.c:2456
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Utilizar heurísticos de nombres"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Directorio de registro"
 
@@ -2707,19 +3212,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2517
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Lector de registro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2521
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2525
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2788,7 +3293,7 @@
 "El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar "
 "los avisos en el diálogo «Aviso de amigo»."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2797,17 +3302,17 @@
 "«%s» está actualmente desconectado. ¿Desea guardar el resto del mensaje como "
 "un aviso y enviarlo de forma automática cuando «%s» se vuelva a conectar?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensaje desconectado"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Puede editar y borrar los avisos del diálogo «Avisos de amigo»"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2817,9 +3322,9 @@
 msgid "Yes"
 msgstr "Sí"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2829,11 +3334,11 @@
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Guardar los mensajes de desconexión como un aviso"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "No preguntar. Siempre guardar como un aviso."
 
@@ -2897,7 +3402,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Prueba de señales"
 
@@ -2905,8 +3410,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Probar para ver si todas las señales funcionan correctamente."
 
@@ -2928,24 +3433,30 @@
 msgid "Tests to see that most things are working."
 msgstr "Hace pruebas para determinar si la mayor parte de las cosas funcionan."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "Certificados X.509"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-"Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Proporciona soporte SSL a través de GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -2953,18 +3464,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona soporte SSL a través de GNUTLS."
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
 
 #. *< type
 #. *< ui_requirement
@@ -2972,18 +3483,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona soporte SSL a través del NSS de Mozilla."
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+"Proporciona un recubrimiento a través de las bibliotecas de soporte de SSL."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3077,25 +3588,43 @@
 "No se pudo establecer una conexión con el servidor mDNS local. ¿Está "
 "arrancado?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "Ausente"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
+msgid "First name"
+msgstr "Nombre:"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
+msgid "Last name"
+msgstr "Apellidos:"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "Correo electrónico"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "Cuenta AIM"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "Cuenta XMPP"
 
 #. *< type
 #. *< ui_requirement
@@ -3107,40 +3636,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:526
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Persona morada"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:575
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Servidor"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:579
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Nombre:"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:582
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Apellidos:"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:585
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3148,42 +3655,34 @@
 msgid "E-mail"
 msgstr "Correo electrónico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:588
-msgid "AIM Account"
-msgstr "Cuenta AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:591
-msgid "XMPP Account"
-msgstr "Cuenta XMPP"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha cerrado la conversación."
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "No se pudo abrir el socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Error al establecer las opciones del socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "No se pudo vincular el socket al puerto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "No se pudo escuchar en el socket"
 
@@ -3262,268 +3761,292 @@
 msgid "Registration completed successfully!"
 msgstr "¡Se completó el registro con éxito!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Contraseña (escribir de nuevo)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Introduzca el token actual"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Por favor, rellene los siguientes campos"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ciudad"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Año de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Hombre o mujer"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Hombre"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Mujer"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Solamente conectado"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduzca a continuación su criterio de búsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Rellene los campos."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Su contraseña actual es diferente de la que ha especificado."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "No se pudo cambiar la contraseña. Se produjo un error.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar la contraseña de la cuenta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "¡Se cambió con éxito la contraseña!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduzca su contraseña actual y la contraseña nueva para UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar la contraseña Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para el amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Añadir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2671
-#: ../libpurple/protocols/oscar/oscar.c:3708
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Ausente"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nombre"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Año de nacimiento"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3920
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "No se pueden mostrar los resultados de la búsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "No se encontraron usuarios que coincidan"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "No se pudo leer el socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Su lista de amigos fue descargada del servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos exportada"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Falló la conexión."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Error de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "No está conectado al servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Cambiar su contraseña..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Subir la lista de amigos al servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Descargar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Borrar la lista de amigos del servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Guardar lista de amigos a archivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
@@ -3538,16 +4061,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Mensajería instantánea polaca muy popular"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
@@ -3604,7 +4127,8 @@
 msgstr "MOTD para %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "El servidor se ha desconectado"
 
@@ -3618,7 +4142,7 @@
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "Contra_seña:"
 
@@ -3626,65 +4150,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "No se pudo conectar al servidor"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Falló la conexión"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Se produjo un fallo en la negociación SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Tema"
 
@@ -3696,47 +4217,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codificaciones"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3752,7 +4274,7 @@
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3762,7 +4284,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3794,7 +4316,7 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4076,7 +4598,7 @@
 "names [canal]:  Obtener la lista de los usuarios que están en el canal."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuevo apodo&gt;:  Cambia su apodo."
 
@@ -4208,6 +4730,22 @@
 msgid "Disconnected."
 msgstr "Desconectado."
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Error desconocido"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Falló la orden ad-hoc"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "ejecutar"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
@@ -4217,8 +4755,8 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4227,33 +4765,33 @@
 "%s solicita autenticación en claro sobre un canal no cifrado. ¿Desea "
 "permitir ésto y continuar con el proceso de autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Respuesta inválida del servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4261,125 +4799,114 @@
 "El servidor solicita autenticación en claro sobre un canal no cifrado. "
 "¿Permitir ésto y continuar con el proceso de autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "Error de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nombre propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Calle"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Dirección extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localidad"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Región"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "Correo electrónico"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Nombre de la organización"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Grupo de trabajo"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descripción"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4387,116 +4914,399 @@
 "Todos los campos siguientes son opcionales. Introduzca sólo la información "
 "con la que se sienta cómodo."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Última actividad"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Información de descubrimiento de servicio"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Elementos de descubrimiento de servicio"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "Dirección extendida"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+#, fuzzy
+msgid "Multi-User Chat"
+msgstr "Apodo en el chat"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "El usuario no tiene información en el directorio."
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Órdenes ad-hoc"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Datos fuera de banda"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "Error de registro"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Ubicación del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Avatar del usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "Notificación de estado de amigos"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Versión del programa"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+#, fuzzy
+msgid "Stream Initiation"
+msgstr "Orientación"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Transferencia de archivo"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#, fuzzy
+msgid "User Mood"
+msgstr "Modos de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Actividad de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "Capacidades"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "Nombre de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "MI con intercambio de claves"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "Correo electrónico"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Perfil de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+#, fuzzy
+msgid "Jingle"
+msgstr "Unirse"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Nombre de usuario"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+#, fuzzy
+msgid "Jingle Video"
+msgstr "Vídeo en tiempo real"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Recibos de mensajes"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Publicación de la clave pública"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "Chatear con usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "Navegar usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "Jugar con usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "Ver usuarios"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Cifrado Trillian"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Capacidades"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nombre medio"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3797
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Dirección"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "No ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "De-suscribir"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Conectarse"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Desconectarse"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Hablador"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "No molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "Éstos son los resultados de su búsqueda"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4504,71 +5314,71 @@
 "Encuentra un contacto al introducir los criterios de búsqueda en los campos "
 "proporcionados. Nota: puede hacer búsquedas con comodines (%) en cada campo."
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Falló la consulta al directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "No se pudo consultar con el servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucciones del servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Rellene uno o más de los campos mostrados a continuación para buscar a un "
 "usuario XMPP cuyos datos coincidan."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3723
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "Dirección de correo electrónico"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Buscar un usuario XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Introduzca un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Selecciona un directorio de usuario donde buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Buscar en el directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Sala:"
 
@@ -4658,25 +5468,29 @@
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Error al inicializar la sesión"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Error de escritura"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Error de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:483
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4685,55 +5499,72 @@
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "No se pudo crear el socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Registro a %s efectuado con éxito"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Éxito en el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Error desconocido"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Falló el registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Registro de %s efectuado con éxito"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr "Éxito en el deregistro"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "Falló el registro"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Ya está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4743,378 +5574,547 @@
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Fecha"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+#, fuzzy
+msgid "Unregister"
+msgstr "Registrar"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "Por favor, rellene la información abajo indicada para cambiar su registro de cuenta."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor, rellene la información abajo indicada para registrar su nueva "
 "cuenta."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Registrando cuenta nueva de XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Cambiar la cuenta de registro en %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Registrar una cuenta nueva en %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Cambiar registro"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "Error cambiando la información de la cuenta"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#, fuzzy
+msgid "Account successfully unregistered"
+msgstr "Ha creado un Qun con éxito"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Inicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Inicializando SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Reinicializando flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "Desde (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "A"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ninguno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "Subscripción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Ánimo"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Texto de estado"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+#, fuzzy
+msgid "Tune Artist"
+msgstr "Artistas"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#, fuzzy
+msgid "Tune Title"
+msgstr "Título"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Comment"
+msgstr "Comentario de amigo"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "Permitir"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Contraseña modificada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Su contraseña ha sido modificada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Contraseña (de nuevo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Por favor, indique su nueva contraseña"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Funcionalidad no implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Se fue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Elemento no encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "ID de XMPP malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "No aceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "No permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Destinatario no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Registro necesario"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "No se encontró el servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Expiró el tiempo del servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Servicio no disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Subscripción necesaria"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Solicitud no esperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta en la autorización"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Falló temporal de la autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Falló de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Prefijo del espacio de nombres erróneo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Expiró la conexión"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Servidor desconocido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Direccionamiento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "ID no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Espacio de nombres no válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "No existen servidores coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Violación de la política"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Falló la conexión remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "XML restringido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "Ver otros servidores"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "Parada del sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Condición no definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Codificación no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de «stanza» no soportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Versión no soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Error de flujo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "No puede echar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación desconocida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "No se pudo afiliar al usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desconocido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "No se pudo establecer el rol \"%s\" para el usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "No puede expulsar al usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, fuzzy, c-format
+msgid "Unable to ping user %s"
+msgstr "No puede echar al usuario %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+"No fue posible reproducir el sonido porque el archivo elegido (%s) no existe."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [habitación]:  Abandonar la habitación."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuevo tema]:  Mostrar o cambiar el tema."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5122,7 +6122,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliación de un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5130,25 +6130,34 @@
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;sala&gt; [servidor]:  Unirse a una sala en el servidor indicado."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Echar a un usuario de la sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nick&gt; &lt;mensaje&gt;:  Enviar un mensaje en privado a un usuario."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:       Hacer un ping a un usuario, componente o servidor."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5159,84 +6168,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "Requiere SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antiguo (puerto 5323)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Puerto de conexión"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Conectar con el servidor"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s ha abandonado la conversación."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha cambiado el tema a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "El tema es: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Falló el envío de mensaje a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "Mensaje de error de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s le ha añadido [%s]"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5244,63 +6267,112 @@
 "Va a crear una sala nueva. ¿Desea configurarla o aceptar los valores por "
 "omisión?"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error en el chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error al unirse al chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "No se pudo enviar el archivo a %s, el usuario no soporta transferencias de "
 "archivos"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Fallo en el envío del archivo"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "No se pudo enviar el archivo a %s, JID inválido"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "No se pudo enviar el archivo a %s, el usuario no está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "No se pudo enviar el archivo a %s, no está suscrito a la presencia del "
 "usuario"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "Elija el recurso de %s al que quiere enviar un archivo"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "Modos de usuario"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Escoja un estado de ánimo de la lista."
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Configurar"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+#, fuzzy
+msgid "Set Mood..."
+msgstr "Enviar MI..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+#, fuzzy
+msgid "Set User Nickname"
+msgstr "Establecer límite de usuarios"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+#, fuzzy
+msgid "Please specify a new nickname for you."
+msgstr "Introduzca el nuevo nombre para %s"
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr "Escoja algo apropiado, la información será visible a todos los contactos en su lista de contactos."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+#, fuzzy
+msgid "Set Nickname..."
+msgstr "Apodo"
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Acciones"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Seleccione una acción"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5521,7 +6593,7 @@
 msgstr "Servidor muy ocupado"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5558,39 +6630,49 @@
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "¡Le acaban de enviar un codazo!"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Codazo"
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "¡Le ha dado un codazo %s!"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Dando un codazo a %s..."
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Éste es el nombre bajo el que otros amigos MSN le verán."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Establezca el número de teléfono de su domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Establezca el número de teléfono de su trabajo."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Establezca su número de teléfono móvil."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "¿Permitir los envíos de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5598,132 +6680,134 @@
 "¿Quiere permitir o rechazar el envío de mensajes a través de MSN Mobile a su "
 "teléfono móvil (u otro dispositivo móvil) de la gente en su lista de amigos?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Rechazar"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Puede que esta cuenta de Hotmail no esté activa."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Enviar un mensaje a un móvil."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Buscapersonas"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Le tiene"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Vuelvo enseguida"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Salí a comer"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Establecer el número de teléfono de su domicilio..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Establecer el número de teléfono de su trabajo..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer su número de teléfono móvil..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Permitir/Rechazar dispositivos móviles..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rechazar páginas Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Abrir bandeja de entrada de Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Iniciar _chat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "No se pudo conectar al servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Edad"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5731,190 +6815,190 @@
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Aficiones e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "Un poco sobre mí"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Aficiones"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Ciudad donde vive"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Lugares donde he vivido"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Información del contacto"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Otra persona importante"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Teléfono de casa (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Móvil personal"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Fax personal"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "Correo-e personal"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "MI personal"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Trabajo"
 
 # Prefiero esto a "Título laboral" que puede ser ambiguo, jfs
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Teléfono del trabajo (2)"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Dirección del trabajo"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Móvil del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Buscapersonas del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Fax del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "Correo-e del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "MI del trabajo"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Fecha inicial"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Cosas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Actualizado por última vez"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "El usuario no ha creado un perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5924,7 +7008,7 @@
 "que o bien el usuario no existe o que el usuario existe pero no ha creado un "
 "perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5932,7 +7016,7 @@
 "No se pudo encontrar información en el perfil de usuario. Es probable que el "
 "usuario no exista."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del perfil"
@@ -5947,19 +7031,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
 
@@ -5978,8 +7062,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "No se pudo conectar"
 
@@ -6094,7 +7178,7 @@
 
 #: ../libpurple/protocols/msn/session.c:307
 #: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Ha conectado desde otra ubicación."
 
@@ -6194,30 +7278,422 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "¡%s le acaba de dar un codazo!"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "El usuario %s lo ha añadido a su lista de amigos."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "El usuario %s lo ha quitado de su lista de amigos."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "No se pudo añadir a \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "El nombre de usuario especificado no es válido."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Falta un mecanismo de cifrado"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "No se puede encontrar el mecanismo de cifrado RC4"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Actualice a una versión de libpurple con soporte de RC4 (>= 2.0.1). No se "
+"cargará el complemento de MySpaceIM."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Lo siento, MySpace no permite el uso de contraseñas de más de %d caracteres "
+"de longitud (la suya tiene %d)."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "Error MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Leyendo el desafío"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Longitud de desafío inesperada recibida del servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Accediendo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+"Se perdió la conexión con el servidor (no se recibió ningún dato en %d "
+"segundos)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Mensajes de correo nuevos"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Nuevos comentarios de bitácora"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Nuevos comentarios de perfil"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "¡Nuevas solicitudes de amigos!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nuevos comentarios de fotos"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "No se ha configurado un nombre de usuario"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr "Por favor, vaya a http://editprofile.myspace.com/index.cfm?fuseaction=profile.username, escoja un nombre de usuario e intente conectarse de nuevo."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Error de prótocolo, código %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "No se pudo añadir al amigo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "Falló la orden 'addbudy'."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "Falló la orden 'persist'"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "No existe el usuario: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Búsqueda de usuario"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "No se pudo eliminar al amigo"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "Falló la orden 'delbuddy'"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "Falló la orden 'blocklist'"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Condición de entrada inválida"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Cola de lectura llena"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "No se pudo interpretar el mensaje"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "No se pudo conectar al servidor: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Amigos MI"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "Se añadiero o actualizaron %d amigos del servidor (incluyendo a los amigos que ya estaban en la lista del lado del servidor)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Añadir contactos del servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Añadir amigos de MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Falló la carga de los amigos"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Encontrar gente... "
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Cambiar mi nombre MI..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "gestor de URL myim"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "No se encontró una cuenta de MySpaceIM que pueda utilizarse para abrir esta URL myim."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Activar la cuenta apropiada de MySpaceIM y volver a intentarlo."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Mostrar el nombre visible en el texto de estado"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Mostrar titulares en los textos de estado"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Enviar emoticonos"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Resolución de pantalla (puntos por pulgada)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Tamaño de tipografía base (puntos)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Usuario"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "Titular"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Canción"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Amigos en total"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Versión del cliente"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Zapear"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s le ha añadido [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Zapeando a %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy
+msgid "Whack"
+msgstr "golpear"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s le ha añadido [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "Whacking %s..."
+msgstr "Golpeando"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "Tema"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "El usuario le ha bloqueado"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s se ha conectado."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy
+msgid "Hug"
+msgstr "abrazar"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s se ha conectado."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "Hugging %s..."
+msgstr "Abrazando"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "Dormido"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s le ha añadido [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy
+msgid "Goose"
+msgstr "Se fue"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s se ha marchado."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "Goosing %s..."
+msgstr "Buscando %s"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "Chocar cinco"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "¡%s le ha chocado los cinco!"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "Chocando los cinco con %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s se ha conectado."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s se ha conectado."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "No se han recibido los parámetros requeridos"
@@ -6460,7 +7936,7 @@
 msgstr "Buzón de correo"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -6577,8 +8053,8 @@
 msgstr "Puerto del servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6586,8 +8062,8 @@
 msgstr "El servidor ha cerrado la conexión."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6636,7 +8112,7 @@
 msgstr "Complemento de protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificación"
@@ -6666,7 +8142,7 @@
 msgid "Direct IM established"
 msgstr "MI directo establecido"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fichero %s es %s, que es más grande que el tamaño máximo de %s."
@@ -6767,7 +8243,7 @@
 msgid "Not while on AOL"
 msgstr "No mientras esté en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6779,7 +8255,7 @@
 "Puede indicar su codificación en las opciones de cuenta avanzadas para AIM/"
 "ICQ si sabe que codificación está utilizando.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6790,21 +8266,21 @@
 "defectuosa.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6812,124 +8288,125 @@
 msgid "Chat"
 msgstr "Charlar"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Recibir archivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Juegos"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Extensiones"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Enviar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Antiguo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Seguridad activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Vídeo en tiempo real"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Capacidad web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "Dirección IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Niveles de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6938,7 +8415,7 @@
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6947,20 +8424,20 @@
 "No se pudo conectar al servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Se ha enviado el nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Conexión establecida, cookie enviada"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6972,30 +8449,30 @@
 "válidas, o empezar con una letra y sólo pueden contener letras, números y "
 "espacios, o contener sólo números."
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Nombre de usuario no válido"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Contraseña incorrecta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7004,46 +8481,46 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versión del cliente que usa es demasiado antigua. Por favor, actualícela "
 "en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1415
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Se recibió la autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2246
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7052,53 +8529,53 @@
 "Quizá sea desconectado en breve.  Puede querer usar TOC hasta que esto se "
 "resuelva.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1495
-#: ../libpurple/protocols/oscar/oscar.c:1538
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
 
-#: ../libpurple/protocols/oscar/oscar.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "No se pudo un «hash» de conexión válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "No se pudo inicializar la conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2216
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2244
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Mensaje de solicitud de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2245
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "¡Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2285
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:2419
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7109,18 +8586,18 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ denegada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %u ha autorizado su petición de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7133,7 +8610,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2443
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7146,7 +8623,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7159,38 +8636,38 @@
 "El mensaje es:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "El usuario ICQ %u le ha enviado un amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2478
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "¿Desea añadir este amigo a su lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2483 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2484
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Rehusar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2568
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Usted perdió %hu mensaje de %s porque no era válido."
 msgstr[1] "Se perdieron %hu mensajes de %s porque porque no eran válidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2577
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Se perdió %hu mensaje de %s porque era demasiado largo."
 msgstr[1] "Se perdieron %hu mensajes de %s porque eran demasiado largos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2586
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7200,21 +8677,21 @@
 msgstr[1] ""
 "Se perdieron %hu mensajes de %s porque fueron mandados demasiado rápido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2595
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque el/ella es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque el/ella es muy malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2604
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Se perdió %hu mensaje de %s porque usted es muy malvado/a."
 msgstr[1] "Se perdieron %hu mensajes de %s porque usted es muy malvado/a."
 
-#: ../libpurple/protocols/oscar/oscar.c:2613
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7222,55 +8699,47 @@
 msgstr[1] "Se perdieron %hu mensajes de %s por motivos desconocidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2768
-#: ../libpurple/protocols/oscar/oscar.c:2773
-#: ../libpurple/protocols/oscar/oscar.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Razón desconocida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "No se pudo enviar el mensaje a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Información de usuario de no disponible: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2873
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2878
-msgid "Capabilities"
-msgstr "Capacidades"
-
-#: ../libpurple/protocols/oscar/oscar.c:2908
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Mensajes disponibles"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../libpurple/protocols/oscar/oscar.c:3016
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Su conexión AIM puede haberse perdido."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3204
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7278,7 +8747,7 @@
 "[No se pudo mostrar un mensaje de este usuario porque contenía caracteres "
 "inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3407
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7287,82 +8756,82 @@
 "límite en la tasa de envío de mensajes. Por favor, espere 10 segundos y "
 "vuelva a intentarlo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3490
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Ha sido desconectado de la sala de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Página web personal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Cargo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Página web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Información de trabajo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Mensaje emergente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "El siguiente nombre de usuario está asociado a %s"
 msgstr[1] "Los siguientes nombres de usuarios están asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:3957
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No se encontraron resultados para la dirección de correo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3978
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un mensaje solicitando confirmación de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de cuenta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Error cambiando la información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7371,14 +8840,14 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado difiere del original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque es "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7387,7 +8856,7 @@
 "Error 0x%04x: No se puede dar formato al nombre de usuario porque el nombre "
 "de usuario solicitado es demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7396,7 +8865,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "ya existe una solicitud pendiente para este nombre de usuario."
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7405,7 +8874,7 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada ya tiene demasiados nombres de usuarios asociados."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7414,32 +8883,32 @@
 "Error 0x%04x: No se puede cambiar la dirección de correo electrónico porque "
 "la dirección dada es inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:4032
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Error desconocido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4042
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La dirección de correo electrónico para %s es %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4044
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Información de la cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4216
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "No se ha enviado su imagen MI. Debe estar directamente conectado para enviar "
 "imágenes IM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "No se pudo establecer el perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7449,7 +8918,7 @@
 "conexión se haya completado.  Su perfil quedará sin cambiar, inténtelo "
 "nuevamente cuando ya esté conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7462,11 +8931,11 @@
 msgstr[1] ""
 "Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Perfil demasiado largo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7481,11 +8950,11 @@
 "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se "
 "ha truncado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7496,9 +8965,9 @@
 "nombres de usuario deben ser direcciones de correo válidas o empezar con una "
 "letra y contener sólo letras, números y espacios, o contener sólo números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
@@ -7515,16 +8984,15 @@
 "de AIM. No se ha perdido la lista de amigos, seguramente volverá a estar "
 "disponible en unas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
 #: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7533,17 +9001,17 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "No se pudo añadir al amigo %s por motivos desconocidos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7552,23 +9020,23 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7579,52 +9047,52 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
 #: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Mensajes de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7632,67 +9100,67 @@
 "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
 "su dirección IP. ¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botón en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Solicitar autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7700,74 +9168,74 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Establecer su información de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Mostrar cuánto tiempo se ha estado inactivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7775,27 +9243,27 @@
 "Utilizar un servidor proxy de ICQ para transferencias de ficheros\n"
 "(lento, pero no descubre su dirección IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Solicitando a %s que se conecte con nosotros en %s:%hu para MI directo."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Intentando conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Intentando la conexión a través de un servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s pide conectarse directamente a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7990,7 +9458,6 @@
 msgstr "Ha rechazado la solicitud de %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Introduzca sus motivos:"
 
@@ -8004,38 +9471,32 @@
 msgid "Sorry, you are not my type..."
 msgstr "Lo siento, no eres mi tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "Rechazar"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "Fallo al añadir un amigo con solicitud de autenticación"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Ha eliminado un amigo con éxito"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Se ha borrado con éxito de un amigo"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Se ha borrado con éxito de la lista de amigos de su amigo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "El usuario %d necesita autenticación"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduzca su solicitud a continuación"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "¿Quieres ser mi amigo?"
@@ -8043,22 +9504,22 @@
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
-msgstr "Ha añadido %d a su lista de amigos."
+msgid "You have added %d to buddy list"
+msgstr "Ha añadido %d a su lista de amigos"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Error QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid inválido"
 
@@ -8087,7 +9548,7 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "Indique su ID de grupo externo"
 
 #: ../libpurple/protocols/qq/group.c:121
@@ -8096,12 +9557,12 @@
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
 msgstr "El usuario %d solicitó entrar en el grupo %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Razón: %s"
@@ -8121,31 +9582,31 @@
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Aprobar"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido rechazada por el administrador %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "Vd. [%d] ha salido del grupo «%d»"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
+msgid "You [%d] have been added to group \"%d\""
 msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
 
 #: ../libpurple/protocols/qq/group_im.c:292
@@ -8153,7 +9614,7 @@
 msgstr "Se ha añadido este grupo a su lista de amigos."
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "No soy miembro"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8177,7 +9638,7 @@
 msgstr "Este grupo no permite que otros se unan"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
 msgstr "Ha salido con éxito del grupo"
 
 #: ../libpurple/protocols/qq/group_join.c:257
@@ -8185,17 +9646,17 @@
 msgstr "Autenticación grupo QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "El servidor QQ ha aceptado su operación de autorización"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 "Ha introducido un identificador de grupo que está fuera del rango permitido"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "¿Seguro que quiere dejar este Qun?"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "¿Está seguro que quiere dejar este Qun?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -8205,10 +9666,6 @@
 "Tenga en cuenta que si vd. lo ha creado\n"
 "esta operación eliminará este Qun eventualmente."
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Adelante"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -8218,18 +9675,22 @@
 msgid "Group Operation Error"
 msgstr "Error de operación de grupo"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "¿Desea aprobar esta solicitud?"
 
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Introduzca sus motivos:"
+
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
 msgstr "Ha modificado el miembro Qun con éxito"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
 msgstr "Ha modificado la información Qun con éxito"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
@@ -8249,20 +9710,16 @@
 msgstr "Mensaje del sistema"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "ACK de servidor"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "No se pudo enviar MI."
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
+msgid "Keep alive error"
+msgstr "Error de comprobación de conexión"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "¡Error al solicitar token para conectarse!"
+msgid "Error requesting login token"
+msgstr "Error al solicitar un testigo de conexión"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8281,96 +9738,83 @@
 msgid "Unknown-%d"
 msgstr "Desconocido-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "Dirección de %s"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "Dirección TCP"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "Dirección UDP"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Disponible"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Ausente"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Invisible"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Desconectado"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Nombre inválido"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Conectados actualmente</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última actualización</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modo de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP del servidor</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<B>Mi IP pública</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Última IP de conexión</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Último hora de conexión</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Información de conexión"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Modificar mi información"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Fijar mi información"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Mostrar la información de conexión"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "Salir de este Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Bloquear a este amigo"
 
@@ -8384,25 +9828,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "Complemento de protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "Conexión en TCP"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Conexión oculta"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Error de envío al socket"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Conexión rehusada"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Conectando utilizando TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8436,56 +9868,52 @@
 msgid "Login failed, no reply"
 msgstr "Fallo en la conexión, no ha habido respuesta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
 msgstr "¿Desea añadir este amigo?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Ha sido añadido por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "¿Desea añadirle?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s le ha añadido [%s]"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "El usuario %s lo ha añadido [%s] a su lista de amigos."
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "El usuario %s rechazó su solicitud"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
+msgid "User %s approved your request"
 msgstr "El usuario %s ha aprobado su solicitud"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s quiere añadirle [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s no está en su lista de amigos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "¿Desea añadirle?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Conexión cerrada (escribiendo)"
@@ -8549,10 +9977,6 @@
 msgid "Starting Services"
 msgstr "Arrancando servicios"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Conectado"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8576,7 +10000,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "No se pudo conectar al servidor"
 
@@ -8597,37 +10021,33 @@
 msgid "Place Closed"
 msgstr "Lugar cerrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Transferencia de archivo"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Soporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Crear conferencia con el usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8636,27 +10056,27 @@
 "Por favor ingrese tema para la nueva conferencia, y un mensaje de invitación "
 "que se enviará a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nueva conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Conferencias disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Crear nueva conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Invitar a un usuario a una conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8667,27 +10087,27 @@
 "Seleccione \"Crear nueva conferencia\" si quiere crear una nueva conferencia "
 "para invitar a este usuario también."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Invitar a conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Invitar a conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de prueba"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4286
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "No se ha especificado el servidor de comunidad «Sametime»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8696,42 +10116,42 @@
 "No se ha configurado ninguna dirección IP o nombre de equipo para la cuenta "
 "«Meanwhile» %s. Introduzca uno más abajo para continuar el registro."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración de la conexión «Meanwhile»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "No se ha especificado un servidor de comunidad «Sametime»"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "(0x%04x) desconocido<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Último cliente conocido:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nombre de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Se ha introducido un identificador de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8741,15 +10161,15 @@
 "usuarios. Por favor seleccione el usuario de la lista mostrada para añadirlo "
 "a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "No se pudo añadir al usuario: el usuario no se ha encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8758,11 +10178,11 @@
 "El identificador «%s» no coincide con ningún usuario en la comunidad "
 "«Sametime». Se ha eliminado esta entrada de la lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8771,65 +10191,65 @@
 "Error al leer el archivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento de la lista de amigos"
 
 # Usar empotrable? (jfs)
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Solamente lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Fusionar lista desde el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Fusionar y guardar lista en el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sincronizar la lista con el servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar la lista «Sametime» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar la lista «Sametime» para la cuenta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "No se pudo añadir el grupo: el grupo ya existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo llamado '%s' ya existe en su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Posibles coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr ""
 "Resultados de las notas de los grupos de la libreta de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8840,15 +10260,15 @@
 "de la libreta de direcciones «Notes». Escoja el grupo más apropiado de la "
 "lista que se muestra abajo para añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Seleccionar libro de direcciones «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "No se pudo añadir el grupo: no se ha encontrado el grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8857,11 +10277,11 @@
 "El identificador «%s» no coincide con ninguno de los grupos de la libreta de "
 "direcciones «Notes» en su comunidad «Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Libreta de direcciones de grupos «Notes»"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8870,12 +10290,12 @@
 "campo a continuación para añadir al grupo y a sus miembros en su lista de "
 "amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados de la búsqueda '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8886,31 +10306,30 @@
 "a continuación. Puede añadir estos usuarios a su lista de amigos o enviarles "
 "mensajes con los botones de acciones mostrados abajo."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:718
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "El identificador «%s» no coincide con ninguno de los usuarios en su "
 "comunidad «Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "No hubo coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8918,32 +10337,32 @@
 "Introduzca el nombre o identificador parcial en el campo mostrado a "
 "continuación para buscar usuarios coincidentes en su comunidad «Sametime»."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Búsqueda de usuarios"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importar la lista «Sametime»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exportar la lista «Sametime»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Añadir a la libreta de direcciones de grupos «Notes»..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Búsqueda de los usuarios..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redirecciones del servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Ocultar identidad de cliente"
 
@@ -9331,13 +10750,6 @@
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Ánimo"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10007,13 +11419,6 @@
 msgstr "Estadísticas de red"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falló el ping"
@@ -10170,7 +11575,7 @@
 msgstr "Su estado de ánimo actual"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10569,7 +11974,7 @@
 msgstr "Protocolo de Conferencia segura en vivo en Internet (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Red"
 
@@ -10832,26 +12237,26 @@
 msgstr "No se pudo escribir"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "No se pudo conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "No se pudo crear el socket de escucha"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "No se pudo resolver el nombre"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "No se pudo resolver el nombre de sistema"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Los nombres de usuario SIP no pueden tener espacios en blanco ni el símbolo @"
@@ -10864,36 +12269,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "El complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estatus público (nota: todos podrán verlo)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Utilizar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -11055,8 +12460,8 @@
 msgid "Password Change Successful"
 msgstr "La contraseña se ha cambiado con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -11119,32 +12524,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s le ha enviado una invitación para utilizar la webcam, algo aún no soportado."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "¡%s le acaba de dar un codazo!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaje del sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Mensaje de autorización denegada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
-"forma retroactiva)."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11153,11 +12551,18 @@
 "El usuario %s ha negado (de forma retroactiva) su solicitud de añadirlo a su "
 "lista de amigos por la siguiente razón: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"El usuario %s ha rechazado su solicitud de añadirlo a su lista de amigos (de "
+"forma retroactiva)."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Se rechazó la adición del amigo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11168,11 +12573,11 @@
 "desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
 "para ver si existe una actualización."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Falló la autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11181,53 +12586,53 @@
 "Ha intentado ignorar a %s, pero el usuario está en su lista de amigos. Si "
 "selecciona «Sí» se le eliminará y se ignorará a este amigo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Su cuenta está bloqueada. Por favor, conéctese al servidor de web de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Error de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11236,7 +12641,7 @@
 "Se perdió la conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11245,108 +12650,114 @@
 "No se pudo establecer una conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Fuera de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Lejos del escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Fuera de la oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "Ha abandonado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "No está en la lista del servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "No parecer siempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Usar configuración del entorno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Comenzar una sesión de Doodle"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+msgid "Activate which ID?"
 msgstr "¿Qué ID quiere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#, fuzzy
+msgid "Join whom in chat?"
 msgstr "¿Juntarse con quién en un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Juntarse con un usuario en un chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "You have just sent a Buzz!"
-msgstr "¡Acaba de dar un codazo!"
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Open Inbox"
+msgstr "Abrir bandeja de entrada"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#, fuzzy
+msgid "Buzz"
+msgstr "¡¡Codazo!!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Mostrar los canales de la red Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
 
@@ -11360,131 +12771,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersonas japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Puerto del buscapersonas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Servidor de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de archivos japonés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Puerto de transferencia de archivos"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Localización de la sala de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Servidor de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Invitación rechazada"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "No se pudo unir al chat"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Sala desconocida"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Quizás la sala está llena"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "No disponible"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Error desconocido. Puede que tenga que desconectarse y esperar cinco minutos "
-"antes de poder volver a unirse a la sala del chat."
-
-# Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Ahora está chateando en %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "No se pudo unir al amigo al chat"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "¿Quizás no están en un chat?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "No se pudo obtener la lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Voces"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Cámaras web"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "No se pudo obtener la lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Salas de usuarios"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11499,7 +12838,7 @@
 msgstr "No se pudo establecer el descriptor de archivo."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Error de escritura"
 
@@ -11596,6 +12935,78 @@
 msgid "The user's profile is empty."
 msgstr "El perfil del usuario está vacío."
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Invitación rechazada"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "No se pudo unir al chat"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Sala desconocida"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Quizás la sala está llena"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "No disponible"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Error desconocido. Puede que tenga que desconectarse y esperar cinco minutos "
+"antes de poder volver a unirse a la sala del chat."
+
+# Banned puede ser expulsar o censurar, prefiero expulsar. jfs.
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Ahora está chateando en %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "No se pudo unir al amigo al chat"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "¿Quizás no están en un chat?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "No se pudo obtener la lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Voces"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Cámaras web"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "No se pudo obtener la lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Salas de usuarios"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
@@ -11622,11 +13033,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "No se pudo enviar al chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Usuario"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11845,7 +13251,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s ahora se llama %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, fuzzy, c-format
+msgid "Requesting %s's attention..."
+msgstr "Solicitando método de autenticación"
+
+#: ../libpurple/server.c:346
+#, fuzzy, c-format
+msgid "%s has requested your attention!"
+msgstr "%s solicitó su información de usuario"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11854,20 +13270,38 @@
 "%s ha invitado a %s a la sala de chat %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitado a %s a la sala de chat %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "¿Aceptar la invitación de chat?"
 
+#: ../libpurple/sslconn.c:163
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "Falló la conexión"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "Se produjo un fallo en la negociación SSL"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "El servidor SSL presentó un certificado inválido"
+
+#: ../libpurple/sslconn.c:170
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "Error desconocido"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Desactivado"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "No molestar"
 
@@ -11920,12 +13354,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11934,67 +13368,67 @@
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "No se pudo abrir %s: se produjeron demasiadas redirecciones"
 
-#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12003,17 +13437,17 @@
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web esté intentando algo con malas intenciones."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
@@ -12039,37 +13473,37 @@
 msgstr "La orientación en el área de notificación."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Opciones de conexión"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Nombre de usuario:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Apodo _local:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Recordar _contraseña"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Opciones de usuario"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Notificaciones de _correo nuevo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
@@ -12103,7 +13537,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Usar configuración del entorno"
 
@@ -12125,15 +13559,15 @@
 msgid "Proxy Options"
 msgstr "Opciones del proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Puerto:"
 
@@ -12141,10 +13575,19 @@
 msgid "_Username:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Contraseña:"
 
+#: ../pidgin/gtkaccount.c:1195
+#, fuzzy
+msgid "Unable to save new account"
+msgstr "No se pudo crear una nueva conexión."
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Ya existe una cuenta con los criterios especificados."
+
 #: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Añadir cuenta"
@@ -12153,19 +13596,23 @@
 msgid "_Basic"
 msgstr "_Básica"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Crear esta nueva cuenta en el servidor"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: ../pidgin/gtkaccount.c:1977 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../pidgin/gtkaccount.c:2005
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2205
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12185,229 +13632,248 @@
 "cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
 "<b>Añadir</b> otra vez para configurarlas todas."
 
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Unirse a un chat"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la información apropiada del chat al que desearía unirse.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Cuenta:"
 
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Obtener _información"
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Enviar archivo"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Añadir _aviso de amigo"
 
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Apodo..."
 
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "Elimina_r"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Añadir un _amigo"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Añadir un _chat"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Renombrar"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Conectarse automáticamente"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Herramientas/Sin sonido"
 
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4619
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/A_migos"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _chat..."
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obtener _información del usuario..."
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _registro del usuario..."
 
-#: ../pidgin/gtkblist.c:2844
-msgid "/Buddies/Show _Offline Buddies"
+#: ../pidgin/gtkblist.c:2872
+#, fuzzy
+msgid "/Buddies/Show"
+msgstr "/Amigos/_Desconectar"
+
+#: ../pidgin/gtkblist.c:2873
+#, fuzzy
+msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Mostrar amigos _desconectados"
 
-#: ../pidgin/gtkblist.c:2845
-msgid "/Buddies/Show _Empty Groups"
+#: ../pidgin/gtkblist.c:2874
+#, fuzzy
+msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Mostrar grupos _vacíos"
 
-#: ../pidgin/gtkblist.c:2846
-msgid "/Buddies/Show Buddy _Details"
+#: ../pidgin/gtkblist.c:2875
+#, fuzzy
+msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Mostrar _detalles de amigo"
 
-#: ../pidgin/gtkblist.c:2847
-msgid "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:2876
+#, fuzzy
+msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Mostrar _tiempo de inactividad"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2877
+#, fuzzy
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Amigos/Mostrar grupos _vacíos"
+
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/_Ordenar amigos"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Añadir un _chat..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Añadir _grupo..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Salir"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Cuentas"
 
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Cuentas/Añadir\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Herramientas/_Aviso de amigo"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2893
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "/Herramientas/Pr_eferencias"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Herramientas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Herramientas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Herramientas/_Registro del sistema"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Herramientas/_Sin sonido"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12416,132 +13882,132 @@
 "\n"
 "<b>Cuenta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Visto por última vez"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Asustadizo"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Rock'n'roleando"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nuevo mensaje instantáneo..."
 
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un chat..."
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obtener información del usuario..."
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Añadir un amigo..."
 
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Añadir un chat..."
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Añadir un grupo..."
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Herramientas/Privacidad"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Herramientas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaje sin leer de %s\n"
 msgstr[1] "%d mensajes sin leer de %s\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alfabéticamente"
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Por tamaño de registro"
 
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se ha desconectado"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Reactivar cuenta"
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s se ha desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Nombre de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Contraseña:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Entrada"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Cuentas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12560,23 +14026,32 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Offline Buddies"
+#: ../pidgin/gtkblist.c:4594
+#, fuzzy
+msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Mostrar amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Empty Groups"
+#: ../pidgin/gtkblist.c:4597
+#, fuzzy
+msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Mostrar grupos vacíos"
 
-#: ../pidgin/gtkblist.c:4564
-msgid "/Buddies/Show Buddy Details"
+#: ../pidgin/gtkblist.c:4603
+#, fuzzy
+msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Mostrar detalles de amigo"
 
-#: ../pidgin/gtkblist.c:4567
-msgid "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4606
+#, fuzzy
+msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Mostrar tiempos de inactividad"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:4609
+#, fuzzy
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Amigos/Mostrar grupos vacíos"
+
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12588,19 +14063,19 @@
 "posible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "Nombre de _usuario:"
 
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "_Apodo:"
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo no está soportado en las habitaciones de chats."
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12608,7 +14083,7 @@
 "No está conectado con ninguna cuenta que tenga la capacidad de acceder a "
 "chats."
 
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12616,42 +14091,48 @@
 "Introduzca el apodo, y la información que crea conveniente del chat que "
 "desearía añadir en la lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Introduzca el nombre del grupo a añadir."
 
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Cuentas/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
 
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Deshabilitar"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Habilitar cuenta"
 
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Cuentas/Activar cuenta"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Herramientas"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+#, fuzzy
+msgid "SSL Servers"
+msgstr "Servidor"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12665,26 +14146,26 @@
 "%s no intentará reconectarse a esta cuenta hasta que corrija el error y "
 "reactive la cuenta."
 
-#: ../pidgin/gtkconv.c:486
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Orden desconocida."
 
-#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo no utiliza el mismo protocolo que este chat."
 
-#: ../pidgin/gtkconv.c:778
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "No está conectado con ninguna cuenta con la que pueda invitar a ese amigo."
 
-#: ../pidgin/gtkconv.c:831
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo a la sala de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12692,201 +14173,188 @@
 "Introduzca el nombre de usuario al que desea invitar, junto con un mensaje "
 "de invitación opcional."
 
-#: ../pidgin/gtkconv.c:882
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Mensaje:"
 
-#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2518 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "No se pudo leer el archivo."
 
-#: ../pidgin/gtkconv.c:965
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversaciones con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1001
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Guardar conversación"
 
-#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Término a _buscar:"
 
-#: ../pidgin/gtkconv.c:1359
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Se inició el registro. A partir de ahora se registrarán todos los mensajes "
-"de esta conversación."
-
-#: ../pidgin/gtkconv.c:1367
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Se ha parado el registro. No se registrarán mensajes de esta conversación de "
-"ahora en adelante."
-
-#: ../pidgin/gtkconv.c:1615
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "No ignorar"
 
-#: ../pidgin/gtkconv.c:1618
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1638
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#: ../pidgin/gtkconv.c:1661
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Dicho la última vez"
 
-#: ../pidgin/gtkconv.c:2526
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "No se pudo salvar el archivo de iconos al disco."
 
-#: ../pidgin/gtkconv.c:2577
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Guardar icono"
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2634
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Ocultar icono"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Guardar icono como..."
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Configurar icono personalizado..."
 
-#: ../pidgin/gtkconv.c:2654
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Eliminar icono personalizado"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Mostrar todo"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _historial"
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Guardar como..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/_Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir _aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Conversación/_Más"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
 
-#: ../pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversación/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Añadir..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/Elimina_r..."
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Insertar en_lace..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Insertar imag_en..."
 
-#: ../pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Cerrar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:2850
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:2851
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opciones/Mostrar _iconos de los amigos"
-
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opciones/Mostrar _barras de formato"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opciones/Mostrar _marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:2930
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Conversación/Más"
 
-#: ../pidgin/gtkconv.c:3038
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Opciones"
 
@@ -12895,176 +14363,172 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3073 ../pidgin/gtkconv.c:3105
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Conversación"
 
-#: ../pidgin/gtkconv.c:3113
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#: ../pidgin/gtkconv.c:3119
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#: ../pidgin/gtkconv.c:3123
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
 
-#: ../pidgin/gtkconv.c:3129
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obtener información"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Apodo..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3147
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Conversación/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3151
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Añadir..."
 
-#: ../pidgin/gtkconv.c:3155
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3161
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Opciones/Insertar enlace..."
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Opciones/Insertar imagen..."
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Opciones/_Habilitar registro"
 
-#: ../pidgin/gtkconv.c:3174
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Opciones/Habilitar _sonidos"
 
-#: ../pidgin/gtkconv.c:3187
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opciones/Mostrar barras de formato"
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Opciones/Mostrar marcas de tiempo"
 
-#: ../pidgin/gtkconv.c:3193
-msgid "/Options/Show Buddy Icon"
-msgstr "/Opciones/Mostrar _iconos de los amigos"
-
-#: ../pidgin/gtkconv.c:3277 ../pidgin/gtkconv.c:3319
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "El usuario está escribiendo..."
 
-#: ../pidgin/gtkconv.c:3322
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "El usuario ha escrito algo y ha parado"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3504
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4218
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4322
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#: ../pidgin/gtkconv.c:5518 ../pidgin/gtkconv.c:5639
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona en la conversación"
 msgstr[1] "%d personas en la conversación"
 
-#: ../pidgin/gtkconv.c:6238 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tecleando"
 
-#: ../pidgin/gtkconv.c:6244
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkconv.c:6249
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Apodo dijo"
 
-#: ../pidgin/gtkconv.c:6254 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensajes sin leer"
 
-#: ../pidgin/gtkconv.c:6259
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Nuevo acontecimiento"
 
-#: ../pidgin/gtkconv.c:7237
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: limpia todos los históricos de las ventanas de conversación."
 
-#: ../pidgin/gtkconv.c:7401
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Confirmar cierre"
 
-#: ../pidgin/gtkconv.c:7433
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Tiene mensajes sin leer. ¿Está seguro que quiere cerrar la ventana?"
 
-#: ../pidgin/gtkconv.c:8005
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Cerrar otras solapas"
 
-#: ../pidgin/gtkconv.c:8011
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Cerrar todas las solapas"
 
-#: ../pidgin/gtkconv.c:8019
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Despegar esta solapa"
 
-#: ../pidgin/gtkconv.c:8025
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Cerrar esta solapa"
 
-#: ../pidgin/gtkconv.c:8475
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Cerrar conversación"
 
-#: ../pidgin/gtkconv.c:9007
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Última ventana creada"
 
-#: ../pidgin/gtkconv.c:9009
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Separar ventanas de MIs y chats"
 
-#: ../pidgin/gtkconv.c:9011 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Ventana nueva"
 
-#: ../pidgin/gtkconv.c:9013
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9015
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Por cuenta"
 
@@ -13128,25 +14592,22 @@
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "desarrollador principal"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "desarrollador"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "desarrollador y webmaster"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "soporte"
@@ -13155,327 +14616,338 @@
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "desarrollador y webmaster"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Contribuyente senior/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "mantenedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker y diseñador de controladores [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "desarrollador XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnio"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalán"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Danés"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Alemán"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Butaní"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Griego"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Español"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonio"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Eusquera(Vasco)"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Francés"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Gallego"
 
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Grupo de traducción al Gujarati"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japonés"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Grupo de traducción al kannada"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepalés"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Danés, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "Noruego"
-
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileño"
 
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Afgano"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh y el equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Chino de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
 # Amhario
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../pidgin/gtkdialogs.c:372
-#, c-format
+#: ../pidgin/gtkdialogs.c:384
+#, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s es un cliente de mensajería modular basado en libpurple capaz de "
 "conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
@@ -13488,43 +14960,47 @@
 "personas que han contribuido. Este programa se distribuye sin ninguna "
 "garantía.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgin en irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
 
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Locos escritores de parches"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Desarrolladores retirados"
 
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "Locos escritores de parches retirados"
+
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Traductores actuales"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Obtener datos del usuario"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13532,11 +15008,11 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información."
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Ver registro de usuario"
 
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13544,32 +15020,32 @@
 "Introduzca el nombre de usuario o el apodo de la persona de la cual quiere "
 "ver información de registro."
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Apodo para contacto"
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Introduzca un apodo para este contacto."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduzca un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Apodo de amigo"
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Apodo en el chat"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Introduzca un apodo para este chat."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13584,15 +15060,15 @@
 "Está a punto de borrar los contactos que contiene a %s y a otros %d amigos "
 "de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13601,15 +15077,15 @@
 "Está a punto de fusionar el grupo llamado %s con el grupo llamado %s. ¿Desea "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Fusionar grupos"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13618,29 +15094,29 @@
 "Está a punto de borrar el grupo %s junto con todos sus miembros de la lista "
 "de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13648,11 +15124,11 @@
 msgstr ""
 "Está a punto de eliminar el chat %s de su lista de amigos. ¿Desea continuar?"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Eliminar chat"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Eliminar chat"
 
@@ -13762,7 +15238,7 @@
 msgstr "_Detalles de la transferencia de archivos"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pausar"
 
@@ -13771,43 +15247,43 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Pe_gar como texto en claro"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Limpiar formato"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Color de hiperenlace"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Color para dibujar hiperenlaces."
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Color de hiperenlace pre-iluminado"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Color para dibujar hiperenlaces cuando el ratón esté encima."
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar dirección de correo electrónico"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13817,7 +15293,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13827,7 +15303,7 @@
 "\n"
 "Tomando PNG por omisión."
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13839,7 +15315,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13850,35 +15326,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Seleccionar tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Seleccionar el color del texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Seleccionar el color de fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Descripción"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13886,92 +15362,158 @@
 "Introduzca el URL y la descripción del enlace que quiere insertar. La "
 "descripción es opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduzca el URL del enlace que quiere insertar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "No se pudo almacenar la imagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Insertar imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
-msgid "This theme has no available smileys."
-msgstr "Este tema no tiene emoticonos disponibles."
+#: ../pidgin/gtkimhtmltoolbar.c:760
+msgid "This theme has no available smileys."
+msgstr "Este tema no tiene emoticonos disponibles."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:777
+msgid "Smile!"
+msgstr "¡Sonría!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "_Tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+#, fuzzy
+msgid "Group Items"
+msgstr "ID de grupo:"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Desagrupar items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negrita"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Subrayado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+#, fuzzy
+msgid "Strikethrough"
+msgstr "_Tachado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Incrementa tamaño de tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Reducir tamaño de tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Estilo de tipografía"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Color del fondo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Color del primer plano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Limpiar formato"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Insertar imagen MI"
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
-msgid "Smile!"
-msgstr "¡Sonría!"
+# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Insertar emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "_Negrita"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "_Cursiva"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "S_ubrayado"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "_Grande"
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b> Negrita</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>_Cursiva</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>S_ubrayado</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Tachado</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size=\"larger\">Más _grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "_Pequeña"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>Más _pequeño</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "_Estilo de tipografía"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
-msgstr "Color del _primer plano"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
-msgstr "Color de _fondo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
-msgstr "_Tipografía"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "_Restaurar tipografía"
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "_Color del primer plano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "Color del _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Emoticono"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Imagen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Enlace"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "Regla _horizontal"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14063,12 +15605,12 @@
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para más información.\n"
 
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14098,7 +15640,7 @@
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14139,48 +15681,48 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tiene %d mensaje nuevo."
 msgstr[1] "%s tiene %d nuevos mensajes."
 
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Tiene %d nuevo correo.</b>"
 msgstr[1] "<b>Tiene %d nuevos correos.</b>"
 
-#: ../pidgin/gtknotify.c:964
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La orden de navegador «%s» no es válida."
 
-#: ../pidgin/gtknotify.c:966 ../pidgin/gtknotify.c:978
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1119
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "No se pudo abrir la URL"
 
-#: ../pidgin/gtknotify.c:976 ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error al lanzar «%s»: %s"
 
-#: ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14234,102 +15776,102 @@
 msgstr "Seleccione un archivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "A quién avisar"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Se _conecta"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Se _desconecta"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "Se _ausenta"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_Deja de estar ausente"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Está _inactivo"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Ya no está i_nactivo."
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Empieza a _escribir"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "Se _pausa mientras escribe"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Deja de escribi_r"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Envía un _mensaje"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "_Abrir una ventana de MI"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Notificación con una ventana emergente"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Enviar un _mensaje"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "E_jecutar una orden"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Re_producir un sonido"
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Navegar..."
 
 # Examinar puede ser también válido, comprobar, jfs.
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Navegar..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Sólo _avisar cuando mi estado no sea Disponible"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Recurrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "(por omisión)"
 
@@ -14361,13 +15903,6 @@
 msgid "_Show system tray icon:"
 msgstr "_Mostrar icono del área de notificación del sistema:"
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Siempre"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
@@ -14380,7 +15915,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
@@ -14434,8 +15969,8 @@
 msgstr "Mostrar el _formato de los mensajes entrantes"
 
 #: ../pidgin/gtkprefs.c:997
-msgid "Show Buddy _Details"
-msgstr "Mostrar _detalles de amigo"
+msgid "Show _detailed information"
+msgstr "Mostrar información _detallada"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14477,11 +16012,11 @@
 msgid "Conversation _font:"
 msgstr "Tipografía para las conversaciones:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Formato por omisión"
 
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14489,119 +16024,119 @@
 "Así se verá el texto de los mensajes que envíe cuando utilice protocolos que "
 "soportan el formateo."
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Auto detectar la dirección IP"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "_IP pública:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Puertos"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "Puerto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Puerto _final:"
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Valores por omisión de Gnome"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Abrir enlace en:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Navegador por omisión"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Ventana existente"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Nueva solapa"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14610,80 +16145,63 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Formato de _registro:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Registrar todos los mensajes _instantáneos"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Registrar todas las _charlas"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Registrar todos los cambios de _estado en el registro del sistema"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(por omisión)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Selección de sonido"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "El más silencioso"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Más silencioso"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "El más ruidoso"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Método para reproducir sonidos"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Timbre de la consola"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Automático"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Comando"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Sin sonido"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14692,117 +16210,81 @@
 "_Comando para sonido:\n"
 "(%s para nombre de archivo)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Opciones de sonido"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Suena cuando la conversación obtiene el _foco"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Habilitar sonidos:"
 
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Sólo cuando estoy disponible"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Sólo cuando no estoy disponible"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Eventos de sonido"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Acontecimiento"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Probar"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Restablecer"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Seleccionar..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "Mostrar el _tiempo de inactividad"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Basado en teclado o en uso de ratón"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Cuando está ausente e inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Auto-ausencia"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Cambiar el estado cuando esté _inactivo"
 
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
-msgstr "_Minutos antes de cambiar el estado:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutos antes de pasar a inactivo:"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Cambiar _estado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Estado al arrancar"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Utilizar el estado de mi última _salida al empezar"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Estado a _aplicar al empezar:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Interfaz"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Temas de emoticonos"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Sonidos"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
@@ -14893,23 +16375,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ese archivo ya existe"
 
-#: ../pidgin/gtkrequest.c:1484
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../pidgin/gtkrequest.c:1488
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Elegir un nuevo nombre"
 
-#: ../pidgin/gtkrequest.c:1626 ../pidgin/gtkrequest.c:1640
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar carpeta..."
 
@@ -14949,7 +16431,7 @@
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "E_stado:"
 
@@ -14963,82 +16445,34 @@
 msgid "Sa_ve & Use"
 msgstr "Gua_rdar y usar"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Se conecta un amigo"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Se desconecta un amigo"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Se recibe un mensaje"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Se recibe un mensaje que comienza una conversación"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Se envía un mensaje"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Alguien entra al chat"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Alguien deja el chat"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Usted habla en el chat"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Otros hablan en el chat"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Alguien dice su nombre de usuario en el chat"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "Fallo de gstreamer"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "No se pudo inicializar gstreamer."
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Esperando la conexión a la red"
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Se ha producido el siguiente error al cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "No se pudo cargar la imagen"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "No se puede enviar la carpeta %s."
 
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15047,12 +16481,12 @@
 "%s no puede transferir una carpeta. Tendrá que enviar los archivos que "
 "contiene individualmente."
 
-#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Ha arrastrado una imagen"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15060,23 +16494,23 @@
 "Puede enviar esta imagen como una transferencia de archivo, introducirla en "
 "el mensaje, o usarla como icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Establecer como icono de amigo"
 
-#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Enviar archivo de imagen"
 
-#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Insertar en el mensaje"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "¿Desea establecerla como el icono de amigo para este usuario?"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15084,7 +16518,7 @@
 "Puede enviar esta imagen como una transferencia de archivo, o usarla como "
 "icono de amigo para este usuario."
 
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15097,11 +16531,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15109,7 +16543,7 @@
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
 
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15120,27 +16554,27 @@
 "<b>Tamaño de archivo:</b> %s\n"
 "<b>Tamaño de imagen:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "El fichero «%s» es demasiado grande para %s. Intente utilizar una imagen más "
 "pequeña.\n"
 
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Error en icono"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "No se pudo fijar el icono"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "No se pudo abrir el archivo «%s»: %s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15156,31 +16590,31 @@
 msgid "Select color"
 msgstr "Seleccionar el color"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Apodo:"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Cerrar _solapas"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Obtener _información"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Invitar"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Emoticonos de Pidgin"
 
@@ -15196,35 +16630,35 @@
 msgid "none"
 msgstr "ninguno"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Mostrar estadísticas"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Probabilidad de respuesta"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Configuración de estadísticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Tiempo de espera máximo para respuestas:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Diferencia máxima de «visto por última vez»:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Umbral:"
 
@@ -15234,18 +16668,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Predicción de disponibilidad de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predicción de disponibilidad de contactos."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15357,18 +16791,6 @@
 msgid "Select Color for %s"
 msgstr "Seleccionar el color para %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negrita"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Cursiva"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Subrayado"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorar formato entrante"
@@ -15635,6 +17057,15 @@
 "Probar para ver si todas las señales de la interfaz de usuario funcionan "
 "correctamente."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Nota de amigo:</b> %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Histórico"
@@ -15686,11 +17117,11 @@
 msgid "Draw Markerline in "
 msgstr "Dibujar línea de marcador en "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Ventanas de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Ventanas de _chat"
 
@@ -15706,32 +17137,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Se ha confirmado la sesión de mensajería musical."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Mensajería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Se ha producido un conflicto al ejecutar la orden:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Error al ejecutar el editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Ha ocurrido el siguiente error:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Configuración de Mensajes de música"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Ruta del editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -15743,12 +17174,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensajería musical para composición colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15758,74 +17189,74 @@
 "tiempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notificar de"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Sólo si alguien menciona su nombre de usuario"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "Ventanas _enfocadas"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prefijar la _cadena en el título de la ventana:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insertar el _número de mensajes nuevos en el título de la ventana"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Insertar el número de mensajes nuevos en la propiedad _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Establecer pista «_URGENTE» del gestor de ventanas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_Subir la ventana de conversación"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Eliminación de la notificación"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eliminar cuando la ventana de la conversación obtiene el _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eliminar cuando la ventana de la conversación _recibe una pulsación"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cuando se _escriba en la ventana de la conversación"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cuando se envíe un _mensaje"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar al cambiar de _solapa de conversación"
 
@@ -15835,7 +17266,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notificación de mensajes"
 
@@ -15843,7 +17274,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Permite notificar de diversas formas la presencia de mensajes sin leer."
@@ -16222,44 +17653,44 @@
 "Este complemento permite al usuario configurar los formatos de marca de "
 "tiempo para los mensajes en conversaciones y guardados en el registro."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidad:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ventanas de conversación de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparencia de las ventanas de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar barra deslizante en la ventana MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Eliminar la transparencia de las ventanas MI al enfocar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Siempre en primer plano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Ventana de la lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparencia de la ventana de lista de _amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
 "Eliminar la transparencia de la ventana de lista de amigos cuando se enfoca"
@@ -16270,19 +17701,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para la lista de amigos y las conversaciones."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16294,48 +17725,48 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Iniciar %s al iniciar Windows"
 
 # Usar empotrable? (jfs)
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes de chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opciones de Pidgwin en Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -16389,6 +17820,111 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "¡Acaba de dar un codazo!"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "¡%s le acaba de dar un codazo!"
+
+#~ msgid "zap"
+#~ msgstr "zap"
+
+#~ msgid "zapped"
+#~ msgstr "zapeado"
+
+#~ msgid "whacked"
+#~ msgstr "golpeado"
+
+#~ msgid "hugged"
+#~ msgstr "abrazado"
+
+#~ msgid "*** You have been %s! ***"
+#~ msgstr "*** ¡Le han %s !***"
+
+#~ msgid "zap: zap a user to get their attention"
+#~ msgstr "zap: Llamar la atención de un usuario"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "¿Desea añadirle?"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "¡%s le acaba de dar un codazo!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "¡Acaba de dar un codazo!"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Opciones/Mostrar _iconos de los amigos"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Opciones/Mostrar _iconos de los amigos"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "¿Seguro que quiere dejar este Qun?"
+
+#~ msgid "Go ahead"
+#~ msgstr "Adelante"
+
+#~ msgid "Server ACK"
+#~ msgstr "ACK de servidor"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "Error de mantenimiento, ¡parece que se ha perdido la conexión!"
+
+#~ msgid "Request login token error!"
+#~ msgstr "¡Error al solicitar token para conectarse!"
+
+#~ msgid "%s Address"
+#~ msgstr "Dirección de %s"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: Disponible"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: Ausente"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: Invisible"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: Desconectado"
+
+#~ msgid "Modify My Information"
+#~ msgstr "Modificar mi información"
+
+#~ msgid "Login in TCP"
+#~ msgstr "Conexión en TCP"
+
+#~ msgid "Login Hidden"
+#~ msgstr "Conexión oculta"
+
+#~ msgid "Socket send error"
+#~ msgstr "Error de envío al socket"
+
+#~ msgid "Connection refused"
+#~ msgstr "Conexión rehusada"
+
+#~ msgid "Norwegian"
+#~ msgstr "Noruego"
+
+#~ msgid "_Bold"
+#~ msgstr "_Negrita"
+
+#~ msgid "_Larger"
+#~ msgstr "_Grande"
+
+#~ msgid "_Smaller"
+#~ msgstr "_Pequeña"
+
+#~ msgid "_Background color"
+#~ msgstr "Color de _fondo"
+
+#~ msgid "_Reset font"
+#~ msgstr "_Restaurar tipografía"
+
+#~ msgid "Show Buddy _Details"
+#~ msgstr "Mostrar _detalles de amigo"
+
 # c-format
 #~ msgid "%s%s%s%s wants to add %s%s%s%s to his or her buddy list%s%s"
 #~ msgstr "%s%s%s%s quiere añadir a %s%s%s%s a su lista de amigos%s%s."
@@ -16426,25 +17962,15 @@
 #~ msgid "/Buddies/_About Pidgin"
 #~ msgstr "/Amigos/_Acerca de Pidgin"
 
-#~ msgid "Larger font size"
-#~ msgstr "Tamaño de tipografía mayor"
-
 #~ msgid "Smaller font size"
 #~ msgstr "Tamaño de tipografía menor"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Limpiar formato"
-
 #~ msgid "Insert link"
 #~ msgstr "Insertar enlace"
 
 #~ msgid "Insert image"
 #~ msgstr "Insertar imagen"
 
-# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#~ msgid "Insert smiley"
-#~ msgstr "Insertar emoticono"
-
 #~ msgid "Tools"
 #~ msgstr "Herramientas"
 
@@ -16716,9 +18242,6 @@
 #~ msgid "Gaim - Save As..."
 #~ msgstr "Gaim - Guardar como..."
 
-#~ msgid "Buzz!!"
-#~ msgstr "¡¡Codazo!!"
-
 #~ msgid "Normal authentication failed!"
 #~ msgstr "¡Falló la autenticación habitual!"
 
@@ -16749,13 +18272,6 @@
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Apodo de amigo:</b> %s"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
@@ -16950,9 +18466,6 @@
 #~ msgid "Wrong password!"
 #~ msgstr "¡Contraseña errónea!"
 
-#~ msgid "Selection"
-#~ msgstr "Selección"
-
 #~ msgid "Faces"
 #~ msgstr "Caras"
 
@@ -16968,9 +18481,6 @@
 #~ msgid "<i>Information below may not be accurate</i><br>\n"
 #~ msgstr "<i>La información a continuación puede no ser correcta</i><br>\n"
 
-#~ msgid "Change My Face"
-#~ msgstr "Cambiar mi cara"
-
 #~ msgid "Please wait for new version"
 #~ msgstr "Por favor, espere a una nueva versión"
 
@@ -17206,11 +18716,6 @@
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Error al ejecutar <b>%s</b>: %s"
 
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr ""
-#~ "No fue posible reproducir el sonido porque el archivo elegido (%s) no "
-#~ "existe."
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
@@ -17247,9 +18752,6 @@
 #~ msgid "Use TLS if available"
 #~ msgstr "Usar TLS si está disponible"
 
-#~ msgid "Require TLS"
-#~ msgstr "Requiere TLS"
-
 #~ msgid "Login server"
 #~ msgstr "Servidor de conexión"
 
@@ -17271,18 +18773,12 @@
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "Incapaz de añadir «%s» a su lista de amigos Napster"
 
-#~ msgid "%s requested your information"
-#~ msgstr "%s solicitó su información de usuario"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s solicitó un PING"
 
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "Complemento de protocolo NAPSTER"
 
-#~ msgid "Email Address"
-#~ msgstr "Correo electrónico"
-
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "Se cerró el MI con %s"
 
@@ -17310,9 +18806,6 @@
 #~ " Intente habilitar servidor proxy para las transferencias de ficheros en "
 #~ "Cuentas->%s->Editar cuenta->Avanzadas."
 
-#~ msgid "Unable to create new connection."
-#~ msgstr "No se pudo crear una nueva conexión."
-
 #~ msgid "Unable to log into file transfer proxy."
 #~ msgstr "No se pudo conectar en el proxy de transferencia de archivos."
 
@@ -17492,9 +18985,6 @@
 #~ " Intente habilitar servidores proxy para las transferencias de ficheros "
 #~ "en Herramientas->Preferencias->AIM/ICQ."
 
-#~ msgid "Decline"
-#~ msgstr "No añadirlo"
-
 #~ msgid "(pending)"
 #~ msgstr "(Pendiente)"
 
@@ -17755,9 +19245,6 @@
 #~ msgid "Default auto-away"
 #~ msgstr "Auto-ausencia por omisión"
 
-#~ msgid "_Sorting:"
-#~ msgstr "Orden:"
-
 #~ msgid "Show more buddy details"
 #~ msgstr "Mostrar detalles del amigo"
 
@@ -17788,9 +19275,6 @@
 #~ msgid "Auto-login"
 #~ msgstr "Conectarse automáticamente"
 
-#~ msgid "Back"
-#~ msgstr "Disponible"
-
 #~ msgid "Signoff"
 #~ msgstr "Desconectar"
 
@@ -17979,9 +19463,6 @@
 #~ msgid "Show fewer options"
 #~ msgstr "Mostrar menos opciones"
 
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Amigos/_Desconectar"
-
 #~ msgid "/Tools/_Away"
 #~ msgstr "/Herramientas/_Ausentarse"
 
@@ -18103,9 +19584,6 @@
 #~ msgid "Chinese"
 #~ msgstr "Chino"
 
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
 #~ msgid "_Screen name"
 #~ msgstr "_Nombre de usuario"
 
@@ -18141,9 +19619,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "Mostrar la _hora en los mensajes"
 
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Ignorar t_amaños de tipografía"
-
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Enviar formato por omisión en los mensajes salientes"
 
@@ -18186,9 +19661,6 @@
 #~ msgid "Show _formatting toolbar"
 #~ msgstr "Mostrar barra de _formato"
 
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Mostrar _apodos en las solapas/títulos"
-
 #~ msgid "_Raise IM window on events"
 #~ msgstr "_Alzar ventanas de MI al recibir un evento"
 
@@ -18351,9 +19823,6 @@
 #~ msgid "Unknown Error Code."
 #~ msgstr "Código de error desconocido."
 
-#~ msgid "Reading data"
-#~ msgstr "Leyendo datos"
-
 #~ msgid "Balancer handshake"
 #~ msgstr "Negociación del balanceador"
 
@@ -18562,9 +20031,6 @@
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Introduzca los datos de su perfil Trepia."
 
-#~ msgid "Set Profile"
-#~ msgstr "Establecer su perfil"
-
 #~ msgid "Visit Homepage"
 #~ msgstr "Visitar página personal"
 
@@ -18688,13 +20154,6 @@
 #~ "\\n\n"
 #~ "Enviar un mensaje instantáneo\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inactivo</b>"
-
 #~ msgid "_Preferences"
 #~ msgstr "_Preferencias"
 
@@ -18757,9 +20216,6 @@
 #~ "Dado que Zephyr usa el nombre de usuario del sistema, no puede tener "
 #~ "múltiples cuentas de éste cuando se conecta como el mismo usuario."
 
-#~ msgid "That file already exists."
-#~ msgstr "Ese archivo ya existe."
-
 #~ msgid "MSN ID"
 #~ msgstr "ID MSN"
 
@@ -18769,9 +20225,6 @@
 #~ msgid "Channels"
 #~ msgstr "Canales"
 
-#~ msgid "Buddy icon file:"
-#~ msgstr "Fichero de icono de amigo:"
-
 #~ msgid "_Browse"
 #~ msgstr "_Navegador"
 
@@ -18904,9 +20357,6 @@
 #~ msgid "Style"
 #~ msgstr "Estilo"
 
-#~ msgid "_Strikethrough"
-#~ msgstr "_Tachado"
-
 #~ msgid "Use custo_m face"
 #~ msgstr "Usar aspecto _personalizado"
 
@@ -18916,9 +20366,6 @@
 #~ msgid "Color"
 #~ msgstr "Color"
 
-#~ msgid "Bac_kground color"
-#~ msgstr "Color del _fondo"
-
 #~ msgid "Show _URLs as links"
 #~ msgstr "Mostrar _URLs como enlaces"
 
@@ -19312,18 +20759,12 @@
 #~ "El usuario Jabber %s no existe y por lo tanto no se lo añadirá a su "
 #~ "«roster»."
 
-#~ msgid "No such user."
-#~ msgstr "No existe el usuario."
-
 #~ msgid "Unknown login error"
 #~ msgstr "Error de conexión desconocido."
 
 #~ msgid "Password successfully changed."
 #~ msgstr "La contraseña se cambió correctamente."
 
-#~ msgid "Requesting Authentication Method"
-#~ msgstr "Solicitando método de autenticación"
-
 #~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 #~ msgstr ""
 #~ "El usuario %s es un I.D. de Jabber inválido y por lo tanto no fue añadido."
@@ -19440,9 +20881,6 @@
 #~ msgid "CTCP UserInfo"
 #~ msgstr "Información del Usuario vía CTCP"
 
-#~ msgid "CTCP Version"
-#~ msgstr "Versión del cliente vía CTCP"
-
 #~ msgid "CTCP Ping"
 #~ msgstr "Ping CTCP"
 
diff -ru pidgin-2.1.1/po/et.po pidgin-2.2.0/po/et.po
--- pidgin-2.1.1/po/et.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/et.po	2007-09-14 00:45:42.000000000 -0400
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gaim 2.1.1\n"
+"Project-Id-Version: gaim 2.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 03:22-0400\n"
-"PO-Revision-Date: 2007-08-15 10:40+0300\n"
+"POT-Creation-Date: 2007-09-05 03:21-0400\n"
+"PO-Revision-Date: 2007-09-06 07:53+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 #: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -60,13 +60,15 @@
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -82,73 +84,73 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Konto ekraaninimi ei tohi tühi olla."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest antakse teada"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Parooli peetakse meeles"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Protokollide pluginaid pole paigaldatud."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Ilmselt unustasid sa käsu 'make install'.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Muuda kontot"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Uus konto"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Ekraaninimi:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
 #: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
 #: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:588
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330 ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6095
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -161,12 +163,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -183,110 +185,110 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:985 ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1029 ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1099 ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1196 ../pidgin/gtkdialogs.c:1235
+#: ../pidgin/gtkdialogs.c:1262 ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Loobu"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
+#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1054 ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salvesta"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Kas sa soovid kustutada kontot %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Konto kustutamine"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontod"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Selles nimekirjas on võimalik kontosid lubada ja keelata."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
 #: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
+#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1639
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisa"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Muuda"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s määras kasutaja %s oma sõbraks%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Kas lisada sõber sinu nimekirja?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s soovib kasutaja %s lisada oma sõbranimekirja%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autoriseerida sõber?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autoriseeri"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Keela"
 
@@ -310,19 +312,19 @@
 msgid "Error adding buddy"
 msgstr "Viga sõbra lisamisel"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Ekraaninimi"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1028 ../pidgin/gtkdialogs.c:1050
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -331,11 +333,11 @@
 msgid "Group"
 msgstr "Grupp"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
@@ -348,7 +350,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Sõbra lisamine"
@@ -362,9 +364,9 @@
 msgstr "Jututoad"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590 ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -376,7 +378,7 @@
 msgid "Auto-join"
 msgstr "Automaatühendumine"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Vestluse lisamine"
 
@@ -397,8 +399,8 @@
 msgstr "Selle nimega grupp on juba olemas."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Grupi lisamine"
 
@@ -416,7 +418,7 @@
 
 #: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
-msgstr ""
+msgstr "Redigeeri"
 
 #: ../finch/gntblist.c:827
 msgid "Edit Settings"
@@ -430,7 +432,7 @@
 msgid "Retrieving..."
 msgstr "Vastuvõtmine..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -441,10 +443,10 @@
 msgstr "Sõbramärguande lisamine"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1602
+#: ../pidgin/gtkconv.c:1587
 msgid "Send File"
 msgstr "Saada fail"
 
@@ -463,7 +465,7 @@
 
 #: ../finch/gntblist.c:1001
 msgid "Set Alias"
-msgstr ""
+msgstr "Määra alias"
 
 #: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
@@ -471,11 +473,12 @@
 
 #: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "Selle kontakti eemaldamisel kaovad ära ka kõik selle kontakti sõbrad"
 
 #: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
+"Selle grupi eemaldamisel kaovad ära ka kõik selles grupis olevad sõbrad"
 
 #: ../finch/gntblist.c:1091
 #, c-format
@@ -487,15 +490,15 @@
 msgid "Confirm Remove"
 msgstr "Eemaldamiskinnitus"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1636 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Eemalda"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Sõbranimekiri"
@@ -509,15 +512,15 @@
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
 #: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409 ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -527,29 +530,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:553 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1922
 msgid "Idle"
 msgstr "Jõude"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -558,12 +561,12 @@
 "Ühendunuid: %d\n"
 "Kokku: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -572,50 +575,50 @@
 "\n"
 "Viimati nähtud: %s tagasi"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Uus..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Salvestatud..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:735
+#: ../pidgin/gtkdialogs.c:874 ../pidgin/gtkdialogs.c:955
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:740
+#: ../pidgin/gtkdialogs.c:879 ../pidgin/gtkdialogs.c:960
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:748
 msgid "New Instant Message"
 msgstr "Uus välksõnum"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:750
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Palun sisesta isiku ekraaninimi või alias, kellega soovid välksõnumeid "
 "vahetada."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
 #: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/msn/msn.c:295 ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329 ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -632,40 +635,40 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:984 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Olgu"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Valikud"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Saada välksõnum..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Tühje gruppe näidatakse"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Ühendamata sõpru näidatakse"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Sortimine oleku järgi"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Sortimine tähestiku järgi"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Sortimine logi suuruse järgi"
 
@@ -692,41 +695,45 @@
 "Finch ei proovi kontot automaatselt ühendada enne, kui sa pole viga "
 "kõrvaldanud ja kontot uuesti kasutusele võtnud."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Sellist käsku pole."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Süntaksi viga:  Sa sisestasid selle käsu jaoks vale arvu argumente."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
-msgstr ""
+msgstr "Tõrge sinu käsu täitmisel, tõrke põhjus on teadmata."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "See käsk toimib ainult vestlustes, välksõnumites aga mitte."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "See käsk toimib ainult välksõnumites, vestlustes aga mitte."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "See käsk ei toimi selle protokolliga."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Sõnumit ei saadetud kuna sa pole sisse logitud."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -735,48 +742,69 @@
 "\n"
 "%s tipib..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Sa lahkusid sellest vestlusest."
 
-#: ../finch/gntconv.c:342
-msgid "Send To"
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1346
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Logimine käivitatud. Alatest käesolevast hetkest logitakse selle vestluse "
+"kõik sõnumid."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1354
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
+"Logimine lõpetatud. Alatest käesolevast hetkest selle vestluse sõnumeid enam "
+"ei logita."
+
+#: ../finch/gntconv.c:419
+msgid "Send To"
+msgstr "Kellele saata"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Vestlus"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Puhasta tagasikerimine"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Ajatempleid näidatakse"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Lisa sõbramärguanne..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Luba logimine"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Luba helid"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATVASTUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Kasutajate nimekiri:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Toetatud silumisvalikud on:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Sellist käsku pole (selles kontekstis)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -784,7 +812,7 @@
 "Kasuta \"/help &lt;käsk&gt;\" selle käsu abiteabe saamiseks.\n"
 "Sellest kontekstis on saadaval järgnevad käsud:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7527
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -792,53 +820,53 @@
 "say &lt;message&gt;:  Sõnumi saatmine nagu tehtaks seda ilma käsku "
 "kasutamata."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7530
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  IRC-stiilis tegevus sõbrale või vestlusele."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7533
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;võti&gt;:  Silumisteabe saatmine käesolevasse vestlusesse."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7536
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Vestluse tagasikerimise puhastamine."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7542
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;käsk&gt;:  Abiteave käsu kohta."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Vestluses osalevate kasutajate nimekirja näitamine."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pluginate akna näitamine."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Sõbranimekirja näitamine."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Kontode akna näitamine."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Silumisakna näitamine."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Eelistuste akna näitamine."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Silumisaken"
 
@@ -864,99 +892,104 @@
 msgstr "Failiülekanded - %d%% faili %d-st"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Failiülekanded"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Edenemine"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Failinimi"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Suurus"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Kiirus"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäänud"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Olek"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "See aken suletakse ülekannete lõppemisel"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Lõpetatud ülekanded puhastatakse"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Seiska"
 
 #. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
+#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:412 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulge"
 
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Tühistatud"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Fail salvestati nimega %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Lõpetatud"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Ülekandmine"
 
@@ -968,11 +1001,11 @@
 msgid "You have mail!"
 msgstr "Sulle on e-sõnum!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Saatja"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Teema"
 
@@ -983,17 +1016,17 @@
 msgstr[0] "%s (%s) sai %d uue sõnumi."
 msgstr[1] "%s (%s) sai %d uut sõnumit."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Uus e-sõnum"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Andmed: %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Sõbra andmed"
 
@@ -1001,11 +1034,11 @@
 msgid "Continue"
 msgstr "Jätka"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1615 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Andmed"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1576
 msgid "IM"
 msgstr "Välksõnum"
 
@@ -1013,7 +1046,7 @@
 msgid "Join"
 msgstr "Ühine"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1072,7 +1105,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2064
 msgid "Preferences"
 msgstr "Eelistused"
 
@@ -1080,7 +1113,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Palun sisesta sõber, kelle kohta märguanne seatakse."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Uus sõbramärguanne"
@@ -1094,7 +1126,7 @@
 msgstr "Kellest märku antakse"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1103,7 +1135,7 @@
 msgstr "Sõbra nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Märguanne, kui sõber..."
 
@@ -1137,7 +1169,7 @@
 
 #: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
-msgstr "Peab tippimisel pausi"
+msgstr "Teeb tippimisel pausi"
 
 #: ../finch/gntpounce.c:383
 msgid "Stops typing"
@@ -1148,7 +1180,7 @@
 msgstr "Saadab sõnumi"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Tegevus"
 
@@ -1176,70 +1208,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Märguanne ainult juhul, kui ma pole saadaval"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Märguannet pole võimalik luua"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Sul pole ühtegi kontot."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Enne märguande loomist pead Sa omale konto looma."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Kas sa soovid kustutada %2$s märguande %1$s kohta?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Sõbramärguanded"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alustas sulle sõnumi sisestamist (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s jättis sulle sõnumi sisestamise pooleli (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s logis sisse (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s pole enam jõude (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s naases eemalolekust (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s lõpetas sulle sõnumi sisestamise (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s logis välja (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s jäi jõude (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s eemaldus. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s saatis sulle sõnumi. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tundmatu teavitussündmus. Palun anna sellest teada!"
 
@@ -1247,12 +1291,12 @@
 msgid "Based on keyboard use"
 msgstr "Tulenevalt klaviatuuri kasutamisest"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1927
 msgid "From last sent message"
 msgstr "Viimatisaadetud sõnumist"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1926 ../pidgin/gtkprefs.c:1940
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mitte iial"
@@ -1263,7 +1307,7 @@
 
 #: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
-msgstr "Näita ühendamata sõpru"
+msgstr "Ühendamata sõpru näidatakse"
 
 #: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
@@ -1302,12 +1346,12 @@
 msgstr "Uueks olekuks saab"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2030
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Vestlused"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2041
 msgid "Logging"
 msgstr "Logimine"
 
@@ -1315,106 +1359,106 @@
 msgid "Not implemented yet."
 msgstr "Pole veel teostatud."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Faili salvestamine..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Faili avamine..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Sõber logib sisse"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Sõber logib välja"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Sõnum võetakse vastu"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Sõnumi vastuvõtmine alustab vestlust"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Saadetakse sõnumit"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Isik siseneb jututuppa"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Isik väljub jututoast"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sa kõneled jututoas"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Teisted kõnelevad jututoas"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Keegi ütleb vestluses sinu nime"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "Tõrge GStreamer'i lähtestamisel."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1869
 msgid "(default)"
 msgstr "(vaikimisi)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Helifaili valimine..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Helide eelistused"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profiilid"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1714
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsoolipiiks"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1718
 msgid "Command"
 msgstr "Käsk"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Helid puuduvad"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1709
 msgid "Sound Method"
 msgstr "Helitegemise meetod"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Meetod: "
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1424,55 +1468,55 @@
 "(%s failinime jaoks)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1753
 msgid "Sound Options"
 msgstr "Helide valikud"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Heli fookusesse sattumise korral"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1760 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alati"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1758
 msgid "Only when available"
 msgstr "Kui ma olen saadaval"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1759
 msgid "Only when not available"
 msgstr "Kui mind pole saadaval"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Valjus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1795
 msgid "Sound Events"
 msgstr "Helisündmused"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1854
 msgid "Event"
 msgstr "Sündmus"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fail"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1873
 msgid "Test"
 msgstr "Proovi"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1877
 msgid "Reset"
 msgstr "Algväärtusta"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1881
 msgid "Choose..."
 msgstr "Vali..."
 
@@ -1489,7 +1533,7 @@
 msgid "Saved Statuses"
 msgstr "Salvestatud olekud"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1501,48 +1545,57 @@
 msgid "Type"
 msgstr "Liik"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
 #: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/oscar/oscar.c:5773
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5810
+#: ../libpurple/protocols/oscar/oscar.c:5817
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Sõnum"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
-msgstr ""
+msgstr "Kasuta"
 
 #: ../finch/gntstatus.c:300
 msgid "Invalid title"
@@ -1552,56 +1605,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Palun määra olekule pealkiri, mis poleks tühi string."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Topeltpealkiri"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Palun sisesta olekule teistsugune pealkiri."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Alamolek"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Sõnum:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr ""
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Järgnevate kontode jaoks kasutatakse teistsugust olekut"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
-msgstr "Sal_vesta ja kasuta"
+msgstr "Salvesta ja kasuta"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Sertifikaadid"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2032
 msgid "Sounds"
 msgstr "Helid"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Olekud"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Viga plugina mälust laadimisel."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "X-kuva pole võimalik leida"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Akend pole võimalik leida"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Seda pluginat pole võimalik laadida kuna pluginal pole X11 tuge."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntLõikelaud"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Lõikelaua plugin"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1677,7 +1751,7 @@
 
 #: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Ajaloo plugina kasutamiseks peab logimine olema lubatud"
 
 #: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
@@ -1686,10 +1760,14 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"Logimist on võimalik lubada menüüst Vahendid -> Eelistused -> Logimine.\n"
+"\n"
+"Kui lubada välksõnumite ja/või vestluste logimine, siis on vastavat liiki "
+"jutuajamis(t)e jaoks võimalik aktiveerida ka ajalooplugin."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
-msgstr ""
+msgstr "GntAjalugu"
 
 #: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
@@ -1713,11 +1791,11 @@
 
 #: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntViimaneLogi"
 
 #: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Viimase logi plugin."
 
 #: ../libpurple/account.c:790
 msgid "accounts"
@@ -1747,12 +1825,12 @@
 msgstr "%s jaoks pole protokollipluginat"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Ühenduse viga"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Uued paroolid ei klapi omavahel."
 
@@ -1790,7 +1868,7 @@
 msgid "Set User Info"
 msgstr "Määra kasutajateave"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/account.c:1735 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
@@ -1799,9 +1877,10 @@
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3232 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Sõbrad"
@@ -1831,58 +1910,58 @@
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "Sõnumit pole võimalik saata: Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:174 ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kasutajale %s pole võimalik sõnumit saata."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Sõnum on liiga suur."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/conversation.c:184 ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Sõnumit pole võimalik saata."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Sõnumi saatmine"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Saada sõnum"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s sisenes tuppa."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] sisenes tuppa."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sa oled nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nüüd nimega %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s väljus toast."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s väljus toast (%s)."
@@ -1890,7 +1969,7 @@
 #: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr ""
+msgstr "Tõrge ühenduse hankimisel: %s"
 
 #: ../libpurple/dbus-server.c:596
 #, c-format
@@ -1900,7 +1979,7 @@
 #: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr ""
+msgstr "Tõrge serveri nime hankimisel: %s"
 
 #: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
@@ -2085,7 +2164,7 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Käsu käivitamine terminalis"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
@@ -2312,7 +2391,7 @@
 
 #: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "See plugin pole ID-d defineerinud."
 
 #: ../libpurple/plugin.c:448
 #, c-format
@@ -2326,7 +2405,7 @@
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "Pluginal pole kõik vajalikud funktsioonid realiseeritud"
 
 #: ../libpurple/plugin.c:547
 #, c-format
@@ -2334,6 +2413,7 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
+"Vajalikku pluginat %s ei leitud. Palun paigalda see plugin ja proovi uuesti."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2342,7 +2422,7 @@
 #: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr ""
+msgstr "Vajalikku pluginat %s pole võimalik laadida."
 
 #: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
@@ -2394,10 +2474,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:6168
+#: ../libpurple/protocols/oscar/oscar.c:6238 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Loobu"
@@ -2439,8 +2519,8 @@
 "Automaatselt nõustutud faili täielikust ülekandmisest teavitatakse\n"
 "hüpikakna abil (seda juhul, kui saatjaga pole vestlust käimas)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Märkused"
 
@@ -2857,24 +2937,24 @@
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2884,9 +2964,9 @@
 msgid "Yes"
 msgstr "Jah"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2896,11 +2976,11 @@
 msgid "No"
 msgstr "Ei"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -3010,13 +3090,19 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL tugiteekide kasutamise tagamine (mähkurina)."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:633
+msgid "X.509 Certificates"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3024,8 +3110,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL toe tagamine GNUTLS-i abil."
 
@@ -3035,7 +3121,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:718
 msgid "NSS"
 msgstr "NSS"
 
@@ -3043,8 +3129,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:721
+#: ../libpurple/plugins/ssl/ssl-nss.c:723
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL toe tagamine Mozilla NSS_i abil."
 
@@ -3137,21 +3223,21 @@
 msgstr ""
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/jabber/jabber.c:819
 msgid "First name"
 msgstr "Eesnimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "Last name"
 msgstr "Perekonnanimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:940
 #: ../libpurple/protocols/jabber/buddy.c:948
@@ -3164,13 +3250,13 @@
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-i konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP konto"
 
@@ -3184,27 +3270,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolli plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr ""
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Hostinimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3214,32 +3298,32 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s sulges vestluse."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Soklit pole võimalik avada"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Viga soklivalikute seadmisel"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Soklit pole võimalik kuulata"
 
@@ -3316,8 +3400,8 @@
 msgstr "Registreerimine edukalt läbi viidud!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Parool"
 
@@ -3343,9 +3427,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Linn"
@@ -3354,8 +3438,8 @@
 msgid "Year of birth"
 msgstr "Sünniaasta"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3368,14 +3452,14 @@
 msgstr "Mees või naine"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mees"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3438,12 +3522,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5605
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Ühendamata"
 
@@ -3453,41 +3537,41 @@
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Saadaval"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5633
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Eemal"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3498,7 +3582,7 @@
 msgstr "Sünniaasta"
 
 #: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Otsingutulemusi pole võimalik kuvada."
 
@@ -3542,7 +3626,7 @@
 msgid "Connection failed."
 msgstr "Tõrge ühendumisel."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Blokitud"
 
@@ -3679,7 +3763,8 @@
 msgstr "%s päevasõnum"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2339
 msgid "Server has disconnected"
 msgstr "Server katkestas ühenduse"
 
@@ -3690,10 +3775,10 @@
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
-msgstr "_Kanal:"
+msgstr "Ka_nal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Parool:"
 
@@ -3701,65 +3786,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Ühendumine"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
 #: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2452
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Tõrge ühendumisel"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Tõrge SSL käepigistusel"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2335
 msgid "Read error"
 msgstr "Viga lugemisel"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Kasutajad"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Teema"
 
@@ -3771,21 +3853,21 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokolli plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC protokolli plugin, mis Imeb Vähem"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
@@ -3796,22 +3878,22 @@
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6675
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kooditabelid"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3827,7 +3909,7 @@
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3837,7 +3919,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Kasutatakse SSL-i"
 
@@ -3865,10 +3947,10 @@
 
 #: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
-msgstr ""
+msgstr " <i>(tuvastatud)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3927,11 +4009,11 @@
 #: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
-msgstr ""
+msgstr "Kanali %s kasutajad: %s"
 
 #: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
-msgstr ""
+msgstr "Ajavastus"
 
 #: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
@@ -3970,14 +4052,14 @@
 #: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "Sind löödi %s poolt välja (%s)"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
 
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "Välja löödyd %s poolt (%s)"
+msgstr "Välja löödud kasutaja %s poolt (%s)"
 
 #: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
@@ -4079,7 +4161,7 @@
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr ""
+msgstr "invite &lt;hüüdnimi&gt; [kanal]:  Kellegi kutsumine kanalile."
 
 #: ../libpurple/protocols/irc/parse.c:128
 msgid ""
@@ -4098,6 +4180,8 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
+"kick &lt;hüüdnimi&gt; [sõnum]:  Kellegi kanalilt eemaldamine. Eemaldamiseks "
+"pead sa olema kanali operaator."
 
 #: ../libpurple/protocols/irc/parse.c:131
 msgid ""
@@ -4127,12 +4211,12 @@
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
+msgstr "names [kanal]:  Kanalil olevate kasutajate nimekiri."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr ""
+msgstr "nick &lt;uus hüüdnimi&gt;:  Sinu hüüdnime muutmine."
 
 #: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
@@ -4175,6 +4259,8 @@
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
+"quit [sõnum]:  Serveriga ühenduse katkestamine. Võimalik on ka katkestamise "
+"kohta sõnum jätta."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
@@ -4188,11 +4274,11 @@
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
-msgstr ""
+msgstr "time: IRC-serveri kohaliku aja näitamine."
 
 #: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr ""
+msgstr "topic [uus teema]:  Kanali teema vaatamine või muutmine."
 
 #: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
@@ -4200,7 +4286,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [hüüdnimi]: CTCP VERSION päringu saatmine kasutajale"
 
 #: ../libpurple/protocols/irc/parse.c:152
 msgid ""
@@ -4216,11 +4302,11 @@
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
+msgstr "whois [server] &lt;hüüdnimi&gt;: Kasutaja kohta teabe hankimine."
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
+msgstr "whowas &lt;hüüdnimi&gt;: Väljalogitud kasutaja kohta teabe hankimine."
 
 #: ../libpurple/protocols/irc/parse.c:465
 #, c-format
@@ -4240,7 +4326,7 @@
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
-msgstr "Lahti ühendatud."
+msgstr "Ühendus katkestatud."
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
@@ -4291,6 +4377,8 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
+"See server nõuab avatekstilist autentimist üle krüptimata ühenduse.  Kas "
+"seda peaks lubama ja autentimist jätkama?"
 
 #: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
@@ -4303,7 +4391,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4322,7 +4410,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "URL"
 
@@ -4381,14 +4469,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Sünnipäev"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Kirjeldus"
@@ -4423,11 +4511,11 @@
 msgstr "Vahend"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Tähtsus"
 
@@ -4438,9 +4526,9 @@
 msgstr "Keskmine nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4484,7 +4572,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Lobisev"
 
@@ -4493,10 +4581,10 @@
 msgstr "Kaua eemal"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Mitte segada"
 
@@ -4506,13 +4594,13 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Järgneb sinu otsingu tulemus"
 
 #. current comment from Jabber User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1732
@@ -4542,8 +4630,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
@@ -4559,7 +4647,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4582,8 +4670,8 @@
 msgstr "Kataloogist otsimine"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Tuba:"
 
@@ -4667,7 +4755,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
-msgstr "Vali jututoaserver, kuhu päring esitada"
+msgstr "Vali konverentsiserver, kuhu päring esitada"
 
 #: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
@@ -4690,8 +4778,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4700,55 +4788,55 @@
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Soklit pole võimalik luua"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Vigane XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Vigane XMPP ID. Domeen peab olema määratud."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Kasutaja %s@%s registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
 msgid "Registration Successful"
 msgstr "Registreerimine õnnestus"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
 msgid "Unknown Error"
 msgstr "Tundmatu viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Failed"
 msgstr "Tõrge registreerimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Juba registreeritud"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Olek"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Postiindeks"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4758,400 +4846,399 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Kuupäev"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
-msgstr ""
+msgstr "Uue konto registreerimiseks täida palun allpool olevad lahtrid."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Uue XMPP konto registreerimine"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Registreeri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Andmevoo lähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "Andmevaa taaslähtestamine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5603
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Mõlemad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Saatja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Puudub"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Parool muudetud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Sinu parool on muudetud."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Palun sisesta uus parool"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6389
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Määra kasutajateave..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6400
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Parooli muutmine..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Kasutajate otsimine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Vigane päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Keelatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Serveri sisemine viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Kirjet ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Vigaselt vormindatud XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Pole lubatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Kaugserverit ei leitud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Kaugserver ületas ajapiirangu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Server on ülekoormatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Teenus pole saadaval"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
-msgstr ""
+msgstr "Ootamatu päring"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
-msgstr ""
+msgstr "Volituste andmine katkestati"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
-msgstr ""
+msgstr "Vigane volituste andmise mehhanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
-msgstr ""
+msgstr "Volituste andmise mehhanism on liiga nõrk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Tõrge autentimisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Vigane vorming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Vahendi vastuolu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Tundmatu host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Vigane ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Vigane nimeruum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Vigane XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
-msgstr ""
+msgstr "Mittevastavad hostid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
-msgstr ""
+msgstr "Tõrge kaugühenduse loomisel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Vahendi piirang"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Toetamata kooditabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Toetamata versioon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "XML pole korrektselt vormindatud"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Voo viga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kasutajat %s pole võimalik tõrjuda"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tundmatu roll: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kasutajale pole võimalik rolli \"%s\" määrata: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
-msgstr ""
+msgstr "Kasutajat pole võimalik välja lüüa: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
-msgstr ""
+msgstr "config:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1817
 msgid "configure:  Configure a chat room."
-msgstr ""
+msgstr "configure:  Jututoa seadistamine."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;kasutaja&gt; [tuba]:  Kasutaja tõrjumine jututoast."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;kasutaja&gt; [sõnum]:  Kasutaja kutsumine jututuppa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
+msgstr "join: &lt;tuba&gt; [server]:  Serveris asuva jututoaga ühinemine."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr ""
+msgstr "kick &lt;kasutaja&gt; [tuba]:  Kasutaja toast väljalöömine."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -5173,7 +5260,7 @@
 msgstr "XMPP protokolli plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domeen"
 
@@ -5186,12 +5273,16 @@
 msgstr "Avatekstiline autentimise on krüptimata andmevoo lubatud"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3265
 #: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Ühendumisport"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3262
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -5249,24 +5340,26 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
+"Sa lood uut tuba. Kas sa soovid sellele seadistusi määrata või nõustud "
+"vaikimisi seadistustega?"
 
 #: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
-msgstr ""
+msgstr "_Seadista tuba"
 
 #: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
-msgstr ""
+msgstr "_Nõustu vaikeväärtustega"
 
 #: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
-msgstr ""
+msgstr "Viga vestluses %s"
 
 #: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
-msgstr ""
+msgstr "Viga vestlusega %s ühinemisel"
 
 #: ../libpurple/protocols/jabber/si.c:769
 #, c-format
@@ -5277,7 +5370,7 @@
 #: ../libpurple/protocols/jabber/si.c:771
 #: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
-msgstr ""
+msgstr "Tõrge faili saatmisel"
 
 #: ../libpurple/protocols/jabber/si.c:832
 #, c-format
@@ -5448,7 +5541,7 @@
 
 #: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
-msgstr ""
+msgstr "Serverile saadeti vale CHL-väärtus"
 
 #: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
@@ -5554,168 +5647,180 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-i viga: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "müks"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "müksatud"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Müksamine"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Sa müksasid teda!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Sinu MSN-i sõbralik nimi on liiga pikk."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Sõbraliku nime määramine."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Selle nimega näevad sind MSN-is olevad sõbrad."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Oma kodutelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Oma töötelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Oma mobiiltelefoni numbri määramine."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Luba"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Ära luba"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "See Hotmaili konto võib mitte aktiivne olla."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Sina tema loendis"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:588 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Tulen kohe tagasi"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:592 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Räägin telefoniga"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Lõunal"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Määra sõbralik nimi..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Määra kodutelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Määra töötelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Määra mobiiltelefoni number..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiilseadmete lubamine/keelamine"
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Ava Hotmaili postkast"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Algata _jututuba"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN-i jaoks on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Tõrge serveriga ühendumisel."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1516 ../libpurple/protocols/msn/msn.c:1864
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1587 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Üldine"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Vanus"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Amet"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5723,195 +5828,195 @@
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800 ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Hobid ja huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749 ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Väheke minust"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Perekonnaseis"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Huvid"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Lemmikloomad"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Kodulinn"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
-msgstr ""
+msgstr "Endised elukohad"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Mood"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Huumor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Muusika"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1635 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lemmiktsitaat"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Kontaktandmed"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Isiklik"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Kodutelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Kodutelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Koduaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Isiklik mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Kodufaks"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Isiklik e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Isiklikud välksõnumid"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Tähtpäev"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Tööl"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Töö nimetus"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osakond"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Ametikoht"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Töötelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "Töötelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Tööaadress"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Töö-mobiiltelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Tööpeiler"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Tööfaks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "Töö e-post"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Alguskuupäev"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765 ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778 ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Lemmikasjad"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Viimati uuendatud"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Kasutaja pole loonud avalikku profiili."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5919,7 +6024,7 @@
 "Kasutajaprofiili kohta pole võimalik mingeid andmeid leida. Kõige "
 "tõenäolisemalt pole seda kasutajat olemas."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1878
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiili URL"
@@ -5934,19 +6039,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169 ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokolli plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "Kasutatakse HTTP meetodit"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Kasutatakse kohandatud tujunägusid"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: kasutaja müksamine tema tähelepanu võitmiseks"
 
@@ -5965,8 +6070,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Ühendumine pole võimalik"
 
@@ -6162,7 +6267,7 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sõnumit pole võimlik saata kuna leidis aset tundmatu viga:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s müksas sind!"
@@ -6186,81 +6291,286 @@
 msgid "The screen name specified is invalid."
 msgstr "Määratud ekraaninimi on vigane."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
-msgid "Required parameters not passed in"
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Šiffer on puudu"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "RC4 šifrit pole võimalik leida"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
 msgstr ""
+"Uuenda oma libpurple teeki nii, et see toetakse RC4u šifrit (>= 2.0.1). "
+"MySpaceIM jäetakse laadimata."
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
-msgid "Unable to write to network"
-msgstr "Võrku kirjutamine pole võimalik"
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
-msgid "Unable to read from network"
-msgstr "Võrgust pole võimalik lugeda"
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1789
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM viga"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
-msgid "Error communicating with server"
-msgstr "Viga serveriga suhtlemisel"
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
-msgid "Conference not found"
-msgstr "Konverentsi ei leitud"
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
-msgid "Conference does not exist"
-msgstr "Konverentsi pole olemas"
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Sisselogimine"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
-msgid "A folder with that name already exists"
-msgstr "Selle nimega kataloog on juba olemas"
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
-msgid "Not supported"
-msgstr "Toetamata"
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Uued e-posti sõnumid"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
-msgid "Password has expired"
-msgstr "Parool on aegunud"
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Uued blogikommentaarid"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
-msgid "Incorrect password"
-msgstr "Vigane parool"
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Uued profiilikommentaarid"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
-msgid "User not found"
-msgstr "Kasutajat ei leitud"
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Uued sõbrakutsed!"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
-msgid "Account has been disabled"
-msgstr "Konto on keelatud"
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Uued pildikommentaarid"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
-msgid "The server could not access the directory"
-msgstr ""
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
-msgid "Your system administrator has disabled this operation"
-msgstr "Sinu süsteemiülem on selle toimingu keelanud"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Ühendatud"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
-msgid "The server is unavailable; try again later"
-msgstr "Server pole saadavalm, proovi hiljem uuesti"
+#: ../libpurple/protocols/myspace/myspace.c:1770
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protkolli viga, veakood %d: %s"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
-msgid "Cannot add a contact to the same folder twice"
-msgstr "Ühte kontakti pole samasse kataloogi võimalik kaks korda lisada"
+#: ../libpurple/protocols/myspace/myspace.c:1955
+#: ../libpurple/protocols/myspace/myspace.c:1989
+msgid "Failed to add buddy"
+msgstr "Tõrge sõbra lisamisel"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
-msgid "Cannot add yourself"
-msgstr "Ennast pole võimalik lisada"
+#: ../libpurple/protocols/myspace/myspace.c:1955
+msgid "'addbuddy' command failed."
+msgstr "Tõrge 'addbuddy' käsu täitmisel."
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
-msgid "Master archive is misconfigured"
+#: ../libpurple/protocols/myspace/myspace.c:1989
+#: ../libpurple/protocols/myspace/myspace.c:2230
+msgid "persist command failed"
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Vigane ekraaninimi või parool"
+#: ../libpurple/protocols/myspace/myspace.c:2098
+#, c-format
+msgid "No such user: %s"
+msgstr "Sellist kasutajat pole: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2099
+msgid "User lookup"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2211
+#: ../libpurple/protocols/myspace/myspace.c:2230
+#: ../libpurple/protocols/myspace/myspace.c:2252
+msgid "Failed to remove buddy"
+msgstr "Tõrge sõbra eemaldamisel"
+
+#: ../libpurple/protocols/myspace/myspace.c:2211
+msgid "'delbuddy' command failed"
+msgstr "Tõrge 'delbuddy' käsu täitmisel."
+
+#: ../libpurple/protocols/myspace/myspace.c:2252
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2298
+msgid "Invalid input condition"
+msgstr ""
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2316
+#: ../libpurple/protocols/myspace/myspace.c:2347
+msgid "Read buffer full"
+msgstr "Lugemispuhver on täis"
+
+#: ../libpurple/protocols/myspace/myspace.c:2385
+msgid "Unparseable message"
+msgstr "Analüüsimatu sõnum"
+
+#: ../libpurple/protocols/myspace/myspace.c:2454
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2625
+msgid "IM Friends"
+msgstr "IM-sõbrad"
+
+#: ../libpurple/protocols/myspace/myspace.c:2724
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2725
+msgid "Add contacts from server"
+msgstr "Serverist kontaktide lisamine"
+
+#: ../libpurple/protocols/myspace/myspace.c:2777
+#: ../libpurple/protocols/myspace/myspace.c:2842
+msgid "Add friends from MySpace.com"
+msgstr "Sõprade lisamine MySpace.com'ist"
+
+#: ../libpurple/protocols/myspace/myspace.c:2778
+msgid "Importing friends failed"
+msgstr "Tõrge sõprade importimisel"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2834
+msgid "Find people..."
+msgstr "Otsi inimesi..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2837
+msgid "Change IM name..."
+msgstr "Minu IM-nime..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3144
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3145
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3146
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3269
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3272
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3277
+msgid "Send emoticons"
+msgstr "Tujunägude saatmine"
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Screen resolution (dots per inch)"
+msgstr "Ekraani eraldusvõime (punkti tollile)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3285
+msgid "Base font size (points)"
+msgstr "Aluskirjatüübi suurus (punktides)"
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
+msgid "Required parameters not passed in"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1867
+msgid "Unable to write to network"
+msgstr "Võrku kirjutamine pole võimalik"
+
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "Võrgust pole võimalik lugeda"
+
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "Viga serveriga suhtlemisel"
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "Konverentsi ei leitud"
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "Konverentsi pole olemas"
+
+#: ../libpurple/protocols/novell/nmuser.c:1884
+msgid "A folder with that name already exists"
+msgstr "Selle nimega kataloog on juba olemas"
+
+#: ../libpurple/protocols/novell/nmuser.c:1887
+msgid "Not supported"
+msgstr "Toetamata"
+
+#: ../libpurple/protocols/novell/nmuser.c:1891
+msgid "Password has expired"
+msgstr "Parool on aegunud"
+
+#: ../libpurple/protocols/novell/nmuser.c:1894
+msgid "Incorrect password"
+msgstr "Vigane parool"
+
+#: ../libpurple/protocols/novell/nmuser.c:1897
+msgid "User not found"
+msgstr "Kasutajat ei leitud"
+
+#: ../libpurple/protocols/novell/nmuser.c:1900
+msgid "Account has been disabled"
+msgstr "Konto on keelatud"
+
+#: ../libpurple/protocols/novell/nmuser.c:1903
+msgid "The server could not access the directory"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1906
+msgid "Your system administrator has disabled this operation"
+msgstr "Sinu süsteemiülem on selle toimingu keelanud"
+
+#: ../libpurple/protocols/novell/nmuser.c:1909
+msgid "The server is unavailable; try again later"
+msgstr "Server pole saadavalm, proovi hiljem uuesti"
+
+#: ../libpurple/protocols/novell/nmuser.c:1912
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Ühte kontakti pole samasse kataloogi võimalik kaks korda lisada"
+
+#: ../libpurple/protocols/novell/nmuser.c:1915
+msgid "Cannot add yourself"
+msgstr "Ennast pole võimalik lisada"
+
+#: ../libpurple/protocols/novell/nmuser.c:1918
+msgid "Master archive is misconfigured"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1922
+msgid "Incorrect screen name or password"
+msgstr "Vigane ekraaninimi või parool"
 
 #: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
@@ -6271,6 +6581,7 @@
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
+"Sinu konto keelati liiga suure hulga valede paroolide sisestamise tõttu"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -6301,6 +6612,8 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
+"See prooviversioon ei luba rohkem kui kümnel kasutajal samaaegselt sisse "
+"logida"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
@@ -6320,6 +6633,8 @@
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
+"Sõnumit pole võimalik saata. Kasutaja kohta pole võimalik üksikasju hankida "
+"(%s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
@@ -6346,7 +6661,7 @@
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
+msgstr "Sõnumit pole võimalik saata. Konverentsi pole võimalik luua (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
@@ -6354,6 +6669,8 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
+"Kasutajat %s pole võimalik serveripoolses nimekirjas kausta %s tõsta. Viga "
+"kausta loomisel (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
@@ -6361,6 +6678,8 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
+"Kasutajat %s pole võimalik sinu sõbranimekirja lisada. Serveripoolses "
+"nimekirjas tekkis kausta loomisel viga (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
@@ -6392,17 +6711,17 @@
 #: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
+msgstr "Serveripoolseid privaatsussätteid pole võimalik muuta (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr ""
+msgstr "Konverentsi pole võimalik luua (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
 #: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
-msgstr ""
+msgstr "Viga serveriga suhtlemisel. Ühendus suletakse."
 
 #: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
@@ -6417,7 +6736,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Kasutaja ID"
 
@@ -6459,7 +6778,7 @@
 
 #: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
-msgstr ""
+msgstr "Kutse vestlusele"
 
 #: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
@@ -6468,10 +6787,13 @@
 "\n"
 "Sent: %s"
 msgstr ""
+"Kutse saatja: %s\n"
+"\n"
+"Saadetud: %s"
 
 #: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
-msgstr ""
+msgstr "Kas sa soovid vestlusega ühineda?"
 
 #. we don't want to reconnect in this case
 #: ../libpurple/protocols/novell/novell.c:2012
@@ -6526,8 +6848,8 @@
 msgstr "Serveri port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6535,8 +6857,8 @@
 msgstr "Server sulges ühenduse."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6585,7 +6907,7 @@
 msgstr "ICQ protokolli plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kooditabel"
@@ -6626,7 +6948,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
-msgstr ""
+msgstr "Vigane SNAC"
 
 #: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
@@ -6678,7 +7000,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
-msgstr ""
+msgstr "Pole piisavalt õiguseid"
 
 #: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
@@ -6694,7 +7016,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
-msgstr ""
+msgstr "Kasutaja pole ajutiselt saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
@@ -6730,10 +7052,13 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Selle sõnumi vastuvõtmisel tekkis viga.  Selle võis põhjustada asjaolu, et "
+"sina oled valinud ühe kooditabeli ja %s teistsugust, või kasutab %s vigast "
+"klienti.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Sõbraikoon"
@@ -6755,7 +7080,7 @@
 msgstr "Vestlus"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:6011
 msgid "Get File"
 msgstr ""
 
@@ -6765,7 +7090,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
-msgstr ""
+msgstr "Lisad"
 
 #: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
@@ -6789,11 +7114,11 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
-msgstr ""
+msgstr "ICQ serveri relee"
 
 #: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
-msgstr ""
+msgstr "Vana ICQ UTF8"
 
 #: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
@@ -6828,17 +7153,17 @@
 msgstr "Kaamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5781
 msgid "Free For Chat"
 msgstr "Vestluseks vaba"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5816
 msgid "Not Available"
 msgstr "Pole saadaval"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5802
 msgid "Occupied"
 msgstr "Hõivatud"
 
@@ -6848,8 +7173,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Nähtamatu"
 
@@ -6858,13 +7183,13 @@
 msgstr "Ühendatud"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-aadress"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Hoiatuste tase"
 
@@ -6912,14 +7237,14 @@
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Vigane ekraaninimi."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Vale parool."
 
@@ -6972,8 +7297,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6167 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Olgu"
 
@@ -7013,7 +7338,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
-msgstr ""
+msgstr "Volituste küsimise sõnum:"
 
 #: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
@@ -7022,14 +7347,14 @@
 #: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:2290
 #: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr ""
 
 #: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
-msgstr ""
+msgstr "Volituste andmisest keeldumise sõnum:"
 
 #: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
@@ -7093,21 +7418,21 @@
 msgid "_Decline"
 msgstr "Lükka _tagasi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7116,21 +7441,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7138,154 +7463,154 @@
 msgstr[1] ""
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Sõnumit pole võimalik saata: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Tundmatu põhjus."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2809
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kasutajale %s pole võimalik sõnumit saata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Kasutajateave pole saadaval: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Võrgus alates"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profiil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "Sinu AIM-ühendus võib olla katkenud."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr ""
+msgstr "Ühendus jututoaga %s on katkestatud."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3739
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Isiklik veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Täiendavad andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Indeks"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Üksus"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Veebileht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Ekraaninimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7293,58 +7618,58 @@
 msgstr ""
 "Viga 0x%04x: Ekraaninime pole võimalik vormindada kuna see on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Viga 0x%04x: Tundmatu viga."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Kasutaja %s e-posti aadress on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Konto andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7355,11 +7680,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profiil on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7370,11 +7695,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Eemaloleku teade on liiga pikk."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4638
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7382,70 +7707,70 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4640
+#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5088
 msgid "Unable To Add"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4749
 msgid "Unable To Retrieve Buddy List"
-msgstr ""
+msgstr "Sõbranimekirja pole võimalik vastu võtta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4750
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5143
+#: ../libpurple/protocols/oscar/oscar.c:5148
 msgid "Orphans"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5071
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "(no name)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5085
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5179
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Authorization Given"
 msgstr ""
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5261
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5264
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7453,186 +7778,186 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5265
 msgid "Authorization Denied"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5341
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5410
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "Away Message"
 msgstr "Eemaloleku sõnum"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastuvõtmine)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5775
 msgid "iTunes Music Store Link"
 msgstr "iTunes muusikapoe viit"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Sõbrakommentaar %s kohta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Buddy Comment:"
 msgstr "Sõbrakommentaar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5931
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5935
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/oscar.c:5941
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "Ü_hendu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Get AIM Info"
 msgstr "Hangi AIM-andmed"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5982
 msgid "Edit Buddy Comment"
 msgstr "Redigeeri sõbrakommentaari"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5990
 msgid "Get Status Msg"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Direct IM"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Re-request Authorization"
-msgstr ""
+msgstr "Volituste uuestiküsimine"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Require authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6087
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "ICQ Privacy Options"
 msgstr "ICQ privaatsusvalikud"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "The new formatting is invalid."
 msgstr "Uus vormindus on vigane."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Change Address To:"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Find Buddy by E-Mail"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Search for a buddy by e-mail address"
 msgstr "Sõbra otsimine e-posti aadressi järgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Sisesta otsitava sõbra e-posti aadress."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6237
 msgid "_Search"
 msgstr "_Otsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Set User Info (URL)..."
 msgstr "Kasutajate andmete määramine (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6406
 msgid "Change Password (URL)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Set Privacy Options..."
 msgstr "Määra privaatsusvalikud..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6427
 msgid "Confirm Account"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Display Currently Registered E-Mail Address"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Change Currently Registered E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Search for Buddy by E-Mail Address..."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6453
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6524
 msgid "Show how long you have been idle"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6679
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8274,7 +8599,8 @@
 msgstr "Sind lisati %s poolt"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Kas sa soovid teda lisada?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8308,10 +8634,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s pole sinu sõbranimekirjas"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Kas sa soovid teda lisada?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Ühendus suletud (kirjutamine)"
@@ -8375,10 +8697,6 @@
 msgid "Starting Services"
 msgstr "Teenuste käivitamine"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Ühendatud"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8400,7 +8718,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Hostiga pole võimalik ühenduda"
 
@@ -8421,64 +8739,65 @@
 msgid "Place Closed"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Kõlarid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokaamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Failiülekanne"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Väline kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
+"Palun sisesta uue konverentsi teema ja kasutajale %s saadetava kutse sõnum"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Uus konverents"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Algata"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Saadaolevad konverentsid"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Uue konverentsi loomine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Kasutaja kutsumine konverentsile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8486,27 +8805,27 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Konverentsile kutsumine"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Konverentsile kutsumine..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4335
 msgid "Topic:"
 msgstr "Teema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8515,68 +8834,68 @@
 "Meanwhile kontole %s pole hostinime ega IP-aadressi määratud. Palun määra "
 "see ja jätka sisselogimist."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile ühenduse sätted"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime kogukonna serverit pole määratud"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Ühendu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tundmatu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Viimane teadaolev klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Kasutajanimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Vali kasutaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Kasutajat pole võimalik lisada: kasutajat ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kasutajat pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8585,63 +8904,63 @@
 "Viga faili %s lugemisel: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Serverisse salvestatud sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Sõbranimekirja salvestamise režiim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Ainult kohalik sõbranimekiri"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Nimekirja sünkroniseerimine serveriga"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Gruppi pole võimalik lisada: grupp on juba olemas"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Grupp '%s' on sinu sõbraloendis juba olemas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Gruppi pole võimalik lisada"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Võimalikud vastavused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8649,37 +8968,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Gruppi pole võimalik lisada: gruppi ei leitud"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Otsingutulemused '%s' jaoks"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8687,60 +9006,59 @@
 "buttons below."
 msgstr ""
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Otsingutulemused"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Vastavusi pole"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Kasutajaotsing"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Impordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Ekspordi Sametime nimekiri..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Kasutajaotsing..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Jõuga sisselogimine (serveri ümbersuunamisi eiratakse)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Kliendi identiteet on peidetud"
 
@@ -8756,7 +9074,7 @@
 #: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
-msgstr ""
+msgstr "Kasutaja %s pole võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:53
 #: ../libpurple/protocols/silc/buddy.c:110
@@ -8820,7 +9138,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:389
 #: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
-msgstr ""
+msgstr "Kaugkasutaja pole enam võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
@@ -8922,7 +9240,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
-msgstr ""
+msgstr "Kasutaja andmeid pole võimalik hankida"
 
 #: ../libpurple/protocols/silc/buddy.c:723
 #: ../libpurple/protocols/silc10/buddy.c:735
@@ -8941,13 +9259,13 @@
 #: ../libpurple/protocols/silc/buddy.c:1059
 #: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
-msgstr ""
+msgstr "Ava..."
 
 #: ../libpurple/protocols/silc/buddy.c:1070
 #: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr ""
+msgstr "Sõber %s pole võrgus"
 
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
@@ -8997,14 +9315,14 @@
 #: ../libpurple/protocols/silc10/buddy.c:1482
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
-msgstr ""
+msgstr "Ärata mind üles!"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:52
 #: ../libpurple/protocols/silc10/buddy.c:1484
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
-msgstr ""
+msgstr "Üliaktiivne"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
 #: ../libpurple/protocols/silc10/buddy.c:1486
@@ -9036,7 +9354,7 @@
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
-msgstr ""
+msgstr "Vihane"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:749
@@ -9045,7 +9363,7 @@
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
-msgstr ""
+msgstr "Armukade"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:751
@@ -9054,7 +9372,7 @@
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
-msgstr ""
+msgstr "Häbenev"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:753
@@ -9070,7 +9388,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1505
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
-msgstr ""
+msgstr "Armunud"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:757
@@ -9079,7 +9397,7 @@
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
-msgstr ""
+msgstr "Unine"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:759
@@ -9088,7 +9406,7 @@
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
-msgstr ""
+msgstr "Tüdinud"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:761
@@ -9097,7 +9415,7 @@
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
-msgstr ""
+msgstr "Põnevil"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:763
@@ -9106,7 +9424,7 @@
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
-msgstr ""
+msgstr "Rahutu"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1207
@@ -9120,21 +9438,21 @@
 #: ../libpurple/protocols/silc10/buddy.c:1557
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
-msgstr ""
+msgstr "Meeleolu"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
-msgstr ""
+msgstr "Eelistatud kontakt"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1229
 #: ../libpurple/protocols/silc10/buddy.c:1567
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
-msgstr ""
+msgstr "Eelistatud keel"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1234
@@ -9712,7 +10030,7 @@
 #: ../libpurple/protocols/silc/ops.c:1512
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
-msgstr ""
+msgstr "Avalikku võtit pole vastu võetud"
 
 #: ../libpurple/protocols/silc/ops.c:1524
 #: ../libpurple/protocols/silc/ops.c:1537
@@ -9934,7 +10252,7 @@
 msgstr "Sinu hetkemeeleolu"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Tavaline"
 
@@ -10101,7 +10419,7 @@
 #: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr ""
+msgstr "Kasutaja <I>%s</i> pole võrgus"
 
 #: ../libpurple/protocols/silc/silc.c:1357
 #: ../libpurple/protocols/silc10/silc.c:1286
@@ -10217,7 +10535,7 @@
 #: ../libpurple/protocols/silc/silc.c:1712
 #: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
+msgstr "whowas &lt;hüüdnimi&gt;:  Selle hüüdnimega kasutaja andmete vaatamine"
 
 #: ../libpurple/protocols/silc/silc.c:1716
 #: ../libpurple/protocols/silc10/silc.c:1645
@@ -10254,6 +10572,8 @@
 #: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
+"kick &lt;kanal&gt; &lt;hüüdnimi&gt; [kommentaar]:  Kasutaja kanalilt "
+"väljalöömine"
 
 #: ../libpurple/protocols/silc/silc.c:1740
 #: ../libpurple/protocols/silc10/silc.c:1669
@@ -10313,7 +10633,7 @@
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2033
 msgid "Network"
 msgstr "Võrk"
 
@@ -10786,8 +11106,8 @@
 msgid "Password Change Successful"
 msgstr "Paroolimuutmine õnnestus"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Grupp:"
 
@@ -10847,41 +11167,46 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! süsteemne sõnum %s jaoks:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
-msgstr ""
+msgstr "Volituste andmisest keeldumise sõnum:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10889,178 +11214,190 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Ühendumisprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Pole kodus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Pole töölaua taga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Pole kontoris"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Puhkusel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Pole serveri loendis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Ühine vestlusega"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Algata konverents"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Milline ID aktiveerida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join who in chat?"
 msgstr "Kellega ühineda jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktiveeri ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Ühine kasutajaga vestluses..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kasutajaga Doodle seansi algatamine"
 
@@ -11074,88 +11411,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Jaapani Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Failiülekande server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Jaapani failiülekandeserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Failiülekande port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Jututoa lokaat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Jututubade nimekirja URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo jututoaserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo jututoaport"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
+"%s lükkas sinu konverentsikutse tuppa \"%s\" tagasi, esitades järgneva "
+"põhjenduse: \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr ""
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Tundmatu tuba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Võibolla on tuba täis"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Pole saadaval"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11163,38 +11502,38 @@
 "Tundmatu viga. Võib-olla pead sa välja logima ja enne jututoaga "
 "taasliitumist 5 minutit ootama"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sa vestled nüüd jututoas %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Tõrge sõbraga jututoas ühinemisel"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Võibolla pole nad jututoas?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Tõrge jututubade nimekirja hankimisel."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
-msgstr ""
+msgstr "Tubade nimekirja pole võimalik hankida."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr ""
 
@@ -11317,6 +11656,8 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
+"(Sõnumi teisendamisel tekkis viga.\t Kontrolli kontoredaktorist "
+"'Kooditabeli' valikut.)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -11536,21 +11877,35 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nüüd nimega %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Tähelepanu! %s %s."
+
+#: ../libpurple/server.c:295 ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Tähelepanu!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr ""
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s kutsub kasutaja %s jututuppa %s:\n"
+"%s kutsub kasutajat %s jututuppa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s kutsub kasutaja %s jututuppa %s\n"
+msgstr "%s kutsub kasutajat %s jututuppa %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Kas nõustume jututoa kutsega?"
 
@@ -11558,7 +11913,7 @@
 msgid "Unset"
 msgstr ""
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Mitte segada"
 
@@ -11610,96 +11965,96 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Viga %s lugemisel"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Arvutamine..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Tundmatu."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekundit"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päev"
 msgstr[1] "%d päeva"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tund"
 msgstr[1] "%s, %d tundi"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tund"
 msgstr[1] "%d tundi"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minutit"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutit"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr ""
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3727
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Hostiga %s pole võimalik ühenduda: %s"
@@ -11725,37 +12080,37 @@
 msgstr "Salve suund"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Sisselogimise valikud"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "_Kohalik alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "_Parooli peetakse meeles"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Kasutaja valikud"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Teavitused e-posti _uute sõnumite kohta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Selle konto jaoks kasutatakse seda sõbra_ikooni:"
 
@@ -11789,7 +12144,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Kasutatakse keskkonnast tulenevaid sätteid"
 
@@ -11811,15 +12166,15 @@
 msgid "Proxy Options"
 msgstr "Proksi valikud"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Proksi liik:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -11827,31 +12182,43 @@
 msgid "_Username:"
 msgstr "_Kasutajanimi:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Parool:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Uut kontot pole võimalik salvestada"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Selliste parameetritega konto on juba olemas."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Konto lisamine"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Põhiline"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "Laien_datud"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11865,229 +12232,241 @@
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Vestlusega ühinemine"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Palun sisesta teave jututoa kohta, millega soovid ühineda.\n"
+msgstr "Palun sisesta teave vestluse kohta, millega soovid ühineda.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Eemalda _blokeering"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Hangi a_ndmed"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "Vä_lksõnum"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Saada fail"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Lisa sõbra_märguanne"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Eemalda"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Lisa _sõber"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Lisa _jututuba"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Kustuta grupp"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "Muuda _nime"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "Ü_hine"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automaatühinemine"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Ahen_da"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "Laien_da"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Vahendid/Vaigista helid"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4815
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Sõbrad"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Sõbrad/Uus _välksõnum..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Sõbrad/Ühine _jututoaga..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Sõbrad/Hangi kasutaja _andmed"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Sõbrad/Vaata kasutaja _logi..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Sõbrad/Näita _ühendamata sõpru"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Sõbrad/Näita _tühje gruppe"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Sõbrad/Näita sõbra ü_ksikasju"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Sõbrad/Näita jõ_udeoleku aegu"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Sõbrad/Näita"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Sõbrad/Näita/Ü_hendamata sõpru"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Sõbrad/Näita/_Tühje gruppe"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Sõbrad/Näita/_Sõbra üksikasju"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Sõbrad/Näita/_Jõudeoleku aegu"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Sõbrad/Näita/_Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Sõbrad/Sõp_rade sortimine"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Sõbrad/Lisa _sõber..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Sõbrad/Lisa ju_tutuba..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Sõbrad/Lisa _grupp..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Sõbrad/_Lõpeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Kontod"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontod/Lisa või muuda"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Vahendid"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Vahendid/Sõbra_märguanded"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Vahendid/_Sertifikaadid"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Vahendid/Plu_ginad"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Vahendid/_Eelistused"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Vahendid/_Privaatsus"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Vahendid/_Failiülekanded"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Vahendid/_Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Vahendid/Süsteemne _logi"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Vahendid/_Vaigista helid"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Abi/_Online abi"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Abi/_Silumisaken"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Abi/Gaim'ist _lähemalt"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12096,132 +12475,132 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Sõbra alias"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Sisse logitud"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Viimati nähtud"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jõude %dp %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jõude %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Jõude %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Sõbrad/Uus välksõnum..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Sõbrad/Ühine vestlusega..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Sõbrad/Hangi kasutaja andmed..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Sõbrad/Lisa sõber..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Sõbrad/Lisa vestlus..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Sõbrad/Lisa grupp..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Vahendid/Privaatsus"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Vahendid/Tubade nimekiri"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lugemata sõnum %s-lt\n"
 msgstr[1] "%d lugemata sõnumit %s-lt\n"
 
-#: ../pidgin/gtkblist.c:3805
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Tähestikuliselt"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Oleku järgi"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Logi suuruse järgi"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s katkestas ühenduse"
 
-#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Konto taaslubamine"
 
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s väljus võrgust: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Kasutajanimi:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Parool</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Logi sisse"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Kontod"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12234,23 +12613,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4566
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Sõbrad/Näita ühendamata sõpru"
-
-#: ../pidgin/gtkblist.c:4569
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Sõbrad/Näita tühje gruppe"
-
-#: ../pidgin/gtkblist.c:4575
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Sõbrad/Näita sõbra üksikasju"
-
-#: ../pidgin/gtkblist.c:4578
-msgid "/Buddies/Show Idle Times"
-msgstr "/Sõbrad/Näita jõudeaegu"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Sõbrad/Näita/Ühendamata sõpru"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Sõbrad/Näita/Tühje gruppe"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Sõbrad/Näita/Sõbra üksikasju"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Sõbrad/Näita/Jõudeaegu"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Sõbrad/Näita/Protokollide ikoone"
 
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12261,25 +12644,25 @@
 "kuvatakse hüüdnime ekraaninime asemel.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Ekraaninimi:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "See protokoll ei toeta jututubasid"
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12287,39 +12670,39 @@
 "Palun sisesta alias ja vestluse kohta käivad andmed lisatakse sinu "
 "sõbraloenisse.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Palun sisesta lisatava grupi nimi."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Redigeeri kontot"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3053
 msgid "No actions available"
 msgstr "Toiminguid pole"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Keela"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Luba konto"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Vahendid"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Sõbrad/Sordi sõbrad"
 
@@ -12331,26 +12714,30 @@
 "%s will not attempt to reconnect the account until you correct the error and "
 "re-enable the account."
 msgstr ""
+"%s\n"
+"\n"
+"%s ei proovi kontot automaatselt ühendada enne, kui sa pole viga kõrvaldanud "
+"ja kontot uuesti kasutusele võtnud."
 
-#: ../pidgin/gtkconv.c:488
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Tundmatu käsk."
 
-#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Sõbra kutsumine jututuppa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:863
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12358,201 +12745,192 @@
 "Palun sisesta selle kasutaja nimi, keda sa soovid jututuppa kutsuda. Kui "
 "sisestad ka sõnumi, siis saadetakse see sõbrale koos kutsumisteatega."
 
-#: ../pidgin/gtkconv.c:884
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Sõber:"
 
-#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "Sõ_num:"
 
-#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:935 ../pidgin/gtkconv.c:2576 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Faili pole võimalik avada."
 
-#: ../pidgin/gtkconv.c:967
+#: ../pidgin/gtkconv.c:941
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Vestlused kasutajaga %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1003
+#: ../pidgin/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Vestluse salvestamine"
 
-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1126 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Otsing"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "O_tsida stringi:"
 
-#: ../pidgin/gtkconv.c:1361
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Logimine käivitatud. Alatest käesolevast hetkest logitakse selle vestluse "
-"kõik sõnumid."
-
-#: ../pidgin/gtkconv.c:1369
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Logimine lõpetatud. Alatest käesolevast hetkest selle vestluse sõnumeid enam "
-"ei logita."
-
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1602
 msgid "Un-Ignore"
 msgstr "Ära eira"
 
-#: ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkconv.c:1605
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../pidgin/gtkconv.c:1640
+#: ../pidgin/gtkconv.c:1625
 msgid "Get Away Message"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:1663
+#: ../pidgin/gtkconv.c:1648
 msgid "Last said"
 msgstr "Viimati ütles"
 
-#: ../pidgin/gtkconv.c:2530
+#: ../pidgin/gtkconv.c:2584
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2581
+#: ../pidgin/gtkconv.c:2635
 msgid "Save Icon"
 msgstr "Ikooni salvestamine"
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2687
 msgid "Animate"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:2638
+#: ../pidgin/gtkconv.c:2692
 msgid "Hide Icon"
 msgstr "Peida ikoon"
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2695
 msgid "Save Icon As..."
 msgstr "Salvesta ikoon kui..."
 
-#: ../pidgin/gtkconv.c:2645
+#: ../pidgin/gtkconv.c:2699
 msgid "Set Custom Icon..."
 msgstr "Määra kohandatud ikoon..."
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2712
 msgid "Remove Custom Icon"
+msgstr "Eemalda kohandatud ikoon"
+
+#: ../pidgin/gtkconv.c:2839
+msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2858
 msgid "/_Conversation"
 msgstr "/_Vestlus"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2860
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Vestlus/Uus _välksõnum..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/_Find..."
 msgstr "/Vestlus/_Otsi..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2867
 msgid "/Conversation/View _Log"
 msgstr "/Vestlus/Vaata _logi"
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Save As..."
 msgstr "/Vestlus/Salvesta _kui..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Vestlus/_Puhasta tagasikerimine"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/Se_nd File..."
 msgstr "/Vestlus/Saada _fail..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Vestlus/Lisa sõbra_märguanne..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2877
 msgid "/Conversation/_Get Info"
 msgstr "/Vestlus/_Hangi teavet"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/In_vite..."
 msgstr "/Vestlus/_Kutsu..."
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2881
 msgid "/Conversation/M_ore"
 msgstr "/Vestlus/_Veel"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2885
 msgid "/Conversation/Al_ias..."
 msgstr "/Vestlus/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Block..."
 msgstr "/Vestlus/_Bloki..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/_Unblock..."
 msgstr "/Vestlus/_Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2891
 msgid "/Conversation/_Add..."
 msgstr "/Vestlus/_Lisa..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2893
 msgid "/Conversation/_Remove..."
 msgstr "/Vestlus/_Eemalda"
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Vestlus/Lisa _viit..."
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2900
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Vestlus/Lisa _pilt..."
 
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2906
+msgid "/Conversation/_Hide"
+msgstr "/Vestlus/_Peida"
+
+#: ../pidgin/gtkconv.c:2908
 msgid "/Conversation/_Close"
 msgstr "/Vestlus/_Sulge"
 
 #. Options
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2912
 msgid "/_Options"
 msgstr "/V_alikud"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2913
 msgid "/Options/Enable _Logging"
 msgstr "/Valikud/Luba _logimine"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2914
 msgid "/Options/Enable _Sounds"
 msgstr "/Valikud/Luba _helid"
 
-#: ../pidgin/gtkconv.c:2855
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Valikud/Näita sõbra _ikooni"
-
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valikud/Näita _vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:2858
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valikud/Näita _ajatempleid"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/More"
 msgstr "/Vestlus/Veel"
 
-#: ../pidgin/gtkconv.c:3059
+#: ../pidgin/gtkconv.c:3097
 msgid "/Options"
 msgstr "/Valikud"
 
@@ -12561,176 +12939,172 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3132 ../pidgin/gtkconv.c:3164
 msgid "/Conversation"
 msgstr "/Vestlus"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/View Log"
 msgstr "/Vestlus/Vaata logi"
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Send File..."
 msgstr "/Vestlus/Saada fail..."
 
-#: ../pidgin/gtkconv.c:3144
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Vestlus/Lisa sõbramärguanne..."
 
-#: ../pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/Vestlus/Hangi andmed"
 
-#: ../pidgin/gtkconv.c:3154
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/Invite..."
 msgstr "/Vestlus/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Alias..."
 msgstr "/Vestlus/Alias..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Block..."
 msgstr "/Vestlus/Bloki..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3206
 msgid "/Conversation/Unblock..."
 msgstr "/Vestlus/Eemalda blokeering..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/Vestlus/Lisa..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/Vestlus/Eemalda..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/Vestlus/Lisa viit..."
 
-#: ../pidgin/gtkconv.c:3186
+#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/Vestlus/Lisa pilt..."
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/Valikud/Luba logimine"
 
-#: ../pidgin/gtkconv.c:3195
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/Valikud/Luba helid"
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3246
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valikud/Näita vormindamise tööriistu"
 
-#: ../pidgin/gtkconv.c:3211
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Timestamps"
 msgstr "/Valikud/Näita ajatempleid"
 
-#: ../pidgin/gtkconv.c:3214
-msgid "/Options/Show Buddy Icon"
-msgstr "/Valikud/Näita sõbraikooni"
-
-#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
+#: ../pidgin/gtkconv.c:3326 ../pidgin/gtkconv.c:3368
 msgid "User is typing..."
 msgstr "Kasutaja tipib..."
 
-#: ../pidgin/gtkconv.c:3343
+#: ../pidgin/gtkconv.c:3371
 msgid "User has typed something and stopped"
 msgstr "Kasutaja tippis midagi ja siis jättis selle pooleli"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7817
+#: ../pidgin/gtkconv.c:3554 ../pidgin/gtkconv.c:7989
 msgid "_Send To"
 msgstr "Kellele _saata"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4267
 msgid "_Send"
 msgstr "_Saada"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4371
 msgid "0 people in room"
 msgstr "0 isikut toas"
 
-#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
+#: ../pidgin/gtkconv.c:5731 ../pidgin/gtkconv.c:5852
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "toas on %d isik"
 msgstr[1] "toas on %d isikut"
 
-#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6453 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6457
 msgid "Stopped Typing"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6460
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6463 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lugemata sõnumid"
 
-#: ../pidgin/gtkconv.c:6354
+#: ../pidgin/gtkconv.c:6466
 msgid "New Event"
 msgstr "Uus sündmus"
 
-#: ../pidgin/gtkconv.c:7358
+#: ../pidgin/gtkconv.c:7539
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Vestluse kogu tagasikerimispuhvri puhastamine."
 
-#: ../pidgin/gtkconv.c:7522
+#: ../pidgin/gtkconv.c:7703
 msgid "Confirm close"
 msgstr "Sulgemiskinnitus"
 
-#: ../pidgin/gtkconv.c:7554
+#: ../pidgin/gtkconv.c:7735
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Sul on lugemata sõnumeid. Oled kindel, et soovid akent sulgeda?"
 
-#: ../pidgin/gtkconv.c:8144
+#: ../pidgin/gtkconv.c:8322
 msgid "Close other tabs"
 msgstr "Sulge teised kaardid"
 
-#: ../pidgin/gtkconv.c:8150
+#: ../pidgin/gtkconv.c:8328
 msgid "Close all tabs"
 msgstr "Sulge kõik kaardid"
 
-#: ../pidgin/gtkconv.c:8158
+#: ../pidgin/gtkconv.c:8336
 msgid "Detach this tab"
 msgstr "Haagi see kaart lahti"
 
-#: ../pidgin/gtkconv.c:8164
+#: ../pidgin/gtkconv.c:8342
 msgid "Close this tab"
 msgstr "Sulge see kaart"
 
-#: ../pidgin/gtkconv.c:8650
+#: ../pidgin/gtkconv.c:8842
 msgid "Close conversation"
 msgstr "Vestluse sulgemine"
 
-#: ../pidgin/gtkconv.c:9250
+#: ../pidgin/gtkconv.c:9441
 msgid "Last created window"
 msgstr "Viimati loodud aknasse"
 
-#: ../pidgin/gtkconv.c:9252
+#: ../pidgin/gtkconv.c:9443
 msgid "Separate IM and Chat windows"
 msgstr "Välksõnumid ja jututoad eraldi akendesse"
 
-#: ../pidgin/gtkconv.c:9254 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9445 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Uude aknasse"
 
-#: ../pidgin/gtkconv.c:9256
+#: ../pidgin/gtkconv.c:9447
 msgid "By group"
 msgstr "Grupi kaupa"
 
-#: ../pidgin/gtkconv.c:9258
+#: ../pidgin/gtkconv.c:9449
 msgid "By account"
 msgstr "Konto kaupa"
 
@@ -12794,7 +13168,7 @@
 msgid "Fatal Error"
 msgstr "Saatuslik viga"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "juhtiv arendaja"
 
@@ -12805,8 +13179,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "arendaja"
 
@@ -12816,428 +13190,435 @@
 
 #: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
+msgstr "kasutajatugi/kvaliteedikontroll"
+
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "arendaja ja veebimeister"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "hooldaja"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaimi hooldaja"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "arendaja ja veebimeister"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP arendaja"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
-msgstr "algupärane autor"
+msgstr "algse versiooni autor"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Aafrika"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Araabia"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgaaria"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengaali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Kataloonia"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valentsia kataloonia"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tšehhi"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Taani"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Saksa"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Austraalia inglise"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanada inglise"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Briti inglise"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Eesti"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Pärsia"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galiitsia"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujarati keelemeeskond"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Heebrea"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indoneesia"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Jaapani"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Gruusia"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada tõlkemeeskond"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Korea"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdi"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Leedu"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norra (bokmål)"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepaali"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Hollandi, Flaami"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norra"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norra (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Poola"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugali-Brasiilia"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumeenia"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Vene"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovaki"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albaania"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbia"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamili"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Tai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Türgi"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ja Gnome-Vi meeskond"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Hiina lihtsustatud"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongi hiina"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Hiina traditsiooniline"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amhari"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "%s - lähem teave"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s on graafiline ja modulaarne sõnumivahetuse klient. Programm põhineb "
 "libpurple teegil, mis on suuteline ühenduma protokollide AIM, MSN, Yahoo!, "
 "XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu ja QQ abil, võimalik on ühenduda rööbiti mitme protokolli "
-"kaudu.  Kasutajaliidese jaoks on kasutatud GTK+ teeki.<BR><BR>Te võite seda "
-"programmi edasi levitada ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi "
-"(vastavalt teie valikule ka versioon 2 või uuem versioon) tingimustele. GNU "
-"Üldise Avaliku Litsenti koopia asub failis 'COPYING', mis peaks olema %s "
-"pakiga kaasas.  Programmi %s autoriõigused kuuluvad programmi autoritele. "
-"Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil pole mitte "
-"mingisugust garantiid.<BR><BR>"
+"Zephyr, MySpaceIM, Gadu-Gadu ja QQ abil, võimalik on ühenduda rööbiti mitme "
+"protokolli kaudu.  Kasutajaliidese jaoks on kasutatud GTK+ teeki.<BR><BR>Te "
+"võite seda programmi edasi levitada ja/või muuta vastavalt GNU Üldise "
+"Avaliku Litsentsi (vastavalt teie valikule ka versioon 2 või uuem versioon) "
+"tingimustele. GNU Üldise Avaliku Litsenti koopia asub failis 'COPYING', mis "
+"peaks olema %s pakiga kaasas.  Programmi %s autoriõigused kuuluvad programmi "
+"autoritele. Autorite täielik nimekiri asub failis 'COPYRIGHT'. Programmil "
+"pole mitte mingisugust garantiid.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:399
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin serveris irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:404
 msgid "Current Developers"
 msgstr "Praegused arendajad"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:419
 msgid "Crazy Patch Writers"
 msgstr "Hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:434
 msgid "Retired Developers"
 msgstr "Endised arendajad"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Crazy Patch Writers"
 msgstr "Endised hullunud parandustekirjutajad"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:464
 msgid "Artists"
 msgstr "Kunstnikud"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:479
 msgid "Current Translators"
 msgstr "Praegused tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:499
 msgid "Past Translators"
 msgstr "Eelmised tõlkijad"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:517
 msgid "Debugging Information"
 msgstr "Silumisandmed"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:887
 msgid "Get User Info"
 msgstr "Kasutaja andmete hankimine"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:889
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Palun sisesta isiku ekraaninimi või alias, kelle andmeid sa soovid vaadata."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "View User Log"
 msgstr "Kasutaja logi vaatamine"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:981
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Palun sisesta isiku ekraaninimi või alias, kelle logi sa soovid vaadata."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1001
 msgid "Alias Contact"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 msgid "Enter an alias for this contact."
 msgstr "Sisesta sellele kontaktile alias."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1024
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Sisesta kasutajale %s alias."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Alias Buddy"
 msgstr "Sõbrale aliase määramine"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1047
 msgid "Alias Chat"
 msgstr "Vestluse alias"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1048
 msgid "Enter an alias for this chat."
 msgstr "Aliase lisamine vestlusele."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1087
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13248,30 +13629,30 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1095
 msgid "Remove Contact"
 msgstr "Kontakti eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1098
 msgid "_Remove Contact"
 msgstr "_Eemalda kontakt"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1129
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1136
 msgid "Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1139
 msgid "_Merge Groups"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1189
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13280,15 +13661,15 @@
 "Sa oled eemaldamas gruppi %s ja kõiki selle liikmeid oma sõbranimekirjast. "
 "Kas sa soovid seda teha?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1192
 msgid "Remove Group"
 msgstr "Grupi eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1195
 msgid "_Remove Group"
 msgstr "_Eemalda grupp"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1228
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -13296,15 +13677,15 @@
 "Sa oled eemaldamas kasutajat %s oma sõbranimekirjast. Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1231
 msgid "Remove Buddy"
 msgstr "Sõbra eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1234
 msgid "_Remove Buddy"
 msgstr "_Eemalda sõber"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1255
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13313,11 +13694,11 @@
 "Sa oled eemaldamas jututuba %s oma sõbranimekirjast.  Kas sa soovid seda "
 "teha?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1258
 msgid "Remove Chat"
 msgstr "Vestluse eemaldamine"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1261
 msgid "_Remove Chat"
 msgstr "_Eemalda vestlus"
 
@@ -13426,7 +13807,7 @@
 msgstr "Failiülekande ü_ksikasjad"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "Pa_us"
 
@@ -13439,7 +13820,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Aseta _lihttekstina"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Puhasta vormindus"
 
@@ -13515,118 +13896,182 @@
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Kirjatüübi valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Teksti värvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Taustavärvuse valimine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Kirjeldus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 "Palun sisesta lisatava viida URL ja kirjeldus. Kirjeldus ei ole kohustuslik."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Palun sisesta URL, mida soovid lisada."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Viida lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "L_isa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Tõrge pildi salvestamisel: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Pildi lisamine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Selles teemas pole tujunägusid"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Tujunäod"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "Kir_jatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Rasvane"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Allajoonitud"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Läbijoonitud"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Kirjatüübi suuruse suurendamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Kirjatüübi suuruse vähendamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Kirjatüüp"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Taustavärvus"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Teksti värvus"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Vorminduse algväärtustamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Välksõnumipildi lisamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Tujunäo lisamine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Rasvane</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Allajoonitud</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Läbijoonitud</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_uurem</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Tavaline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Väiksem</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Ki_rjatüüp"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Teksti värvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Tau_stavärvus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Tujunägu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Pilt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Viit"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr ""
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -13772,44 +14217,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Ava kõik sõnumid"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s sai %d uue sõnumi."
 msgstr[1] "%s sai %d uut sõnumit."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sulle on %d uus e-sõnum.</b>"
 msgstr[1] "<b>Sulle on %d uut e-sõnumit.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr ""
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "URL-i pole võimalik avada"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Viga \"%s\" käivitamisel: %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13834,7 +14279,7 @@
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 "%s%s<span weight=\"bold\">Autor:</span>\t%s\n"
-"<span weight=\"bold\">Veebikoht:</span>\t\t%s\n"
+"<span weight=\"bold\">Veebisait:</span>\t\t%s\n"
 "<span weight=\"bold\">Failinimi:</span>\t\t%s"
 
 #: ../pidgin/gtkplugin.c:409
@@ -13861,100 +14306,100 @@
 msgstr "Faili valimine"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Kellest märku antakse"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "Sõbra _nimi:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Lo_gib sisse"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Logib _välja"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "_Eemaldub"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "Pöörd_ub eemalolekust tagasi"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Jääb _jõude"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Naaseb jõude_olekust"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Alustab ti_ppimist"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "Peab t_ippimisel pausi"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Lõpetab _tippimise"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Saada_b sõnumi"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "_Avatakse välksõnumi aken"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Kuvatakse teavituse _hüpikakent"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Saa_detakse sõnum"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "_Käivitatakse käsk"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Mängitakse _heli"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Sirvi..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Eelvaade"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "_Märguanne ainult juhul, kui minu olekuks on \"pole saadaval\""
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Korduv"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Kelle kohta"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Vaikimisi"
 
@@ -13998,7 +14443,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1941
 msgid "When away"
 msgstr "Kui olen eemal"
 
@@ -14095,11 +14540,11 @@
 msgid "Conversation _font:"
 msgstr "Vestluse kir_jatüüp:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Vaikimisi vormindus"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14107,119 +14552,119 @@
 "Nii paistab sinu väljuv sõnum juhul, kui sa kasutad vormindamist toetavat "
 "protokolli."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Avalik _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Pordid"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Kuulatavate portide vahemik määratakse käsitsi"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "Al_gusport:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Lõpuport:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proksi server"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Proksi puudub"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "Kasuta_ja:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME vaikimisi"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Käsitsi"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Veebisirvija valimine"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "Si_rvija:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Viidad avatakse:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Veebisirvija vaikimisi sätted"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Olemasolevasse aknasse"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Uuele kaardile"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14228,63 +14673,63 @@
 "_Käsitsi:\n"
 "(%s URL-i jaoks)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Logi_vorming:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Kõiki välksõnumeid _logitakse"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Kõiki _vestlusi logitakse"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Kõiki _olekumuutusi logitakse süsteemsesse logisse"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Heli valimine"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Vaikseim"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Vaiksem"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Vaikne"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Valju"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Valjem"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Kõige valjem"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "_Method:"
 msgstr "_Meetod"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1712
 msgid "Console beep"
 msgstr "Konsoolipiiks"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1719
 msgid "No sounds"
 msgstr "Helid puuduvad"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1727
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14293,81 +14738,81 @@
 "Helitegemise _käsk:\n"
 "(%s failinime jaoks)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Sounds when conversation has _focus"
 msgstr "_Heli fokuseeritud vestluse korral"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1756
 msgid "Enable sounds:"
 msgstr "Helid lubatakse:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1767
 msgid "Volume:"
 msgstr "Valjus:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1847
 msgid "Play"
 msgstr "Mängida"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1924
 msgid "_Report idle time:"
 msgstr "_Jõudeoleku ajast teatatakse:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Based on keyboard or mouse use"
 msgstr "Tulenevalt klaviatuuri ja hiire kasutamisest"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1938
 msgid "_Auto-reply:"
 msgstr "_Automaatne vastamine:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1942
 msgid "When both away and idle"
 msgstr "Kui olen eemal ja jõude"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Auto-away"
 msgstr "Automaatne eemaldumine"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1950
 msgid "Change status when _idle"
 msgstr "Jõudeoleku puhul määratakse uus _olek"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1954
 msgid "_Minutes before becoming idle:"
 msgstr "Mitme _minuti möödudes jõudeolek määratakse:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1962
 msgid "Change _status to:"
 msgstr "Uueks o_lekuks saab:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Status at Startup"
 msgstr "Olek käivitamisel"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1985
 msgid "Use status from last _exit at startup"
 msgstr "Kä_ivitamisel kasutatakse viimast olekut"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1991
 msgid "Status to a_pply at startup:"
 msgstr "Käivitamisel _rakendatav olek:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Interface"
 msgstr "Liides"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Smiley Themes"
 msgstr "Tujunägude teemad"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2038
 msgid "Browser"
 msgstr "Veebisirvija"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2042
 msgid "Status / Idle"
 msgstr "Olek / jõude"
 
@@ -14457,23 +14902,23 @@
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "See fail on juba olemas"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Uue nime valimine"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Kataloogi valimine..."
 
@@ -14513,7 +14958,7 @@
 msgid "_Title:"
 msgstr "_Pealkiri:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Olek:"
 
@@ -14527,7 +14972,7 @@
 msgid "Sa_ve & Use"
 msgstr "Sal_vesta ja kasuta"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr ""
@@ -14540,61 +14985,61 @@
 msgid "Google Talk"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Tõrge pildi laadimisel"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kausta %s pole võimalik saata."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
-msgstr ""
+msgstr "Määra sõbraikooniks"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
-msgstr ""
+msgstr "Saada pildifail"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
-msgstr ""
+msgstr "Lisa sõnumisse"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr ""
+msgstr "Kas sa soovid seda pilti määrata selle kasutaja sõbraikooniks?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14605,17 +15050,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14626,25 +15071,25 @@
 "<b>Faili suurus:</b> %s\n"
 "<b>Pildi suurus:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikooni viga"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Ikooni pole võimalik määrata"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Tõrge faili '%s' avamisel: %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14659,31 +15104,31 @@
 msgid "Select color"
 msgstr "Värvuse valimine"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "_Sulge kaardid"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Hangi _teavet"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Muuda"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Ava sõnum"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin'i tujunäod"
 
@@ -14851,18 +15296,6 @@
 msgid "Select Color for %s"
 msgstr "Värvuse valimine %s jaoks"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Rasvane"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiiv"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Allajoonitud"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Sissetulevat vormingut eiratakse"
@@ -15025,7 +15458,7 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
-msgstr ""
+msgstr "Selle sõbra e-posti aadressi ei leitud."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
@@ -15167,11 +15600,11 @@
 msgid "Draw Markerline in "
 msgstr "Markerjoon joonistatakse "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Välksõnumiakendele"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Jututoaakendele"
 
@@ -15185,32 +15618,32 @@
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
-msgstr ""
+msgstr "Musikaline sõnumivahetus"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Käsu käivitamisel tekkis vastuolu:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Viga redaktori käivitamisel"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
-msgstr ""
+msgstr "Leidis aset järgmine viga:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
-msgstr ""
+msgstr "Musikalise sõnumivahetuse sätted"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Rakenda"
 
@@ -15222,86 +15655,86 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "Muusikalise sõnumivahetuse plugin ühise komponeerimise tarbeks."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Teavitused kehtivad"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "_Ainult juhul, kui keegi ütleb Sinu ekraaninime"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fookuses olevatele akendele"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Teavitamisviisid"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Aknatiitli ette _lisatakse string:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aknatiitlisse lisatakse uute sõnumite _arv"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "_X-i omadusele lisatakse uute sõnumite arv"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aknahalduri \"_URGENT\" vihje"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_Vestlusaken tõstetakse esile"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Teavituste eemaldamine"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eemaldatakse vestlusakena sa_ttumisel fookusesse"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eemaldatakse vestlusaknale _klõpsamisel"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eemaldatakse vestlusaknasse _tippimisel"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eemaldatakse sõ_numi edukal saatmisel"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr ""
 
@@ -15311,7 +15744,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Sõnumitest teavitaja"
 
@@ -15319,7 +15752,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Mitut sorti võimalusi lugemata sõnumitest teavitamiseks"
 
@@ -15685,43 +16118,43 @@
 "sõnumite ajatemplite vorminguid."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Läbipaistmatus:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Välksõnumite aknad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_Välksõnumiaknad on läbipaistvad"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "_Liuguri näitamine välksõnumiakendes"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "Välksõnumi akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Alati pealmine"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Sõbranimekirja aken"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "Sõbraaken on _läbipaistev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Sõbranimekirja akna läbipaistvuse eemaldamine selle fokuseerimisel"
 
@@ -15731,19 +16164,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Muutuv läbipaistvus sõbranimekirjale ja vestlustele."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15847,7 +16280,34 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Valikud/Näita sõbra _ikooni"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Valikud/Näita sõbraikooni"
+
+#~ msgid "Connection Failed"
+#~ msgstr "Tõrge ühendumisel"
+
+#~ msgid "SSL Handshake Failed"
+#~ msgstr "Tõrge SSL käepigistusel"
+
+#~ msgid "Song"
+#~ msgstr "Laul"
+
+#~ msgid "Total Friends"
+#~ msgstr "Sõpru kokku"
+
+#~ msgid "Client Version"
+#~ msgstr "Kliendi versioon"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Kas sa soovid teda lisada?"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norra"
 
 #~ msgid "Modify My Information"
 #~ msgstr "Minu andmete muutmine"
@@ -15877,24 +16337,15 @@
 #~ "%s katkestas ühenduse järgneva vea tõttu:\n"
 #~ "%s"
 
-#~ msgid "Larger font size"
-#~ msgstr "Suurem kirjatüübi suurus"
-
 #~ msgid "Smaller font size"
 #~ msgstr "Väiksem kirjatüübi suurus"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Vorminduse algväärtustamine"
-
 #~ msgid "Insert link"
 #~ msgstr "Viida lisamine"
 
 #~ msgid "Insert image"
 #~ msgstr "Pildi lisamine"
 
-#~ msgid "Insert smiley"
-#~ msgstr "Tujunäo lisamine"
-
 #~ msgid "Gaim %s. Try `%s -h' for more information.\n"
 #~ msgstr ""
 #~ "Gaim %s. Lähema teabe saamiseks kasuta `%s -h' for more information.\n"
@@ -16023,9 +16474,6 @@
 #~ msgid "Faces"
 #~ msgstr "Näod"
 
-#~ msgid "Change My Face"
-#~ msgstr "Minu näo muutmine"
-
 #~ msgid "User info is not updated"
 #~ msgstr "Kasutaja andmeid ei uuendatud"
 
@@ -16042,24 +16490,6 @@
 #~ "\n"
 #~ "<b>Toetab:</b> %s"
 
-#~ msgid "<b>User ID:</b> %s<br>"
-#~ msgstr "<b>Kasutaja ID:</b> %s<br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Täisnimi:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Toetatud:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Seisund:</b> %s"
-
-#~ msgid "Invalid username."
-#~ msgstr "Vigane kasutajanimi."
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Tõrge tavalisel autentimisel!"
-
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
diff -ru pidgin-2.1.1/po/eu.po pidgin-2.2.0/po/eu.po
--- pidgin-2.1.1/po/eu.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/eu.po	2007-09-14 00:45:42.000000000 -0400
@@ -12276,7 +12276,7 @@
 msgstr "Zein ID aktibatu?"
 
 #: ../src/protocols/yahoo/yahoo.c:3070
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Norekin elkartu nahi duzu berriketan?"
 
 #: ../src/protocols/yahoo/yahoo.c:3080
diff -ru pidgin-2.1.1/po/fa.po pidgin-2.2.0/po/fa.po
--- pidgin-2.1.1/po/fa.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/fa.po	2007-09-14 00:45:43.000000000 -0400
@@ -10510,7 +10510,7 @@
 msgstr "فعال‌سازی کدام شناسه؟"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3234
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "پیوستن به کی در گپ؟"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3244
diff -ru pidgin-2.1.1/po/fi.po pidgin-2.2.0/po/fi.po
--- pidgin-2.1.1/po/fi.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/fi.po	2007-09-14 00:45:43.000000000 -0400
@@ -6,12 +6,13 @@
 # This file is distributed under the same license as the Pidgin package.
 #
 # NOTE gftt is http://www.gnome.fi/
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-13 19:15+0300\n"
-"PO-Revision-Date: 2007-08-13 19:15+0300\n"
+"POT-Creation-Date: 2007-09-11 18:23+0300\n"
+"PO-Revision-Date: 2007-09-11 18:23+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 #: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -63,13 +64,15 @@
 "Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
 "osoitteessa http://developer.pidgin.im/"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -85,74 +88,78 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Yhteyskäytäntöliitännäisiä ei ole asennettu."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Unohdit luultavasti suorittaa \"make install\".)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Uusi tili"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -164,12 +171,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -186,111 +193,113 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Peru"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Poista tili"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928 ../pidgin/gtkconv.c:1653
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisää"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Kiellä"
 
@@ -314,19 +323,19 @@
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -335,11 +344,11 @@
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Tili"
 
@@ -352,7 +361,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
@@ -366,9 +375,10 @@
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -380,7 +390,7 @@
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5814
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
@@ -401,8 +411,8 @@
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
@@ -434,7 +444,7 @@
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -445,10 +455,10 @@
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
@@ -491,16 +501,16 @@
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -513,15 +523,20 @@
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -531,29 +546,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Liikkeellä"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -562,12 +577,12 @@
 "Kirjautuneena: %d\n"
 "Yhteensä: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Tili: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -576,50 +591,54 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -636,43 +655,157 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Näytä tyhjät ryhmät"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Näytä poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Lajittele tilan mukaan"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Lajittele aakkosittain"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Lajittele lokin koon mukaan"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Varmenteen tuonti"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Määrittele isäntänimi"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Kirjoita se isäntänimi jolle tämä varmenne on tehty."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"Tiedostoa %s ei voitu tuoda.\n"
+"Varmista että tiedosto on luettavissa ja PEM-muodossa.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Varmenteen tuontivirhe"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509-varmenteen tuonti epäonnistui"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Valitse PEM-varmenne"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Tiedostoon %s vienti epäonnistui.\n"
+"Tarkista että kohdepolkuun on kirjoitusoikeudet\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Varmenteen vientivirhe"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509-varmenteen vienti epäonnistui"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "PEM X.509 -varmenteen vienti"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Varmenne kohteelle %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Yleinen nimi: %s\n"
+"\n"
+"SHA1-sormenjälki:\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL Host -varmenne"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Poistetaanko kohteen %s varmenne?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Vahvista varmenteen poisto"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Varmennehallinta"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Isäntä"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Tiedot"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Sulje"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -696,42 +829,46 @@
 "Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
 "otat tilin uudelleen käyttöön."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Viestiä ei lähetetty, koska ei olla kirjauduttu sisään."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -740,48 +877,68 @@
 "\n"
 "%s kirjoittaa..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Olet poistunut tästä keskustelusta."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
+"lokiin."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Lähetä käyttäjälle"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Tyhjennä takaisinvieritys"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Näytä aikaleimat"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Lisää tuttavailmoitin..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Ota lokiinkirjaus käyttöön"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Ota äänet käyttöön"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -789,7 +946,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -797,56 +954,56 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Näytä tuttavaluettelo."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Näytä käyttäjätilit-ikkuna."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Näytä asetukset-ikkuna."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -872,99 +1029,95 @@
 msgstr "Tiedostonsiirrrot - tiedosto %d%% / %d"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Tiedostonsiirrot"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Valmiina"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Tiedoston nimi"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Koko"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Jäljellä"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Tila"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Sulje tämä ikkuna kun kaikki siirrot ovat valmiita"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Poista valmiit siirrot"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Pysäytä"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Sulje"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Peruutettu"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Tiedosto tallennettiin nimellä %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Siirtää"
 
@@ -976,11 +1129,11 @@
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Aihe"
 
@@ -991,17 +1144,17 @@
 msgstr[0] "%s (%s): %d uusi viesti."
 msgstr[1] "%s (%s): %d uutta viestiä."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -1009,11 +1162,7 @@
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1629 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Tiedot"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1590
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Pikaviesti"
 
@@ -1021,7 +1170,7 @@
 msgid "Join"
 msgstr "Liity"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1082,7 +1231,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -1090,7 +1239,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
@@ -1104,7 +1252,7 @@
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1113,7 +1261,7 @@
 msgstr "Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
@@ -1158,7 +1306,7 @@
 msgstr "lähettää viestin"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Toiminto"
 
@@ -1186,70 +1334,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Ilmoitinta ei voitu luoda"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Yhtäkään käyttäjätiliä ei ole määritelty."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Käyttäjätili tulee luoda ennen ilmoittimen luomista."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -1257,13 +1417,13 @@
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -1312,12 +1472,12 @@
 msgstr "Vaihda tila seuraavaksi"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
@@ -1325,106 +1485,106 @@
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Tuttava kirjautuu sisään"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Tuttava kirjautuu ulos"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Vastaanotettu viesti aloittaa keskustelun"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Joku saapuu ryhmäkeskusteluun"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Joku poistuu ryhmäkeskustelusta"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sinä puhut ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Muut puhuvat ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer-virhe"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreameria ei voitu alustaa."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(oletus)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Valitse äänitiedosto..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Ääniasetukset"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profiilit"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Komento"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Ei ääntä"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Menetelmä: "
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1434,55 +1594,55 @@
 "(%s tiedostonimeksi)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Äänet kun keskusteluikkuna on aktiivinen"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Aina"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Kun tavoittamattomissa"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Äänenvoimakkuus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Valitse..."
 
@@ -1499,9 +1659,9 @@
 msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1511,46 +1671,55 @@
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Viesti"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Käytä"
 
@@ -1562,56 +1731,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Tilan otsikko ei voi olla tyhjä."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Otsikon toisinto"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Anna toinen otsikko tilalle."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Alatila"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Viesti:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Muokkaa tilaa"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Käytä eri tilaa seuraaville käyttäjätileille"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Varmenteet"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Tilat"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Liitännäistä ladattaessa tapahtui virhe."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "X-näyttöä ei löydetty"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Ikkunaa ei löydetty"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Liitännäistä ei voida ladata, koska sitä ei käännetty X11-tuella."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Leikepöytäliitännäinen"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1738,86 +1928,88 @@
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -1825,22 +2017,183 @@
 msgid "buddy list"
 msgstr "tuttavalista"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(EI TÄSMÄÄ)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s on esittänyt seuraavan varmenteen vain tätä kertaa varten:"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Yleinen nimi: %s %s\n"
+"Sormenjälki (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Kertakäyttöisen varmenteen tarkistus"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Varmentajat"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL Peers -välimuisti"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Hyväksy varmenne kohteelle %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "SSL-varmenteen tarkistus"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Hyväksy"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Kieltäydy"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_Näytä varmenne..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Kohteen \"%s\" esittämä varmenne näyttää olevan lähteestä \"%s\". Tämä "
+"saattaa tarkoittaa ettet ole yhdistämässä siihen palveluun johon luulet."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Kohteen \"%s\" esittämä varmenne on itseallekirjoitettu. Sitä ei voida "
+"automaattisesti tarkistaa."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "Kohteelle %s esitetty varmenneketju ei ole kelvollinen."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "SSL-varmennevirhe"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Epäkelpo varmenneketju"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Juurivarmennetietokantaa ei ole, joten tätä varmennetta ei voida kelpuuttaa."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"Kohteen %s esittämällä varmenneketjulla ei ole kelvollista digitaalista "
+"allekirjoitusta varmentajalta jolta se väittää allekirjoituksen olevan."
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Epäkelpo varmentajan allekirjoitus"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Yleinen nimi: %s\n"
+"\n"
+"Sormenjälki (SHA1): %s\n"
+"\n"
+"Julkaisupäivä: %s\n"
+"Vanhenemispäivä: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Varmennetiedot"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Rekisteröinnin poistamisen virhe"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s kirjautui sisään"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1864,40 +2217,40 @@
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -2415,12 +2768,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Peru"
@@ -2463,8 +2816,8 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -2885,7 +3238,7 @@
 "Loput viesteistä tallennetaan ilmoittimeen. Voit muokata/poistaa sen "
 "\"Tuttavailmoittimet\"-valintaikkunasta."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2895,18 +3248,18 @@
 "viesteistä tuttavailmoittimeen, ja automaattisesti lähettää ne kun \"%s\" "
 "kirjautuu takaisin sisään?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Yhteydetön viesti"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Voit muokata/poistaa ilmoittimen \"Tuttavailmoittimet\"-valintaikkunassa"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2916,9 +3269,9 @@
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2928,11 +3281,11 @@
 msgid "No"
 msgstr "Ei"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Tallenna yhteydettömät viestit ilmoittimeen"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Älä kysy. Tallenna aina ilmoittimeen."
 
@@ -3027,23 +3380,30 @@
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee että useimmat asiat toimivat."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "X.509-varmenteet"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Luo liittymän eri SSL-tukikirjastoille."
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
 #. *< type
 #. *< ui_requirement
@@ -3051,18 +3411,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Tuo SSL-tuen GNUTLS:n kautta."
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
 #. *< type
 #. *< ui_requirement
@@ -3070,18 +3430,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Luo liittymän eri SSL-tukikirjastoille."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3175,25 +3534,25 @@
 "Ei voitu luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3202,13 +3561,13 @@
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP-tili"
 
@@ -3222,27 +3581,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Isäntä"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3254,30 +3604,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Ei voitu liittää pistoketta porttiin"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Ei voitu kuunnella pistoketta"
 
@@ -3354,47 +3704,49 @@
 msgid "Registration completed successfully!"
 msgstr "Rekisteröinti onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Syötä nykyinen poletti"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Nykyinen poletti"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3402,242 +3754,242 @@
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mies"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Nainen"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Salasanaa ei voitu muuttaa. Tapahtui virhe.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3423
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Tavoitettavissa"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Käyttäjistä ei löytynyt osumia"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista lähetettiin"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Estä"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Vie tuttavalista palvelimelle"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -3652,16 +4004,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
@@ -3718,7 +4070,8 @@
 msgstr "MOTD %s:lle"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
@@ -3732,7 +4085,7 @@
 msgstr "_Kanava:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Salasana:"
 
@@ -3740,65 +4093,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Yhteysvirhe"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL-kättely epäonnistui"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Aihe"
 
@@ -3810,47 +4160,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3866,7 +4217,7 @@
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3876,7 +4227,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
@@ -3907,7 +4258,7 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4188,7 +4539,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4316,6 +4667,22 @@
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Tuntematon virhe"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Ad-Hoc-komento epäonnistui"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "suorita"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL tukea ei löydy."
@@ -4325,8 +4692,8 @@
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4335,33 +4702,33 @@
 "%s vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. "
 "Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4369,113 +4736,114 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL-virhe"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Alue"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Seutu"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Maa"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Asema"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Muokkaa XMPP-vCardia"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4483,116 +4851,385 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Asiakasohjelma"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
-msgid "Resource"
-msgstr "Sijainti"
-
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
-msgid "Priority"
-msgstr "Tärkeys"
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Viimeisin aktiivisena olo"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Palvelulöytötiedot"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
-msgid "Middle Name"
-msgstr "Muut etunimet"
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Palvelulöytökohteet"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
-msgid "Address"
-msgstr "Osoite"
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Laajennettu raakalohko-osoitus"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Monen käyttäjän keskustelu"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "In-band-tavujonot"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Ad-Hoc-komennot"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub-palvelu"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5-tavujonot"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Out of band -tiedot"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "Rekisteröinti \"in-band\""
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Käyttäjän sijainti"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Käyttäjän hahmo"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Keskustelun tilan ilmoitukset"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Ohjelmistoversio"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Virtauksen alustus"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Tiedostonsiirto"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Käyttäjän mieliala"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Käyttäjän aktiivisuus"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Entiteetin ominaisuudet"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Salatut istuntojen neuvottelut"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "Käyttäjänimi"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr "Tuttavaluetteloiden vaihto"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr "Tavoitettavuusosoite"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Käyttäjän profiili"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle-ääni"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Käyttäjän kutsumanimi"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr "Jingle raaka-UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle-video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Viestikuittaukset"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Julkisen avaimen julkaiseminen"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "Käyttäjä keskustelee"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "Käyttäjä selaa"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "Käyttäjä pelaa"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "Käyttäjä katselee"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Raakalohkojen salaus"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Entiteetin aika"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Viivästetty toimitus"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Yhteistyötä tekevät dataobjektit"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "Tiedostovarasto ja jakaminen"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "STUN-palvelun löytäminen Jinglelle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Hyppytarkistus"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Kyvyt"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
+msgid "Resource"
+msgstr "Sijainti"
+
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
+msgid "Priority"
+msgstr "Tärkeys"
+
+#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Middle Name"
+msgstr "Muut etunimet"
+
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
+msgid "Address"
+msgstr "Osoite"
+
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Kirjaudu sisään"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Kirjaudu ulos"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4600,69 +5237,69 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Etsi XMPP-käyttäjiä"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -4752,25 +5389,29 @@
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Virhe istunnon alustuksessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "Salausta vaadittu, mutta sitä ei tueta tällä palvelimella."
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:483
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4779,55 +5420,70 @@
 "Ei voitu muodostaa yhteyttä palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Rekisteröinti kohteesen %s onnistui"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Tuntematon virhe"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Rekisteröinti kohteesta %s onnistuneesti poistettu"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "Rekisteröinnin poisto onnistui"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "Rekisteröinnin poisto epäonnistui"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4837,376 +5493,538 @@
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "Rekisteröinnin poisto"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "Syötä alla olevat tiedot muuttaaksesi käyttäjätilin rekisteröimistä."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Vaihda tilin rekisteröitymistä kohteessa %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Rekisteröi uusi tili kohteessa %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Muuta rekisteröitymistä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "Käyttäjätilin rekisteröinti poistettiin onnistuneesti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Alustetaan SSL/TLS-salausta"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Mieliala"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Mielialan teksti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "Kappaleen esittäjä"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "Kappaleen nimi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "Kappaleen levy"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "Kappaleen tyylilaji"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Comment"
+msgstr "Kappaleen kommentti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "Kappaleen numero"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "Kappaleen kesto"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "Kappaleen vuosi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "Kappaleen URL"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Allow Buzz"
+msgstr "Salli äänimerkki"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Sijaintikonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Sijaintirajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Ei voitu pingata käyttäjää %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "Äänimerkkiä ei voitu lähettää, koska mitään ei tiedetä käyttäjästä %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+"Äänimerkkiä ei voitu lähettää, koska käyttäjä %s voi olla poissa linjoilta."
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Äänimerkkiä ei voitu lähettää, koska käyttäjä %s ei tue sitä."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5214,7 +6032,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5222,25 +6040,34 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt;:\tPingaa käyttäjää/komponenttia/palvelinta."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Tööttää tuttavalle äänimerkki huomion saamiseksi"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5251,84 +6078,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-yhteyskäytäntöliitännäinen"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Palvelin"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "Vaadi SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s on lähtenyt keskustelusta."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "XMPP-viestivirhe"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s on töötännyt sinulle."
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5336,61 +6177,107 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Tiedostoa ei voitu lähettää käyttäjälle %s, virheellinen JID."
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei ole linjoilla"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Ei voida lähettää tiedostoa käyttäjälle %s, käyttäjä ei tue tiedostonsiirtoja"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "Valitse käyttäjän %s sijainti johon haluat lähettää tiedoston"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Valitse sijainti"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "Muuta käyttäjän mielialaa"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Valitse mielialasi luettelosta."
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Aseta"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "Aseta mieliala..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "Aseta käyttäjän kutsumanimi"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "Syötä uusi kutsumanimesi."
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Tämä tieto on näkyville kaikille tuttavalistalla oleville kontakteille, "
+"joten valitse jotain sopivaa."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Aseta kutsumanimi..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Toiminnot"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Valitse toiminto"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5644,39 +6531,49 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Olet lähettänyt tönäisyn!"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Tönäise"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s on tönäissyt sinua."
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Tönäistään tuttavaa %s..."
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5684,130 +6581,132 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Salli"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5815,188 +6714,188 @@
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6005,7 +6904,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6013,7 +6912,7 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiilin URL"
@@ -6028,19 +6927,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -6059,8 +6958,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
@@ -6271,11 +7170,6 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
-
 #: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -6286,14 +7180,409 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Ei voitu lisätä \"%s\"."
+
+#: ../libpurple/protocols/msn/userlist.c:645
+msgid "The screen name specified is invalid."
+msgstr "Syötetty näyttönimi on virheellinen."
+
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Salaus puuttuu"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "RC4-salausta ei löydetty"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Päivitä libpurpleen jossa RC4-tuki (>= 2.0.1). MySpaceIM-liitännäistä ei "
+"ladattu."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Pahoittelut, MySpace ei tue salasanoja jotka ovat yli %d kirjainta pitkiä "
+"(sinun on %d kirjainta)."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-virhe"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Luetaan tunnistushaastetta"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Odottamaton tunnistushaasteen pituus palvelimelta"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Kirjaudutaan sisään"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Uusia viestejä postilaatikossa"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Uusia blogikommentteja"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Uusia profiilikommentteja"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Uusia kaveripyyntöjä."
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Uusia kuvakommentteja"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Yhdistetty"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Käyttäjänimeä ei asetettu"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
+"uudestaan."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Tuttavan lisääminen epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "\"addbuddy\"-komento epäonnistui."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "persist-komento epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Käyttäjää ei löydy: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Käyttäjän haku"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Tuttavaa poistaminen epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "\"delbuddy\"-komento epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "blocklist-komento epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Epäkelpo syötetila"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Lukupuskuri täynnä"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Viestin jäsennys epäonnistui"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Yhteyttä isäntään ei voitu muodostaa: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Pikaviestikaverit"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
+"palvelinpuolen luettelossa olevat)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Lisää tuttavia palvelimelta"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Lisää kavereita MySpacesta"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Kavereiden tuonti epäonnistui"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Etsi ihmisiä..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Vaihda pikaviestinnimeä..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim-URL-käsittelijä"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Tämän myim-osoitteen avaamiseen sopivaa MySpaceIM-tiliä ei löytynyt."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Ota sopiva MySpaceIM-käyttäjätili käyttöön ja yritä uudelleen."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Näytä näyttönimi tilatekstissä"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Näytä otsikko tilatekstissä"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Lähetä hymiöitä"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Näytön tarkkuus (pisteitä tuumalla)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Peruskirjasinkoko (pisteinä)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Käyttäjä"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Profiili"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "Otsikko"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Kappale"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Kavereita yhteensä"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Asiakasohjelman versio"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Läimäise"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s läimäisi sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Läimäise tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Mätkäytä"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s mätkäisi sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Mätkäistään tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Liekitä"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s liekitti sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "Liekitetään tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Syleile"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s syleili sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Syleillään tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Halaa"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s halasi sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Halataan tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Läpäytä"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s läpäytti sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Läpäytetään tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Purista"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s puristi sinua."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "Puristetaan tuttavaa %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "Yläfemmaa"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s yläfemmasi sinulle."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "Yläfemmataan tuttavalle %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Kujeile"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s kujeili sinulle."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr "Kujeillaan tuttavalle %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Rutise"
+
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Ei voitu lisätä \"%s\"."
+msgid "%s has raspberried you!"
+msgstr "%s rutisi nenäsi edessä."
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "Syötetty näyttönimi on virheellinen."
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Rutistaan tuttavalle %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6535,7 +7824,7 @@
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -6650,8 +7939,8 @@
 msgstr "Palvelimen portti"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6659,8 +7948,8 @@
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6709,7 +7998,7 @@
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Merkistö"
@@ -6739,7 +8028,7 @@
 msgid "Direct IM established"
 msgstr "Suora pikaviestiyhteys muodostettu"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
@@ -6864,8 +8153,8 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
@@ -6887,7 +8176,7 @@
 msgstr "Keskustelu"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -6960,17 +8249,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -6980,8 +8269,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Näkymätön"
 
@@ -6990,13 +8279,13 @@
 msgstr "Linjoilla"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-osoite"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
@@ -7048,14 +8337,14 @@
 "sisältää vain numeroita."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttöjänimi."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
@@ -7107,10 +8396,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -7146,31 +8435,31 @@
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7181,17 +8470,17 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7204,7 +8493,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7217,7 +8506,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7230,38 +8519,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7270,21 +8559,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7292,55 +8581,47 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Kyvyt"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Profiili"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7348,7 +8629,7 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7356,82 +8637,82 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7440,14 +8721,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7456,7 +8737,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7465,7 +8746,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7474,7 +8755,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7483,32 +8764,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7518,7 +8799,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7531,11 +8812,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7550,11 +8831,11 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7565,17 +8846,17 @@
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7583,15 +8864,15 @@
 "Tuttavalistan hakeminen AIM-pavelimelta epäonnistui. Tuttavalistasi ei ole "
 "kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7600,17 +8881,17 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Tuttavaa %s ei voitu lisätä tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7619,22 +8900,22 @@
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
 "tuttavalistalleen. Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7645,53 +8926,53 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7699,66 +8980,66 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7766,73 +9047,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7840,27 +9121,27 @@
 "Käytä aina ICQ-välipalvelinta tiedostonsiirroille\n"
 "(hitaampi, mutta ei paljasta IP-osoitettasi)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pyydetään %s yhdistämään meihin at %s:%hu suoraa pikaviestiyhteyttä varten."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Yritetään yhdistää kohteeseen %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Yritetään yhdistämistä välipalvelimen kautta."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s on juuri pyytänyt suoraa yhteyttä %s:n"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8068,14 +9349,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Pahoittelut, en ole kiinnostunut..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Kieltäydy"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Lisää tuttava jolla on epäonnistunut valtuutuspyyntö"
@@ -8484,7 +9757,8 @@
 msgstr "Sinut on lisännyt %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Haluatko lisätä hänet?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8518,10 +9792,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s ei ole tuttavalistallasi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Haluatko lisätä hänet?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
@@ -8585,10 +9855,6 @@
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Yhdistetty"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8610,7 +9876,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
@@ -8631,37 +9897,33 @@
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Tiedostonsiirto"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Tukee"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Ulkoinen käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8670,27 +9932,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Aloita"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8701,27 +9963,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8730,42 +9992,42 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Viimeksi nähty asiakasohjelma"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8774,15 +10036,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8791,11 +10053,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8804,64 +10066,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8872,15 +10134,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8889,11 +10151,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8901,12 +10163,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8917,29 +10179,28 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8947,32 +10208,32 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -9360,13 +10621,6 @@
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Mieliala"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10031,13 +11285,6 @@
 msgstr "Verkkotilastoja"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
@@ -10194,7 +11441,7 @@
 msgstr "Tämänhetkinen mielialasi"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normaali"
 
@@ -10586,7 +11833,7 @@
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Verkko"
 
@@ -10847,26 +12094,26 @@
 msgstr "Ei voitu kirjoittaa"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Isäntänimeä ei voitu selvittää"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-näyttönimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -10878,36 +12125,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -11067,8 +12314,8 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -11129,32 +12376,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
-"tuttavalistallesi."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11163,11 +12403,18 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
+"tuttavalistallesi."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11178,11 +12425,11 @@
 "luultavasti mahdollista kirjautua Yahoo-palveluun tällä asiakasohjelmalla. "
 "Tarkista päivitykset osoitteesta: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11192,51 +12439,51 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11245,7 +12492,7 @@
 "Yhteys palvelimeen %s katkesi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11254,111 +12501,112 @@
 "Ei voitu muodostaa yhteyttä palvelimeen %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate which ID?"
 msgstr "Mikä tunnus (ID) aktivoidaan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
-msgid "You have just sent a Buzz!"
-msgstr "Olet lähettänyt tönäisyn!"
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Tööttää"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Töötätään tuttavalle %s..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -11372,130 +12620,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Kutsusta kieltäydytty"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Tuntematon huone"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Ehkä huone on täynnä"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "Ei olemassa"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
-"minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Olet nyt keskustelemassa huoneessa %s"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "Huonelistan haku epäonnistui."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Äänet"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Web-kamerat"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "Huonelistaa ei voida hakea."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Käyttäjän huoneet"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11609,6 +12786,77 @@
 msgid "The user's profile is empty."
 msgstr "Käyttäjän profiili on tyhjä."
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Kutsusta kieltäydytty"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Tuntematon huone"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Ehkä huone on täynnä"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Ei olemassa"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Tuntematon virhe. Voi olla että sinun pitää kirjautua ulos ja odottaa viisi "
+"minuuttia ennen uudelleenliittymistä keskusteluhuoneeseen"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Olet nyt keskustelemassa huoneessa %s"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Huonelistan haku epäonnistui."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Äänet"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Web-kamerat"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Huonelistaa ei voida hakea."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Käyttäjän huoneet"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
@@ -11635,11 +12883,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ei voida lähettää ryhmäkeskusteluun %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Käyttäjä"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11857,7 +13100,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Pyydetään käyttäjän %s huomiota..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s pyysi huomiotasi"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11866,20 +13119,36 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL-yhteys epäonnistui"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL-kättely epäonnistui"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL-vertainen esitti epäkelvon varmenteen"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Tuntematon SSL-virhe"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Älä häiritse"
 
@@ -11931,12 +13200,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11945,67 +13214,67 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
 
-#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12014,17 +13283,17 @@
 "Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ei voitu yhdistää kohteeseen %s: %s"
@@ -12050,37 +13319,37 @@
 msgstr "Ilmoitusalueen asento."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Yhteyskäy_täntö:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Näyttö_nimi:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Paika_llinen lempinimi:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Muista _salasana"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Il_moita uudesta sähköpostista"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
 
@@ -12114,7 +13383,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -12136,15 +13405,15 @@
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -12152,31 +13421,43 @@
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Uuden käyttäjätilin tallentaminen ei onnistu."
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Määritelty käyttäjätili on jo olemassa."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Luo tämä uusi käyttäjätili palvelimelle"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12199,103 +13480,103 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576 ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -12304,126 +13585,138 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Tuttavat/Näytä tyhjät ryhmät"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Tuttavat/Näytä tuttavien tiedot"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Tuttavat/Näytä _joutenoloajat"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Tuttavat/Näytä"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Tuttavat/Näytä/_Poissaolevat tuttavat"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Tuttavat/Näytä/_Tyhjät ryhmät"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Tuttavat/Näytä/Tuttavien tie_dot"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Tuttavat/Näytä/_Joutenoloajat"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Tuttavat/Näytä/_Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Työkalut/_Varmenteet"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12432,132 +13725,132 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Kirjautumisesta aikaa"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Näkemisestä aikaa"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jouten %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3590 ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3593 ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../pidgin/gtkblist.c:3729 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:4018 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12576,23 +13869,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Tuttavat/Näytä tyhjät ryhmät"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Tuttavat/Näytä tuttavien tiedot"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Tuttavat/Näytä joutenoloajat"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Tuttavat/Näytä/Poissaolevat tuttavat"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Tuttavat/Näytä/Tyhjät ryhmät"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Tuttavat/Näytä/Tuttavien tiedot"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Tuttavat/Näytä/Joutenoloajat"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Tuttavat/Näytä/Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12603,19 +13900,19 @@
 "aina kuin mahdollista.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Näyttönimi:"
 
-#: ../pidgin/gtkblist.c:5516 ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12623,7 +13920,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12631,42 +13928,47 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:6603 ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL-palvelimet"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12680,226 +13982,214 @@
 "%s ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: ../pidgin/gtkconv.c:759 ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:779
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:903 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:960 ../pidgin/gtkconv.c:2521 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1151 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1177 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
-
-#: ../pidgin/gtkconv.c:1368
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
-"lokiin."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Näytä kaikki"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Valinnat/Näytä tuttava_kuvake"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Valinnat"
 
@@ -12908,177 +14198,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3093 ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Valinnat/Näytä tuttava_kuvake"
-
-#: ../pidgin/gtkconv.c:3297 ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525 ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5609 ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6338 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6348 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tyhjentää kaikki keskustelut"
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:8111
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:9213 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -13142,7 +14428,7 @@
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
@@ -13153,8 +14439,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "kehittäjä"
 
@@ -13166,425 +14452,432 @@
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "kehittäjä & verkkosivujen ylläpitäjä"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Vanhempi osallistuja/laadunvarmistus"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "kehittäjä & verkkosivujen ylläpitäjä"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP-kehittäjä"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "arabia"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "tanska"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "saksa"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "kanadan englanti"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "brittienglanti"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "viro"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "euskara (baski)"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "ranska"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "galego"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "gudžarati"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntun georgian kääntäjät"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "korea"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "norja"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "norja (uusnorja)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "thai"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s on graafinen ja modulaarinen libpurple-kirjastoon perustuva "
 "pikaviestinsovellus, joka kykenee käyttämään AIM-, MSN-, Yahoo!-, XMPP-, "
 "ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus Sametime-, "
-"Bonjour-, Zephyr-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä yhtäaikaisesti. Se on "
-"ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa ohjelmaa "
-"GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio GPL:stä on "
-"sisällytetty \"COPYING\"-tiedostoon, joka tulee %sin mukana. %sin "
-"tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen luettelo "
-"osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät anna "
-"ohjelmalle minkäänlaista takuuta.<BR><BR>"
+"Bonjour-, Zephyr-, MySpaceIM-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä "
+"samanaikaisesti. Se on ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit "
+"muokata ja jakaa ohjelmaa GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. "
+"Kopio GPL:stä on sisällytetty \"COPYING\"-tiedostoon, joka tulee %sin "
+"mukana. %sin tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen "
+"luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
+"anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:452
 msgid "Retired Crazy Patch Writers"
 msgstr "Lopettaneet korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13599,30 +14892,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13630,29 +14923,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13661,11 +14954,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -13774,7 +15067,7 @@
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Tauko"
 
@@ -13783,43 +15076,43 @@
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:831 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin osoite"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13829,7 +15122,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13839,7 +15132,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13850,7 +15143,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13861,35 +15154,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476 ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13897,91 +15190,155 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "Ki_rjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Ryhmittele kohteet"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Pura kohteiden ryhmitys"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Lihavoi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursivoi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Alleviivaa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Yliviivaa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Suurenna kirjasimen kokoa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Pienennä kirjasimen kokoa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Kirjasintyyppi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Taustaväri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Etualaväri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Poista muotoilu"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Lisää IM-kuva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Lisää hymiö"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lihavoi</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursivoi</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Alleviivaa</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Yliviivaa</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Suurempi</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normaali"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Pienempi</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Ki_rjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "Etuala_väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "_Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Hymiö"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "Ku_va"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Linkki"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Vaakaviiva"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14148,44 +15505,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sinulla on %d uusi sähköposti.</b>"
 msgstr[1] "<b>Sinulla on %d uutta sähköpostia.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
@@ -14237,100 +15594,100 @@
 msgstr "Valitse tiedosto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "_keskeyttää kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Oletus"
 
@@ -14374,7 +15731,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Poissaollessa"
 
@@ -14471,11 +15828,11 @@
 msgid "Conversation _font:"
 msgstr "Keskustelujen _kirjasin:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14483,119 +15840,119 @@
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
 "muotoiluja."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Gnomen oletus"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14604,63 +15961,63 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14669,81 +16026,81 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuutteja ennen joutenolevaksi asettamista:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -14832,23 +16189,23 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
@@ -14888,7 +16245,7 @@
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Tila:"
 
@@ -14902,7 +16259,7 @@
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -14915,21 +16272,21 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14938,12 +16295,12 @@
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14951,23 +16308,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14975,7 +16332,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
 "tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14988,11 +16345,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15000,7 +16357,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15011,25 +16368,25 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voitu asettaa"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ei voitu avata tiedostoa \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15045,31 +16402,31 @@
 msgid "Select color"
 msgstr "Valitse väri"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Sulje _välilehdet"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Hae tiedot"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-hymiöt"
 
@@ -15242,18 +16599,6 @@
 msgid "Select Color for %s"
 msgstr "Valitse %s:n väri"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Lihavoi"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursivoi"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Alleviivaa"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Älä välitä sisääntulevien viestien muotoiluista"
@@ -15493,15 +16838,6 @@
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Tuttavakommentti:</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15522,6 +16858,15 @@
 msgstr ""
 "Kokeile nähdäksesi, että kaikki käyttöliittymäsignaalit toimivat oikein."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Tuttavakommentti:</b> %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historia"
@@ -15569,11 +16914,11 @@
 msgid "Draw Markerline in "
 msgstr "Piirrä merkintäviiva "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Pikaviesti-ikkunoille"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Ryhmäkeskusteluikkunoille"
 
@@ -15589,32 +16934,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Musiikkiviestintäistunto varmistettu."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Musiikkiviestintä"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Tapahtui virhe suoritettaessa komentoa:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Virhe ajettaessa muokkainta"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Seuraava virhe tapahtui:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Musiikkiviestinnän asetukset"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Sävellysmuokkaimen polku"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Toteuta"
 
@@ -15626,12 +16971,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15641,74 +16986,74 @@
 "reaaliaikaisesti."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Huomautus"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Vain kun joku sanoo kutsumanimesi"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Kohdistetuille ikkunoille"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Ilmoitustavat"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Lisää _merkkijono ikkunaotsikon eteen:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Lisää uusien _viestien määrä ikkunaotsikkoon"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Lisää uusien viestien määrä _X-ominaisuuteen (xprop)"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "N_osta keskusteluikkuna"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Huomautuksen poisto"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Poista kun keskusteluikkuna on _aktiivinen"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Poista kun keskusteluikkunaa _napsautetaan"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Poista kun keskusteluikkunaan _kirjoitetaan"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Poista kun viesti _lähetetään"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Poista kun _välilehti vaihtuu"
 
@@ -15718,7 +17063,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -15726,7 +17071,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
 
@@ -16101,48 +17446,48 @@
 "Tämä liitännäinen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
 "muokkaamisen."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Peitto:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Pikaviesti-ikkunat"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_Pikaviesti-ikkunan läpinäkyvyys"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Näytä vierityspalkki pikaviesti-ikkunassa"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Poista pikaviesti-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Aina päällimmäisenä"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Tuttavalistaikkunan läpinäkyvyys"
 
 # NOTE source: gimp + google
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
@@ -16153,19 +17498,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16177,47 +17522,47 @@
 "\n"
 "Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime -versio"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Käynnistys"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Käynnistä %s Windowsin käynnistyessä"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Telakoi tuttavalista ruudun reunaan"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Vain telakoituna"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Vilkuta ikkunaa ryhmäkeskusteluviestien saapuessa"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin -valinnat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Asetukset jotka liittyvät erityisesti Pidginin Windows-versioon "
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -16273,6 +17618,48 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
+
+#~ msgid "nudged"
+#~ msgstr "tönäisty"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Olet lähettänyt tönäisyn!"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
+
+#~ msgid "*** You have been %s! ***"
+#~ msgstr "*** Sinut on %s. ***"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Olet lähettänyt tönäisyn!"
+
+#~ msgid "buzzed"
+#~ msgstr "äänimerkki lähetetty"
+
+#~ msgid "Attention! %s %s."
+#~ msgstr "Huomio. %s %s."
+
+#~ msgid "Attention!"
+#~ msgstr "Huomio"
+
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Huomio, sinut on: %s."
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Haluatko lisätä hänet?"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Valinnat/Näytä tuttava_kuvake"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Valinnat/Näytä tuttava_kuvake"
+
+#~ msgid "Norwegian"
+#~ msgstr "norja"
+
 #~ msgid "You have been signed off for an unknown reason."
 #~ msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
@@ -16321,9 +17708,6 @@
 #~ msgid "Connection refused"
 #~ msgstr "Yhteys torjuttu"
 
-#~ msgid "%s has added you [%s]"
-#~ msgstr "%s on lisännyt sinut (%s)"
-
 #~ msgid "_Bold"
 #~ msgstr "_Lihavoi"
 
@@ -16365,24 +17749,15 @@
 #~ msgid "/Buddies/_About Pidgin"
 #~ msgstr "/Tuttavat/Tietoj_a Pidginistä"
 
-#~ msgid "Larger font size"
-#~ msgstr "Suurempi kirjasinkoko"
-
 #~ msgid "Smaller font size"
 #~ msgstr "Pienempi kirjasinkoko"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Poista muotoilu"
-
 #~ msgid "Insert link"
 #~ msgstr "Lisää linkki"
 
 #~ msgid "Insert image"
 #~ msgstr "Liitä kuva"
 
-#~ msgid "Insert smiley"
-#~ msgstr "Lisää hymiö"
-
 #~ msgid "Tools"
 #~ msgstr "Työkalut"
 
@@ -16655,9 +18030,6 @@
 #~ msgid "Pidgin - Save As..."
 #~ msgstr "Pidgin - Tallenna nimellä..."
 
-#~ msgid "Buzz!!"
-#~ msgstr "Huomio!"
-
 #~ msgid "Normal authentication failed!"
 #~ msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
@@ -16916,9 +18288,6 @@
 #~ "syystä:\n"
 #~ "%s"
 
-#~ msgid "Selection"
-#~ msgstr "Valinta"
-
 #~ msgid "Faces"
 #~ msgstr "Kasvot"
 
@@ -16934,9 +18303,6 @@
 #~ msgid "<i>Information below may not be accurate</i><br>\n"
 #~ msgstr "<i>Alla olevat tiedot eivät välttämättä ole oikeita</i><br>\n"
 
-#~ msgid "Change My Face"
-#~ msgstr "Vaihda kasvot"
-
 #~ msgid "Please wait for new version"
 #~ msgstr "Odota uutta versiota"
 
@@ -17037,9 +18403,6 @@
 #~ msgid "Use TLS if available"
 #~ msgstr "Käytä TLS:ää jos mahdollista"
 
-#~ msgid "Require TLS"
-#~ msgstr "Vaadi TLS"
-
 #~ msgid "A"
 #~ msgstr "A"
 
@@ -17091,18 +18454,12 @@
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "Ei voitu lisätä \"%s\" Napster-hotlistiin"
 
-#~ msgid "%s requested your information"
-#~ msgstr "%s pyysi tietojasi"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s pyysi PING-sanoman"
 
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER-yhteyskäytäntöliitännäinen"
 
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
@@ -17175,9 +18532,6 @@
 #~ " Kokeile välipalvelimien käyttöönottoa tiedostonsiirroille kohdassa "
 #~ "Käyttäjätilit -> %s -> Muokkaa käyttäjätiliä -> Lisäasetukset."
 
-#~ msgid "Unable to create new connection."
-#~ msgstr "Uuden yhteyden luominen epäonnistui."
-
 #~ msgid "Unable to log into file transfer proxy."
 #~ msgstr "Ei kyetty kirjautumaan tiedostonsiirtovälipalvelimeen."
 
@@ -17195,9 +18549,6 @@
 #~ msgid "Realname"
 #~ msgstr "Oikea nimi"
 
-#~ msgid "Email Address"
-#~ msgstr "Sähköpostiosoite"
-
 #~ msgid "EMail"
 #~ msgstr "Sähköposti"
 
@@ -17624,9 +18975,6 @@
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Työkalut/_Liitännäistoiminnot"
 
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/Työkalut/_Tilat"
-
 #~ msgid "%s could not connect"
 #~ msgstr "%s ei voinut yhdistää"
 
@@ -17639,9 +18987,6 @@
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Laajennusnuolen koko"
 
-#~ msgid "_Sorting:"
-#~ msgstr "_Järjestys:"
-
 #~ msgid "Show more buddy details"
 #~ msgstr "Näytä lisää käyttäjän yksityiskohtia"
 
@@ -17730,9 +19075,6 @@
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Aseta Trepia-profiilitietosi."
 
-#~ msgid "Set Profile"
-#~ msgstr "Aseta profiili"
-
 #~ msgid "Visit Homepage"
 #~ msgstr "Vieraile kotisivulla"
 
@@ -17845,9 +19187,6 @@
 #~ msgid "You cannot create an empty away message"
 #~ msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#~ msgid "New away message"
-#~ msgstr "Uusi poissaoloviesti"
-
 #~ msgid "Away title: "
 #~ msgstr "Poissaolon otsikko: "
 
@@ -17955,9 +19294,6 @@
 #~ msgid "Show fewer options"
 #~ msgstr "Näytä vähemmän valintoja"
 
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/Tuttavat/Kirjaudu _ulos"
-
 #~ msgid "New group name"
 #~ msgstr "Uusi ryhmänimi"
 
@@ -18093,9 +19429,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "Näytä _aikaleimat viesteissä"
 
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Älä välitä kirjasimien k_oosta"
-
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Lähetä oletusmuotoilu lähetettävien viestien mukana"
 
@@ -18135,9 +19468,6 @@
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "Käytä \"kauttaviiva\"-komentoja"
 
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "Näytä _lempinimet välilehdissä/otsikoissa"
-
 #~ msgid "_Raise IM window on events"
 #~ msgstr "_Nosta pikaviesti-ikkuna tapahtumahetkinä"
 
@@ -18242,9 +19572,6 @@
 #~ msgid "Unknown Error Code."
 #~ msgstr "Tuntematon virhekoodi."
 
-#~ msgid "Reading data"
-#~ msgstr "Luetaan tietoja"
-
 #~ msgid "Balancer handshake"
 #~ msgstr "Tasapainottajan kättely"
 
diff -ru pidgin-2.1.1/po/fr.po pidgin-2.2.0/po/fr.po
--- pidgin-2.1.1/po/fr.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/fr.po	2007-09-14 00:45:43.000000000 -0400
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-13 03:22-0400\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
 "PO-Revision-Date: 2007-08-15 10:48+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -33,7 +33,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 #: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -75,13 +75,15 @@
 "vers %s. Veuillez investiguer et terminer la migration à la main. Reportez "
 "cette erreur sur http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -97,74 +99,78 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Le nom d'utilisateur d'un compte ne doit pas être vide."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Aucun plugin de protocole n'est installé."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Vous avez peut-être oublié de faire un « make install »)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Modification du compte"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nouveau compte"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nom d'utilisateur :"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias :"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -176,12 +182,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -198,110 +204,112 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Annuler"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Supprimer le compte"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Vous pouvez activer/désactiver les comptes de la liste suivante."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928 ../pidgin/gtkconv.c:1653
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Ajouter"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s a fait de %s son contact%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Ajouter cet utilisateur à la liste de contacts ?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s veut ajouter %s à sa liste de contacts%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autoriser le contact ?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Refuser"
 
@@ -325,19 +333,19 @@
 msgid "Error adding buddy"
 msgstr "Erreur à l'ajout du contact."
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nom d'utilisateur"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -346,11 +354,11 @@
 msgid "Group"
 msgstr "Groupe"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Compte"
 
@@ -363,7 +371,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Ajouter le contact"
@@ -377,9 +385,10 @@
 msgstr "Discussions"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -391,7 +400,7 @@
 msgid "Auto-join"
 msgstr "Connexion auto"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5814
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Ajouter la discussion"
 
@@ -413,8 +422,8 @@
 msgstr "Un groupe avec ce nom existe déjà."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Ajouter le groupe"
 
@@ -446,7 +455,7 @@
 msgid "Retrieving..."
 msgstr "Récupération en cours..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -457,10 +466,10 @@
 msgstr "Ajouter une alerte"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
@@ -503,16 +512,16 @@
 msgid "Confirm Remove"
 msgstr "Confirmez la suppression"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Supprimer"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
@@ -525,15 +534,20 @@
 msgstr "Basculer la marque"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -543,29 +557,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Inactif"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Sur téléphone portable"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -574,12 +588,12 @@
 "Connectés : %d\n"
 "Total : %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Compte : %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -588,49 +602,53 @@
 "\n"
 "Vu récemment : il y a %s"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Nouveau..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Sauvé..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Nom"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "C_ompte"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Saisissez le nom d'utilisateur ou l'alias du destinataire pour le message."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -647,43 +665,157 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Message..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Afficher les groupes vides"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Tri par état"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Tri alphabétique"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Tri par la taille des archives"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Importer un certificat"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Saisissez un nom d'hôte"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Saisissez le nom d'hôte correspondant à ce certificat."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"Impossible d'importer le fichier %s.\n"
+"Vérifiez que le fichier est accessible et au format PEM.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Erreur à l'import d'un certificat"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "Échec lors de l'import d'un certificats X.509."
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Choisissez un certificat PEM"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Échec à l'export du fichier %s.\n"
+"Vérifiez que le droit d'écrire dans le dossier de destination.\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Erreur à l'export d'un certificat"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "Échec lors de l'export d'un certificats X.509."
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "Exporter un certificat X.509 en PEM"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificat pour %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Nom usuel : %s\n"
+"\n"
+"Empreinte SHA1 :\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "Certificat d'hôte SSL"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Voulez-vous vraiment supprimer le certificat pour %s ?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Confirmation de suppression de certificat"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Gestionnaire de certificats"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Infos"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Fermer"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -707,43 +839,47 @@
 "Finch n'essaiera pas de se reconnecter avec le compte tant que cette erreur "
 "ne sera pas corrigée et que vous n'aurez pas réactivé le compte."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Cette commande n'existe pas."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Erreur de syntaxe : mauvais nombre d'arguments pour cette commande."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "La commande a échoué pour une raison inconnue."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr ""
 "Cette commande fonctionne uniquement dans les discussions, pas les messages."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr ""
 "Cette commande fonctionne uniquement dans les messages, pas les discussions."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Cette commande ne fonctionne pas avec ce protocole."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Le message n'a pas été envoyé parce que vous n'êtes pas connecté."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -752,48 +888,69 @@
 "\n"
 "%s est en train d'écrire..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Vous avez quitté la discussion."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Archives démarrées. Les nouveaux messages de cette conversation seront "
+"archivés."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Archives arrêtées. Les nouveaux messages de cette conversation ne seront pas "
+"archivés."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Envoyer vers"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Effacer la conversation"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Afficher l'horodatage"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Ajouter une alerte..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Activer l'archivage"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Activer les sons"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<Réponse automatique> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Liste des utilisateurs :\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Les options de débuggage supportées sont : version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -802,7 +959,7 @@
 "spécifique.\n"
 "Les commandes disponibles dans le contexte actuel sont :\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -810,13 +967,13 @@
 "say &lt;message&gt; : Envoyer un message comme si les commandes étaient "
 "désactivées."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt; : Envoyer une action à la IRC à un contact ou une "
 "discussion."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -824,44 +981,44 @@
 "debug &lt;option&gt; : Mettre en place des options de débuggage dans la "
 "conversation courante."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear : Effacer le contenu de la fenêtre de conversation."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;commande&gt; : Demander de l'aide sur une commande particulière."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users : Afficher la listes des utilisateurs dans le salon."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins : Afficher la fenêtre des plugins."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist : Afficher la liste de contacts."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts : Afficher la fenêtre des comptes."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin : Afficher la fenêtre de débuggage."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs : Afficher la fenêtre des options."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses : Afficher la fenêtre des états sauvegardés."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
@@ -887,99 +1044,95 @@
 msgstr "Transfert - %d%% de %d fichiers."
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferts de fichiers"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "État"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fichier"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Taille"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Vitesse"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Reste"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "État"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Fermer cette fenêtre quand tous les transferts sont terminés"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Effacer les transferts terminés"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Arrêter"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Fermer"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Annulé"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Échec"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f Ko/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Le fichier a été sauvé sous le nom %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fini"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfert"
 
@@ -991,11 +1144,11 @@
 msgid "You have mail!"
 msgstr "Vous avez du courrier !"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Sujet"
 
@@ -1006,17 +1159,17 @@
 msgstr[0] "%s (%s) a reçu %d nouveau message."
 msgstr[1] "%s (%s) a reçu %d nouveaux messages."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Nouveau courrier"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Informations pour %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informations sur le contact"
 
@@ -1024,11 +1177,7 @@
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1629 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Infos"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1590
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Message"
 
@@ -1036,7 +1185,7 @@
 msgid "Join"
 msgstr "Discuter"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
@@ -1095,7 +1244,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -1103,7 +1252,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
@@ -1117,7 +1265,7 @@
 msgstr "Alerte pour"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Compte :"
 
@@ -1126,7 +1274,7 @@
 msgstr "Contact :"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Déclenchement quand le contact..."
 
@@ -1171,7 +1319,7 @@
 msgstr "Envoi d'un message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Action"
 
@@ -1199,70 +1347,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Alerter uniquement quand mon état est non disponible"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Récurrente"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Impossible de créer l'alerte"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Vous n'avez aucun compte."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Vous devez créer un compte avant de pouvoir créer une alerte."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'alerte sur %s pour %s ?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Alertes"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s a fait une pause dans la saisie du message (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arrêté de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se déconnecter (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est passé absent (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vous a envoyé un message. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
@@ -1270,13 +1430,13 @@
 msgid "Based on keyboard use"
 msgstr "Selon l'activité du clavier"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Depuis le dernier message envoyé"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Jamais"
 
@@ -1325,12 +1485,12 @@
 msgstr "Changer l'état en"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Archivage"
 
@@ -1338,106 +1498,106 @@
 msgid "Not implemented yet."
 msgstr "Fonction non implémentée."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Sauver le fichier..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Connexion d'un contact"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Déconnexion d'un contact"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Réception d'un message"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Début d'une conversation"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Envoi d'un message"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Quelqu'un entre dans la discussion"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Quelqu'un quitte la discussion"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Vous parlez dans la discussion"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Quelqu'un parle dans la discussion"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Quelqu'un dit votre nom d'utilisateur dans la discussion"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "Erreur GStreamer"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer n'a pas pu être initialisé."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(défaut)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Choisir un fichier son..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Préférences sonores"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profils"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Bip de console"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Commande"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Pas de son"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Méthode :"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1447,55 +1607,55 @@
 "(%s pour le nom de fichier)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Jouer les sons quand la conversation est en avant-plan"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Toujours"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Seulement quand je suis disponible"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Seulement quand je ne suis pas disponible"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Volume (0-100) :"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Événements sonores"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Événement"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fichier"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Tester"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Choisir..."
 
@@ -1512,9 +1672,9 @@
 msgid "Saved Statuses"
 msgstr "États prédéfinis"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1524,46 +1684,55 @@
 msgid "Type"
 msgstr "Type"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Utiliser"
 
@@ -1575,56 +1744,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Saisissez un titre non vide pour l'état."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Titre en double"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Saisissez un titre différent pour cet état."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sous-état"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "État :"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Message :"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Modifier l'état"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Utiliser un état différent pour les comptes suivants"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Enregistrer et utiliser"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificats"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "États"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Erreur au chargement du plugin."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Impossible de trouver l'affichage X."
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Impossible de trouver la fenêtre."
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Ce plugin ne peut pas être chargé car il n'a pas été compilé avec X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntPresse-papier"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Plugin presse-papier"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1751,86 +1941,88 @@
 msgid "accounts"
 msgstr "Comptes"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Un mot de passe est nécessaire pour la connexion."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Saisissez le mot de passe pour %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Mémoriser le mot de passe"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin pour le protocole %s manquant"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Erreur de connexion"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diffèrent"
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Veuillez renseigner toutes les rubriques."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Mot de passe courant"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Changer le mot de passe pour %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Changer les informations pour %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Modifier les informations"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contacts"
 
@@ -1838,22 +2030,185 @@
 msgid "buddy list"
 msgstr "Liste de contacts"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(NE CORRESPOND PAS)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s a fournit le certificat suivant pour un usage unique :"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Nom uisuel : %s %s\n"
+"Empreinte (SHA1) : %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Vérification de certificat à usage unique"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Autorités du certificat"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "Cache des pairs SSL"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Accepter le certificat pour %s ?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "Vérification de certificat SSL"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Accepter"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Refuser"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_Voir le certificat..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Le certificat fournit par « %s » prétend être de « %s ». Cela porrait "
+"signifier que vous ne vous connectez pas au service que vous vouliez."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Le certificat fournit par « %s » prétend est auto-signé. Il ne peut être "
+"vérifié automatiquement."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "La chaine de certificats fournie pour %s est non valide."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "Erreur de certificat SSL"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Chaine de certification non valide"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Vous n'avez pas de base de certificats racines. Ce certificat ne peut "
+"être validé."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Le certificat racine dont est prétendu issu ce certificat est inconnu de Pidgin."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"La chaine de certification fournie par %s n'a pas de signature numérique "
+"valide issue par l'autorité de certificats dont elle prétend l'origine. "
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Signature d'autorité de certificats non valide"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Nom usuel : %s\n"
+"\n"
+"Empreinte (SHA1) : %s\n"
+"\n"
+"Date d'activation : %s\n"
+"Date d'expiration : %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Informations du certificat"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Erreur de désenregistrement"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s vient de se connecter"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s a quitté"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1877,40 +2232,40 @@
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "Envoyer un _message"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon"
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon"
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon"
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
@@ -2433,12 +2788,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -2482,8 +2837,8 @@
 "terminé\n"
 "(seulement quand aucune conversation n'est ouverte avec l'expéditeur)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Notes"
 
@@ -2910,7 +3265,7 @@
 "Les messages seront enregistrés en tant qu'alerte. Vous pouvez modifier ou "
 "supprimer l'alerte dans la fenêtre « Alerte »."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2919,18 +3274,18 @@
 "« %s » est déconnecté. Voulez-vous sauver les messages dans une alerte afin "
 "de les envoyer automatiquement quand « %s » se reconnecte ?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Message déconnecté"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2940,9 +3295,9 @@
 msgid "Yes"
 msgstr "Oui"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2952,11 +3307,11 @@
 msgid "No"
 msgstr "Non"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Sauve les messages déconnectés dans une alerte."
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne jamais demander. Toujours créer une alerte."
 
@@ -3051,23 +3406,30 @@
 msgid "Tests to see that most things are working."
 msgstr "Vérifie que la plupart des choses fonctionne correctement."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "Certificats X.509"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Fournit une interface pour les bibliothèques SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
 
 #. *< type
 #. *< ui_requirement
@@ -3075,18 +3437,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
 
 #. *< type
 #. *< ui_requirement
@@ -3094,18 +3456,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Fournit une interface pour les bibliothèques SSL"
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3201,25 +3562,25 @@
 "il ?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
 msgid "First name"
 msgstr "Prénom :"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
 msgid "Last name"
 msgstr "Nom :"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3228,13 +3589,13 @@
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Compte AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Compte XMPP"
 
@@ -3248,27 +3609,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin pour le protocole Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Personne Purple"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Nom d'hôte :"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3280,31 +3632,31 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a fermé la conversation."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-#: ../libpurple/protocols/bonjour/jabber.c:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Impossible d'ouvrir la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Erreur à la mise en place des paramètres de la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Impossible d'affecter un port à la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Impossible de se mettre en écoute sur la connexion."
 
@@ -3380,47 +3732,49 @@
 msgid "Registration completed successfully!"
 msgstr "Inscription effectuée."
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Mot de passe (pour vérification)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Saisissez le jeton actuel"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Jeton actuel"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Veuillez renseigner les rubriques suivantes"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Localité"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3428,243 +3782,243 @@
 msgid "Gender"
 msgstr "Genre"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Homme ou femme"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Homme"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Femme"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "En ligne seulement"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Trouver des contacts"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Saisissez votre critère de recherche ci-dessous"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Renseignez les rubriques"
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Votre mot de passe actuel diffère de celui que vous venez de saisir."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Impossible de changer le mot de passe.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Changer le mot de passe du compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Changement de mot de passe effectué."
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Saisissez votre mot de passe et un nouveau mot de passe pour cet UIN : "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Changer le le mot de passe Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Choisissez un salon de discussions pour le contact : %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Ajouter à la discussion..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3423
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Absent"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Impossible d'afficher les résultats de la recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Annuaire public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateur qui vérifie votre critère de recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Votre liste de contacts à été récupérée depuis le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Liste de contacts envoyée"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Échec de la connexion"
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Ajouter à la discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Vous n'êtes pas connecté au serveur."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Changer de mot de passe..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Envoyer la liste de contacts sur le serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Récupérer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Sauver la liste de contacts dans un fichier..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
@@ -3679,16 +4033,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Messagerie polonaise populaire"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
@@ -3745,7 +4099,8 @@
 msgstr "Message du jour pour %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Déconnexion par le serveur"
 
@@ -3759,7 +4114,7 @@
 msgstr "_Salon :"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
@@ -3767,65 +4122,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Connexion en cours"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Impossible de créer le socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Échec de la connexion"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Échec de la poignée de main SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Sujet"
 
@@ -3837,47 +4189,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Serveur"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codages"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3893,7 +4246,7 @@
 msgid "Username"
 msgstr "Utilisateur"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3903,7 +4256,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
@@ -3934,7 +4287,7 @@
 msgstr " <i>(identifié)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4214,7 +4567,7 @@
 msgstr "names [salon] : Récupérer la liste des personnes dans un salon."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme"
 
@@ -4347,6 +4700,22 @@
 msgid "Disconnected."
 msgstr "Déconnecté"
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Erreur inconnue"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Échec de la commande Ad-Hoc"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "execute"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
@@ -4359,8 +4728,8 @@
 "Le serveur demande une authentification en texte non chiffré au travers d'un "
 "flux crypté."
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4369,33 +4738,33 @@
 "%s demande une authentification en texte clair au travers d'une connexion "
 "non cryptée. Voulez-vous autoriser ceci et continuer l'authentification ?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une méthode d'authentification non supportée"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Réponse non valide du serveur"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4404,113 +4773,114 @@
 "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 "l'authentification ?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "Erreur SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localité"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Région"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Pays"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Service"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rôle"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Modifier la carte de visite XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4518,117 +4888,386 @@
 "Toutes les rubriques ci-dessous sont facultatives. Saisissez uniquement les "
 "informations que vous désirez rendre publiques."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
-msgid "Resource"
-msgstr "Ressource"
-
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
-msgid "Priority"
-msgstr "Priorité"
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Dernière activité"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Informations du service de découverte"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
-msgid "Middle Name"
-msgstr "Deuxième prénom"
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Items du service de découverte"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
-msgid "Address"
-msgstr "Adresse"
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Adressage étendu de paragraphes"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Discussion multi-utilisateurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
-msgid "P.O. Box"
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Informations de présence des discussions multi-utilisateurs"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "Flux de données intrabandes"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Commandes ad-hoc"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "Service PubSub"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "Flux de données SOCKS5"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Données hors de la bande passante"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "Enregistrement intrabande"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Position de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Avatar de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Notifications d'état de discussions"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Version du logiciel"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Initialisation de flux"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Transfert de fichier"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Humeur de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Activité de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Possibilités de l'entité"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Négociations de session chiffrée"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "Musique de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Profil de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle audio"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Pseudo de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle Video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Reçus des messages"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Publication de clé publique"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "L'utilisateur discute"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "L'utilisateur navigue le web"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "L'utilisateur joue"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "L'utilisateur observe"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Chiffrement de paragraphe"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Temps de l'entité"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Livraison retardée"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Objets de données collaboratives"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "Répertoire de fichier et partage"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Service de découverte STUN pour Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Négociation de session chiffré simplifiée"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Vérifications des bonds"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Possibilités"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
+msgid "Resource"
+msgstr "Ressource"
+
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
+msgid "Priority"
+msgstr "Priorité"
+
+#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Middle Name"
+msgstr "Deuxième prénom"
+
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
+msgid "Address"
+msgstr "Adresse"
+
+#: ../libpurple/protocols/jabber/buddy.c:1276
+msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Connexion"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Déconnexion"
+
 # Repris du fr.po de gabber
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Bavard"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "Voici les résultats de votre recherche."
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4636,69 +5275,69 @@
 "Recherchez un utilisateur en renseignant les rubriques ci-dessous. Note : on "
 "peut utiliser % comme joker dans chaque rubrique."
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Échec de la recherche dans l'annuaire"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "Impossible de parler au serveur annuaire."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instructions du serveur : %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Rechercher un utilisateur XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Annuaire non valide"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Saisissez un annuaire d'utilisateurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Choisissez un annuaire d'utilisateurs pour la recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Annuaire de recherche"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Salon :"
 
@@ -4790,25 +5429,29 @@
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Erreur à l'initialisation de la session"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:483
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4817,55 +5460,70 @@
 "Impossible de se connecter au serveur :\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket."
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Enregistrement sur %s réussi"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Erreur inconnue"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Enregistrement de %s révoqué"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "Désnregistrement réussi"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "Échec au désenregistrement"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "État"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4875,378 +5533,541 @@
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "Se désenregistrer"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Veuillez remplir les informations ci-dessous pour modifier l'enregistrement "
+"de votre compte."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr ""
-"Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
-"compte"
+"Veuillez remplir les informations ci-dessous pour l'enregistrement du nouveau "
+"compte."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Enregistrer un nouveau compte XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Changer les informations du compte sur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Enregistrer un nouveau compte sur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Changer l'enregistrement"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "Erreur au désenregistrement du compte"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "Compte révoqué avec succès"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Initialisation SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "Source (Destination en attente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "Destination"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Aucun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "Inscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Humeur"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Texte d'humeur"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "Artistes musicaux"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "Titre musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "Album musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "Genre musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Comment"
+msgstr "Commentaire musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "Piste musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "Temps musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "Année musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "URL musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Allow Buzz"
+msgstr "Autoriser les Buzz"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Mot de passe changé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Mot de passe (confirmation)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "Changer de mot de passe XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Modifier les informations..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Chercher des contacts..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Mauvaise requête"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Conflit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Fonction non implémentée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Parti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Item non trouvé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "Non autorisé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Paiement nécessaire"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouvé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Serveur surchargé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Inscription nécessaire"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Requête non attendue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Autorisation annulée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Encodage incorrect de l'autorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Mécanisme d'autorisation non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Mécanisme d'autorisation trop faible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Échec temporaire de l'authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Échec de l'authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais préfixe de nom de domaine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Hôte perdu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Hôte inconnu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "Hôtes non correspondants"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Violation des règles"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Limitation sur la ressource"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "Voir l'autre hôte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "Arrêt du système"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Condition non définie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Codage de caractère non supporté"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non supporté"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Version non supportée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML mal formé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossible de bannir l'utilisateur %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Affiliation inconnue : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossible d'affilier l'utilisateur %s à « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rôle inconnu : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Impossible d'assigner le rôle « %s » pour l'utilisateur : %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossible d'expulser l'utilisateur %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Impossible d'envoyer un ping à l'utilisateur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "Impossible de buzzer, rien n'est connu sur l'utilisateur %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr "Impossible de buzzer, l'utilisateur %s est peut-être déconnecté."
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Impossible de buzzer, l'utilisateur %s l'interdit."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure : Configurer un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [salon] : Quitter le salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register : S'enregistrer dans un salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5254,7 +6075,7 @@
 "affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
 "Change l'affiliation d'un utilisateur dans le salon."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5262,26 +6083,35 @@
 "role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
 "Assigne à un utilisateur un rôle dans le salon."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;utilisateur&gt; [message] : Inviter un utilisateur dans le salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join &lt;room&gt; [serveur] : Entrer dans un salon sur le serveur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilisateur&gt; [salon] : Expulser un utilisateur du salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;utilisateur&gt; &lt;message&gt; : Envoyer un message privé à une "
 "personne."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt; : Envoyer un ping à un utilisateur/composant/serveur."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5292,84 +6122,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin pour le protocole XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "Nécessite SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Forcer l'ancien SSL (port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Port de connexion"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Serveur de connexion"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s a quitté la conversation."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Message de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "Le sujet est : %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Échec de la livraison du message pour %s : %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "Erreur message XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s vient de vous buzzer !"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5377,65 +6221,111 @@
 "Vous créez un nouveau salon. Voulez-vous choisir ses paramètres ou utiliser "
 "ceux par défaut ?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configurer le salon"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erreur dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arrivée dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, cet utilisateur ne supporte pas le "
 "transfert de fichiers"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Échec d'envoi de fichier"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Impossible d'envoyer le fichier à %s, JID non valide"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossible d'envoyer le fichier à %s, l'utilisateur n'est pas en ligne"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, pas d'inscription à la présence de "
 "l'utilisateur"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 "Veuillez sélectionner parmi les resources de %s, à laquelle vous voulez "
 "envoyer un fichier"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Choisissez une ressource"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "Modifier l'humeur"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Veuillez choisir votre humeur dans la liste."
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Changer"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "Changer d'humeur..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "Changer de pseudo"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "Saisissez un nouveau pseudo."
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Cette information est visible pour tous les contacts de votre liste. Veuillez "
+"choisir quelqe chose d'approprié."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Changer de pseudo..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Actions"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Choisissez une action"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5689,39 +6579,49 @@
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN : %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Vous venez d'envoyer un « Nudge. »"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Nudge"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s vient de vous nudger !"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Nudge %s..."
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Nom sous lequel les utilisateurs MSN vous verront."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Numéro de téléphone"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Numéro de téléphone au travail"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Numéro de téléphone portable"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Autoriser les messages MSN vers votre téléphone portable ?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5729,132 +6629,134 @@
 "Voulez-vous autorisez les contacts de votre liste à vous envoyer des "
 "messages MSN sur votre téléphone portable ?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Autoriser"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Interdire"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas être actif."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un téléphone portable."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Envoyer"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Vous êtes dans sa liste"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Bientôt de retour"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Parti manger"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Changer l'alias..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Changer le numéro de téléphone..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Changer le numéro au travail..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Changer le numéro de téléphone portable..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activer le service pour téléphones portables..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Autoriser les messages sur téléphones portables..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Ouvrir la boîte au lettres Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Envoyer vers un téléphone portable"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Lancer une _discussion"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "Impossible de se connecter au serveur."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Général"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Âge"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5862,188 +6764,188 @@
 msgid "Location"
 msgstr "Localisation"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "À propos de moi"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "État matrimonial"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Animaux"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Ville d'origine"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Précédents lieux de résidence"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Musique"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Infos du contact"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Compagnon/Compagne"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Téléphone personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Téléphone personnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Téléphone portable personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Télécopie personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "Adresse électronique personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "Messagerie instantanée"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Anniversaire"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Position"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Société"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Service"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Téléphone professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Téléphone professionnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Téléphone portable professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Bippeur professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Télécopie professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "Adresse électronique professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "Messagerie instantanée professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Date d'embauche"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Page web"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "L'utilisateur n'a pas créé de profil public"
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6052,7 +6954,7 @@
 "Impossible de récupérer le profil de l'utilisateur par MSN. Soit "
 "l'utilisateur n'existe pas, soit il n'a pas créé de profil public."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6060,7 +6962,7 @@
 "Impossible de récupérer des informations sur le profil de l'utilisateur. Il "
 "est possible que cet utilisateur n'existe pas."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Lien du profil"
@@ -6075,19 +6977,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Afficher les frimousses personnalisées"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : donner un « Nudge » à un contact pour attirer son attention."
 
@@ -6106,8 +7008,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
@@ -6316,33 +7218,423 @@
 "Impossible d'envoyer le message à cause d'une erreur du serveur "
 "standardiste :"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
-msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
+#: ../libpurple/protocols/msn/switchboard.c:439
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
+
+#: ../libpurple/protocols/msn/userlist.c:252
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
+
+#: ../libpurple/protocols/msn/userlist.c:321
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
+
+#: ../libpurple/protocols/msn/userlist.c:643
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Impossible d'ajouter « %s »"
+
+#: ../libpurple/protocols/msn/userlist.c:645
+msgid "The screen name specified is invalid."
+msgstr "Le nom d'utilisateur fourni est non valide."
+
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Chiffre manquant"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Le chiffre RC4 n'a pas été trouvé."
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Le plugin MySpaceIM ne sera pas chargé. Mettez à jour libpurple avec le "
+"support de RC4 (>= 2.0.1)."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Les mots de passe de plus de %d caractères (vous en avez saisi %d) ne sont "
+"pas supportés par MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "Erreur MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Lecture du défi"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Taille du défi non valide du serveur"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Connexion"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Connexion avec le serveur perdue (aucune donnée depuis %d secondes)."
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Nouveaux courrier électroniques"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Nouveaux commentaires de blog"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Nouveaux commentaires du profile"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nouvelles requêtes d'amis !"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nouveaux commentaires d'image"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Connecté"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Aucun nom d'utilisateur fourni"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Veuillez aller sur http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username et saisir un nom d'utilisateur avant de "
+"réessayer de vous connecter."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Erreur de protocole, code %d : %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Échec lors de l'ajout du contact."
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "Échec de la commande « addbuddy »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "Échec de la commande « persist »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Utilisateur inconnu : %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Recherche d'utilisateur"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Échec lors de la suppression du contact."
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "Échec de la commande « delbuddy »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "Échec de la commande « blocklist »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Condition de saisie non valide."
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Buffer de lecture plein."
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Impossible d'interpréter le message."
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Impossible de se connecter à l'hôte : %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Amis de messagerie"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d contacts ont été ajouté ou mis à jour depuis le serveur (y compris les "
+"contacts déjà sur la liste du serveur)."
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Ajouter les contacts du serveur"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Ajouter les amis de MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Échec de l'import des amis."
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Trouver des gens..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Changer de nom sur la messagerie..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "Gestionnaire d'URL myim"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Il n'y a pas de compte MySpaceIM pour cette URL myim."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Veuillez activer le compte MySpaceIM et réessayer."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Afficher le nom dans le texte d'état"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Afficher l'entête dans le texte d'état"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Envoyer les frimousses"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Résolution de l'écran (en dpi)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Taille de la police (en points)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Utilisateur"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Informations"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "En-tête"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Chanson"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Total d'amis"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Version du client"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Zap"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s vient de vous zapper !"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Zap %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Frapper"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s vient de vous frapper !"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Frappe %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Bruler"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s vient de vous bruler !"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "Brule %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Embrasser"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s vient de vous embrasser !"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Embrasse %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Étreindre"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s vient de vous étreindre !"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Étreint %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Gifler"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s vient de vous gifler !"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Gifle %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Pincer les fesses"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s vient de vous pincer les fesses !"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "Pince les fesses de %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s vient de vous faire un high-five !"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vient de vous envoyer un « Nudge. »"
+msgid "High-fiving %s..."
+msgstr "High-five avec %s..."
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Boulétiser"
+
+#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "L'utilisateur %s vous a ajouté à sa liste de contacts."
+msgid "%s has punk'd you!"
+msgstr "%s vient de vous boulétiser !"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
+msgid "Punking %s..."
+msgstr "Boulétise %s..."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Faire pffft"
+
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Impossible d'ajouter « %s »"
+msgid "%s has raspberried you!"
+msgstr "%s vient de vous faire pffft !"
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "Le nom d'utilisateur fourni est non valide."
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Pffft à %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6587,7 +7879,7 @@
 msgstr "Boîte aux lettres"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID Utilisateur"
 
@@ -6703,8 +7995,8 @@
 msgstr "Port du serveur"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6712,8 +8004,8 @@
 msgstr "Le serveur a fermé la connexion."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6762,7 +8054,7 @@
 msgstr "Plugin pour le protocole ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codage"
@@ -6792,7 +8084,7 @@
 msgid "Direct IM established"
 msgstr "Connexion directe établie."
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
@@ -6916,8 +8208,8 @@
 "des encodages différents ou le client de %s est défectueux.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icône du contact"
@@ -6939,7 +8231,7 @@
 msgstr "Discussion"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
@@ -7012,17 +8304,17 @@
 msgstr "Caméra"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Non disponible"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Occupé"
 
@@ -7032,8 +8324,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -7042,13 +8334,13 @@
 msgstr "En ligne"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "Adresse IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
@@ -7100,14 +8392,14 @@
 "soit contenir uniquement des chiffres."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Nom d'utilisateur non valide."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
@@ -7161,10 +8453,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -7201,31 +8493,31 @@
 msgid "Unable to initialize connection"
 msgstr "Impossible de créer une connexion."
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Autorise moi, s'il te plaît !"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7236,19 +8528,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %u a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7261,7 +8553,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7274,7 +8566,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7287,24 +8579,24 @@
 "Le message est :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Décliner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -7312,7 +8604,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -7320,7 +8612,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7330,21 +8622,21 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7352,55 +8644,47 @@
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Les informations ne sont pas disponibles : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Possibilités"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Message de disponibilité"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Informations"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7408,7 +8692,7 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7416,82 +8700,82 @@
 "La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Numéro de téléphone portable"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Poste"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Page web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Le nom d'utilisateur suivant est associé à %s"
 msgstr[1] "Les noms d'utilisateur suivants sont associés à %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7500,14 +8784,14 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée diffère de l'originale."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce qu'il est "
 "non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7516,7 +8800,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée est trop longue"
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7525,7 +8809,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour cet identifiant."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7534,7 +8818,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop d'identifiants associés à cette adresse."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7543,32 +8827,32 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
 "connexion directe pour envoyer des images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7578,7 +8862,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7593,11 +8877,11 @@
 "La taille maximale de %d caractères du profil a été dépassée. Il a été "
 "tronqué automatiquement."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7612,11 +8896,11 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Il a été tronqué lors de la mise à jour."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7628,17 +8912,17 @@
 "soit commencer par une lettre et contenir uniquement des lettres, des "
 "chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7647,15 +8931,15 @@
 "contacts. Elle n'est pas perdue et sera de nouveau disponible dans quelques "
 "temps."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7664,17 +8948,17 @@
 "Impossible d'ajouter le contact %s parce qu'il y a trop de contacts dans la "
 "liste. Supprimez un contact et réessayez."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7683,24 +8967,24 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %s a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7711,53 +8995,53 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussions non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
 "d'images dans les discussions AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Message d'absence"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(en cours de récupération)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "Lien de l'iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7765,66 +9049,66 @@
 "Cela révèle votre adresse IP et peut être considéré comme une faille de "
 "sécurité. Voulez-vous continuer ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "_Connecter"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Modifier le commentaire"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'état"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Demande d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Sur le web (activer ceci vous fera recevoir du pourriel !)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "Options de confidentialité ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du nom d'utilisateur permet uniquement de changer les "
 "majuscules et les espaces."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7832,73 +9116,73 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic droit du contact."
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Chercher un contact par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Modifier les informations (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afficher l'adresse courante enregistrée"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Changer l'adresse courante enregistrée..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Chercher un contact par adresse électronique..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Utiliser le groupe de contacts récents"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Afficher temps d'inactivité"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7906,26 +9190,26 @@
 "Toujours utiliser le serveur mandataire ICQ pour le transfert de fichiers\n"
 "(plus lent, mais ne révèle pas votre adresse IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Demande à %s de se connecter directement à %s:%hu pour le message"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentative de connexion vers %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Tentative de connexion au travers d'un serveur mandataire."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demande une connexion directe avec %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8134,14 +9418,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Désolé, tu n'es pas mon genre..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Refus"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Ajout d'un contact avec échec d'authentification"
@@ -8552,7 +9828,8 @@
 msgstr "Vous avez été ajouté par %s."
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Voulez-vous l'ajouter ?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8586,10 +9863,6 @@
 msgid "%s is not in your buddy list"
 msgstr "L'utilisateur %s n'est pas dans votre liste de contacts."
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Voulez-vous l'ajouter ?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Connexion terminée (en écriture)"
@@ -8653,10 +9926,6 @@
 msgid "Starting Services"
 msgstr "Démarrage des services"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Connecté"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8679,7 +9948,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
@@ -8700,37 +9969,33 @@
 msgid "Place Closed"
 msgstr "Endroit fermé"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Haut-parleurs"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Transfert de fichier"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Fonctionnalités"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Utilisateur extérieur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Créer une conférence avec l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8739,27 +10004,27 @@
 "Saisissez un sujet pour la nouvelle conférence, ainsi qu'un message "
 "d'invitation à envoyer à %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nouvelle conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Créer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Conférences disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Créer une nouvelle conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Inviter l'utilisateur à une conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8770,27 +10035,27 @@
 "l'utilisateur %s. Choisissez « Créer une nouvelle conférence » si vous "
 "désirer créer une nouvelle conférence afin d'y inviter cet utilisateur."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Inviter à une conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Inviter à une conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Envoyer une proclamation TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8799,42 +10064,42 @@
 "Aucun hôte ou adresse IP n'a été configurée pour le compte Meanwhile %s. "
 "Veuillez en saisir un ci-dessous pour continuer la connexion."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuration de la connexion Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Inconnu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Dernier client connu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Identifiant Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Un identifiant d'utilisateur ambigu a été saisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8844,15 +10109,15 @@
 "Veuillez choisir dans cette liste l'utilisateur que vous voulez ajouter à "
 "votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Choisir l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Impossible d'ajouter cet utilisateur parce qu'il est introuvable."
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8861,11 +10126,11 @@
 "L'identifiant « %s » ne correspond à aucun utilisateur dans la communauté "
 "Sametime. Cette entrée a été retirée de votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8874,63 +10139,63 @@
 "Erreur à la lecture du fichier « %s » :\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Liste de contacts stockée sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Mode de stockage de la liste de contacts"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Liste de contacts en local uniquement"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Fusionner avec la liste du serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Fusionner et envoyer la liste sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synchroniser la liste avec le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exporter la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Impossible d'ajouter ce groupe parce qu'il existe déjà."
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un group nommé « %s » existe déjà dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Correspondances possibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8941,15 +10206,15 @@
 "d'adresses Notes suivants. Veuillez choisir dans cette liste le groupe que "
 "vous voulez ajouter à votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Choisissez le carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Impossible d'ajouter ce groupe parce qu'il n'existe pas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8957,11 +10222,11 @@
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun groupe du carnet d'adresses Notes."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Groupe du carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8969,12 +10234,12 @@
 "Saisissez le nom d'un groupe de carnet d'adresses Notes dans la rubrique ci-"
 "dessous pour ajouter le groupe et ses membres dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Résultats de la recherche sur « %s »"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8985,31 +10250,30 @@
 "Vous pouvez ajouter ces utilisateurs à votre liste de contacts ou leur "
 "envoyer un message avec les boutons ci-dessous."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Aucun résultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun utilisateur de la communauté "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Aucun résultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Rechercher un utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -9017,32 +10281,32 @@
 "Saisissez un nom ou un identifiant partiel ci-dessous pour rechercher des "
 "utilisateurs correspondants dans la communauté Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Recherche d'utilisateurs"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importer une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exporter une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Ajouter un groupe de carnet d'adresses Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Recherche d'utilisateurs..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forcer la connexion (ignorer les redirections du serveur)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Cacher l'identité du client"
 
@@ -9428,13 +10692,6 @@
 msgid "User Modes"
 msgstr "Modes utilisateur"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Humeur"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10100,13 +11357,6 @@
 msgstr "Statistiques du réseau"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Échec du ping"
@@ -10263,7 +11513,7 @@
 msgstr "Votre humeur actuelle"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10663,7 +11913,7 @@
 msgstr "Protocole de conférences instantanées sécurisées"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Réseau"
 
@@ -10927,26 +12177,26 @@
 msgstr "Impossible d'envoyer."
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Impossible de se connecter."
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Impossible de créer le socket d'écoute."
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Impossible de trouver l'adresse de l'hôte."
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Impossible de résoudre le nom de l'hôte."
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Les identifiants SIP ne peuvent pas avoir d'espace ou de symbole @."
 
@@ -10958,36 +12208,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "État de publication (note : tout le mode peut vous regarder)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Utiliser UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Utiliser un serveur mandataire"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Utilisateur d'authentification"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
@@ -11151,8 +12401,8 @@
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectué."
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Groupe :"
 
@@ -11213,32 +12463,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s vient de vous envoyer un « Buzz ! »"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
-"votre liste de contacts."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11247,11 +12491,18 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
+"votre liste de contacts."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11263,11 +12514,11 @@
 "service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %"
 "s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11276,53 +12527,53 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Réception d'un message HTTP non attendu du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11331,7 +12582,7 @@
 "Connexion perdue avec %s :\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11340,111 +12591,112 @@
 "Impossible de se connecter avec %s :\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Pas à la maison"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Pas au bureau"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Pas au travail"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Apparaître connecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Paramètres de présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Commencer à griffonner"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate which ID?"
 msgstr "Activer quelle identité ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Joindre l'utilisateur dans une discussion..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Open Inbox"
 msgstr "Ouvrir la boîte au lettres"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
-msgid "You have just sent a Buzz!"
-msgstr "Vous venez d'envoyer un « Buzz ! »"
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Buzz"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzz %s..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt; : Entrer dans une discussion sur le réseau Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list : Récupérer la liste des salons du réseau Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
@@ -11458,131 +12710,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Serveur de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Serveur japonais de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Server de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Server japonais de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Langue du salon de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Serveur Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Invitation refusée"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "Impossible d'entrer dans la discussion."
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Salon de discussions inconnu"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Le salon de discussions est peut-être plein"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "Non disponible"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
-"minutes avant de pouvoir retourner dans un salon de discussions."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Vous discutez dans %s"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "Impossible de joindre le contact dans la discussion"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "Le contact n'est peut-être pas dans une discussion"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "Échec de récupération de la liste des salons de discussions"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Voix"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "Impossible de récupérer la liste des salons"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Salon de discussions utilisateur"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11697,6 +12877,78 @@
 msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Invitation refusée"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Impossible d'entrer dans la discussion."
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Salon de discussions inconnu"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Le salon de discussions est peut-être plein"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Non disponible"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
+"minutes avant de pouvoir retourner dans un salon de discussions."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Vous discutez dans %s"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Impossible de joindre le contact dans la discussion"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Le contact n'est peut-être pas dans une discussion"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Échec de récupération de la liste des salons de discussions"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Voix"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Impossible de récupérer la liste des salons"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Salon de discussions utilisateur"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problème de connexion avec le serveur YCHT"
@@ -11723,11 +12975,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossible d'écrire dans le salon %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Utilisateur"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11951,7 +13198,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s est désormais connu sous le nom de %s\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Attire l'attention de %s..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s essaie d'attiree votre attention !"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11960,20 +13217,36 @@
 "%s a invité %s dans le salon de discussions %s :\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invité %s dans le salon de discussions %s\n"
 
-#: ../libpurple/server.c:689
-msgid "Accept chat invitation?"
-msgstr "Accepter l'invitation à la discussion ?"
+#: ../libpurple/server.c:804
+msgid "Accept chat invitation?"
+msgstr "Accepter l'invitation à la discussion ?"
+
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "Échec de la connexion SSL"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "Échec de la poignée de main SSL"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "Le pair SSL a présenté un certificat non valide."
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Erreur SSL inconnue"
 
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Enlever"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
@@ -12025,12 +13298,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erreur à la lecture de « %s »."
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12039,67 +13312,67 @@
 "Une erreur est survenue à la lecture de « %s ». Il n'a pas été chargé et "
 "l'ancien fichier a été renommé « %s~ »."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d heure"
 msgstr[1] "%s, %d heures"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Impossible d'ouvrir %s : Trop de redirections"
 
-#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s."
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12108,17 +13381,17 @@
 "Impossible de réserver suffisamment de mémoire pour le contenu de %s. Il "
 "s'agit peut-être d'une attaque du serveur web."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erreur à la lecture depuis %s : %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erreur à l'écriture vers %s : %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible de se connecter à %s : %s"
@@ -12144,37 +13417,37 @@
 msgstr "Orientation de l'espace de notification"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocole :"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Alias _local :"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Mémoriser le mot de _passe"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Avertir des nouveaux _courriers"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Utiliser cette _icône pour ce compte :"
 
@@ -12208,7 +13481,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres d'environnement"
 
@@ -12230,15 +13503,15 @@
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port :"
 
@@ -12246,31 +13519,43 @@
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Impossible de sauver le nouveau compte."
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Un compte existe déjà avec les critères saisis."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Essentiel"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Créer ce nouveau compte sur le serveur"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avancé"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12294,11 +13579,11 @@
 "comptes, choisissez <b>Comptes->Modifier</b> dans le menu de la liste de "
 "contacts"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12307,218 +13592,230 @@
 "voulez entrer.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "C_ompte :"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Dé_bloquer"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Message"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "Envoyer un _fichier"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Discuter"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Rentrer auto"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576 ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Outils/Silencieux"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Il n'y a aucun compte actif permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacts/Voir les _archives..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Contacts/Afficher les contacts _déconnectés"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Contacts/Afficher les groupes _vides"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Contacts/_Afficher les informations des contacts"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Contacts/Afficher les tem_ps d'inactivité"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Contacts/Afficher"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Contacts/Afficher/Contacts _déconnectés"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Contacts/Afficher/Groupes _vides"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Contacts/Afficher/_Informations des contacts"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Contacts/Afficher/_Temps d'inactivité"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Contacts/Afficher/Icônes de _protocole"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacts/_Trier les contacts"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/Ajouter un _contact..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/C_omptes"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Comptes/_Modifier"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Outils/_Alertes"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Outils/_Certificats"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Outils/_Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Outils/Voir les archives s_ystème"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Outils/_Silencieux"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/Aid_e"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Aide/Aid_e en ligne"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Aide/À _propos de"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12527,132 +13824,132 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Pseudo du contact"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Connecté"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Dernièrement vu"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Étrange"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Fabuleux"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Génial"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactif %dj %dh %02dmin"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactif %dh %02dmin"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactif %dmin"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacts/Envoyer un message..."
 
-#: ../pidgin/gtkblist.c:3590 ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacts/Voir les informations..."
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacts/Ajouter un contact..."
 
-#: ../pidgin/gtkblist.c:3593 ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacts/Ajouter une discussion..."
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Contacts/Ajouter un groupe..."
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Outils/Filtres"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:3729 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d message non lu de %s\n"
 msgstr[1] "%d messages non lus de %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manuel"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alphabétique"
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Par état"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: ../pidgin/gtkblist.c:4018 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Déconnexion de %s"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Réactiver le compte"
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s déconnecté : %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Utilisateur :</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Mot de passe :</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Connexion"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12671,23 +13968,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Contacts/Afficher les contacts _déconnectés"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Contacts/Afficher les groupes vides"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Contacts/Afficher les informations des contacts"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Contacts/Afficher les temps d'inactivité"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Contacts/Afficher/Contacts déconnectés"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Contacts/Afficher/Groupes vides"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Contacts/Afficher/Informations des contacts"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Contacts/Afficher/Temps d'inactivité"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Contacts/Afficher/Icônes de protocole"
 
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12699,19 +14000,19 @@
 "que cela est possible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../pidgin/gtkblist.c:5516 ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "_Alias :"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Les salons de discussions ne sont pas supportés par ce protocole."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12719,7 +14020,7 @@
 "Vous n'avez pas de protocole disponible vous permettant d'entrer dans des "
 "salons de discussions."
 
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12727,42 +14028,47 @@
 "Saisissez un alias et les informations nécessaires pour le salon de "
 "discussions que vous voulez ajouter dans la liste de contacts.\n"
 
-#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Comptes/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "Modifier le c_ompte"
 
-#: ../pidgin/gtkblist.c:6603 ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Désactiver"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Activer un compte"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Comptes/Activer un compte"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Outils"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "Serveurs SSL"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12776,26 +14082,26 @@
 "%s n'essaiera pas de se reconnecter avec ce compte tant que cette erreur ne "
 "sera pas corrigée et que vous ne réactiviez pas le compte."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: ../pidgin/gtkconv.c:759 ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 "Ce contact n'utilise pas le même protocole que ce salon de discussions."
 
-#: ../pidgin/gtkconv.c:779
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Il n'y a aucun compte actif vous permettant d'inviter ce contact."
 
-#: ../pidgin/gtkconv.c:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12803,201 +14109,188 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message d'invitation facultatif."
 
-#: ../pidgin/gtkconv.c:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: ../pidgin/gtkconv.c:903 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Message :"
 
-#: ../pidgin/gtkconv.c:960 ../pidgin/gtkconv.c:2521 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossible d'ouvrir le fichier."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
-#: ../pidgin/gtkconv.c:1151 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Chercher"
 
-#: ../pidgin/gtkconv.c:1177 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Chercher : "
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Archives démarrées. Les nouveaux messages de cette conversation seront "
-"archivés."
-
-#: ../pidgin/gtkconv.c:1368
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Archives arrêtées. Les nouveaux messages de cette conversation ne seront pas "
-"archivés."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Dernières paroles"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Impossible de sauver l'icône sur le disque."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Enregistrer l'icône"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Cacher l'icône"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icône sous..."
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Changer l'icône..."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Supprimer l'icône"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Tout afficher"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/_Voir les archives"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/_Effacer la conversation"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une _alerte..."
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/Invi_ter..."
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/_Plus"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/_Donner un alias..."
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/Dé_bloquer..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insérer une ima_ge..."
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Afficher les _icônes des contacts"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Afficher la _barre de style"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Conversation/Plus"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Options"
 
@@ -13006,178 +14299,174 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3093 ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les archives"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Débloquer..."
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insérer un lien..."
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insérer une image..."
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'archivage"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les sons"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Afficher la barre de style"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Afficher l'icône des contacts"
-
-#: ../pidgin/gtkconv.c:3297 ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'écrire..."
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525 ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Envoyer vers"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Envoyer"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: ../pidgin/gtkconv.c:5609 ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: ../pidgin/gtkconv.c:6338 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "En train d'écrire"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "S'arrête d'écrire"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Votre pseudonyme apparaît"
 
-#: ../pidgin/gtkconv.c:6348 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Nouvel événement"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear : Effacer le contenu de la fenêtre de conversation."
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Confirmer la fermeture"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Vous n'avez pas lu certains messages. Êtes-vous sûr de vouloir fermer la "
 "fenêtre ?"
 
-#: ../pidgin/gtkconv.c:8111
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Fermer les autres onglets"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Fermer tous les onglets"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Détacher cet onglet"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Fermer cet onglet"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Séparer les messages et les discussions"
 
-#: ../pidgin/gtkconv.c:9213 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Par groupe"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Par compte"
 
@@ -13241,7 +14530,7 @@
 msgid "Fatal Error"
 msgstr "Erreur critique"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "codeur principal"
 
@@ -13252,8 +14541,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "codeur"
 
@@ -13265,381 +14554,388 @@
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "codeur et webmestre"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "contribuant senior/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "portage win32"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "mainteneur"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "mainteneur de libfaim"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "codeur et webmestre"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker et conducteur désigné [feignasse]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "codeur XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "auteur original"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengalî"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnien"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valencien-Catalan"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Danois"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Allemand"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Grec"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Anglais australien"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Anglais canadien"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Espéranto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonien"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Basque"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persan"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Français"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galicien"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Équipe du langage gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonésien"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Italien"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducteurs géorgiens d'Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannara"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Équipe de traduction kannara"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurde"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norvégien bokmål"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Hollandais, flamand"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norvégien"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norvégien (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugais brésilien"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pachto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Russe"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albanais"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Télougou"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh et l'équipe Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Chinois de Hong-Kong"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s est un client graphique de messagerie modulaire basé sur libpurple "
 "compatible avec AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu et QQ. Il est écrit "
-"avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce programme sous les "
-"conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une "
-"copie de la licence GPL est dans le fichier « COPYING » fourni avec %s. Tous "
-"droits réservés par les collaborateurs de %s. Consultez le fichier "
-"« COPYRIGHT » pour avoir la liste complète des collaborateurs. Aucune "
-"garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIm, Gadu-Gadu et QQ. Il "
+"est écrit avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce "
+"programme sous les conditions énoncées par la licence GNU GPL (version 2 ou "
+"ultérieure). Une copie de la licence GPL est dans le fichier « COPYING » "
+"fourni avec %s. Tous droits réservés par les collaborateurs de %s. Consultez "
+"le fichier « COPYRIGHT » pour avoir la liste complète des collaborateurs. "
+"Aucune garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgin sur irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Codeurs"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:452
 msgid "Retired Crazy Patch Writers"
 msgstr "Patcheurs fous retraités"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Informations de debug"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13647,11 +14943,11 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les informations."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Voir les archives d'un contact"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13659,32 +14955,32 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les archives."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Donner un alias à un contact"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Donner un alias à un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13699,15 +14995,15 @@
 "Vous allez supprimer le contact contenant %s et %d autres identifiants de "
 "votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13715,15 +15011,15 @@
 msgstr ""
 "Vous allez fusionner le groupe %s au groupe %s. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Fusionner des groupes"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Fusionner les groupes"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13732,30 +15028,30 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Supprimer le groupe"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13764,11 +15060,11 @@
 "Vous allez supprimer le salon de discussions %s de votre liste de contacts. "
 "Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Supprimer un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Supprimer le salon"
 
@@ -13877,7 +15173,7 @@
 msgstr "_Détails du transfert"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13886,44 +15182,44 @@
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"
 
-#: ../pidgin/gtkimhtml.c:831 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Effacer le style"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Couleur de surlignage des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Couleur pour afficher les liens hypertextes quand la souris les survole."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse électronique"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13933,7 +15229,7 @@
 "\n"
 "PNG choisi par défaut"
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13943,7 +15239,7 @@
 "\n"
 "Le type PNG est utilisé par défaut."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13954,7 +15250,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13965,35 +15261,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476 ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -14001,91 +15297,155 @@
 "Saisissez l'URL et la description du lien à inclure. La description est "
 "facultative."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Saisissez l'URL du lien à insérer."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Insérer une image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Ce thème n'a pas de frimousses."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "_Police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Regrouper les items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Dégrouper les items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Gras"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Italique"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Souligné"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Barré"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Augmenter la taille de la police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Diminuer la taille de la police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Type de police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Couleur du texte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Effacer le style"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Insérer une image"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Insérer une frimousse"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Gras</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>Itali_que</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Souligné</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Barré</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>Plus g_rand</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Pl_us petit</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "T_ype de police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "Couleur du _texte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Couleur de _fond"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "Fri_mousse"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Lien"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "Barre _horizontale"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14258,44 +15618,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s a reçu %d nouveau message."
 msgstr[1] "%s a reçu %d nouveaux messages."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Vous avez %d nouveau courrier.</b>"
 msgstr[1] "<b>Vous avez %d nouveaux courriers.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La commande « %s » pour le navigateur est non valide."
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14349,100 +15709,100 @@
 msgstr "Choisissez un fichier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Se _connecte"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Se _déconnecte"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "S'_absente"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_Revient d'absence"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Devient _inactif"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "N'est plus i_nactif"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "C_ommence à écrire"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "_Pause pendant la saisie"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "_S'arrête d'écrire"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Envoi d'un _message"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Ouvrir une _fenêtre de conversation"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Ouvrir une fenêtre de _notification"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Exécuter une c_ommande"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Alerter _uniquement quand mon état n'est pas « Disponible »"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Récurrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Par défaut"
 
@@ -14487,7 +15847,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Lorsque absent"
 
@@ -14584,11 +15944,11 @@
 msgid "Conversation _font:"
 msgstr "Police des _conversations :"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Style par défaut"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14596,119 +15956,119 @@
 "Le texte des messages envoyés apparaîtra comme ceci avec les protocoles "
 "supportant l'ajout du style."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "Serveur ST_UN :"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Détection auto de l'adresse IP"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Spécifier _manuellement la plage de ports à écouter"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Premier port : "
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Dernier port :"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Aucun"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opéra"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Navigateur de Gnome"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Ouvrir les liens :"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Dans une fenêtre ouverte"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14717,63 +16077,63 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "_Format des archives :"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Archiver tous les _messages"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Archiver toutes les _discussions"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Archiver tous les _changements d'état dans les archives système"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Choix des sons"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Le plus silencieux"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Très silencieux"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Silencieux"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Fort"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Très fort"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Le plus fort"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Pas de son"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14782,81 +16142,81 @@
 "_Commande pour le son :\n"
 "(%s pour le nom de fichier)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons quand la conversation est en _avant-plan"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Activer les sons :"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Volume :"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Jouer"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Rapporter le temps d'inactivité :"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Selon l'activité du clavier ou de la souris"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Réponse automatique :"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Changer d'état lorsque _inactif"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes avant de passer inactif :"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "_Changer l'état en :"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "État au démarrage"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Utiliser l'état à la _fermeture"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "État _utilisé au démarrage :"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Thèmes des frimousses"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Navigateur"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "État / Inactivité"
 
@@ -14945,23 +16305,23 @@
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Choisir un nouveau nom"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Choisir un dossier..."
 
@@ -15001,7 +16361,7 @@
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "É_tat :"
 
@@ -15015,7 +16375,7 @@
 msgid "Sa_ve & Use"
 msgstr "Enregistrer _et utiliser"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "État pour %s"
@@ -15028,21 +16388,21 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "L'erreur suivante est survenue au chargement de %s : %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Impossible de charger l'image."
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossible d'envoyer le dossier %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15051,12 +16411,12 @@
 "%s ne peut pas transférer les dossiers. Vous devez envoyer les fichiers du "
 "dossier individuellement."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Vous avez déposé une image."
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15064,23 +16424,23 @@
 "Vous pouvez envoyer cette image à votre correspondant, l'incorporer dans ce "
 "message ou l'utiliser en tant qu'icône pour cet utilisateur."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Utiliser comme icône"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Envoyer l'image"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Insérer dans un message"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voulez-vous l'utiliser en tant qu'icône pour cette utilisateur ?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15088,7 +16448,7 @@
 "Vous pouvez envoyer cette image à votre correspondant ou l'utiliser en tant "
 "qu'icône pour cet utilisateur."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15101,11 +16461,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Impossible d'envoyer ce lien."
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15113,7 +16473,7 @@
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15124,27 +16484,27 @@
 "<b>Taille du fichier :</b> %s\n"
 "<b>Taille de l'image :</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Le fichier « %s » est trop gros pour %s. Veuillez choisir une image plus "
 "petite.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Erreur d'icône"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Impossible de changer d'icône."
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Impossible d'ouvrir le fichier « %s » : %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15160,31 +16520,31 @@
 msgid "Select color"
 msgstr "Choisir la couleur"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Fermer les _onglets"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Récupérer les infos"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Inviter"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Ouvrir le courrier"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Frimousses de Pidgin"
 
@@ -15361,18 +16721,6 @@
 msgid "Select Color for %s"
 msgstr "Choisissez la couleur pour %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Gras"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Italique"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Souligné"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorer les styles reçus"
@@ -15621,15 +16969,6 @@
 msgid "E-mail:"
 msgstr "Adresse électronique :"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Commentaires :</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15651,6 +16990,15 @@
 "Vérifie que tous les signaux de l'interface graphique fonctionnent "
 "correctement."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Commentaires :</b> %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historique"
@@ -15702,11 +17050,11 @@
 msgid "Draw Markerline in "
 msgstr "Dessine les lignes de démarcation dans :"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Les fenêtres de _messages"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Les fenêtres de _discussions"
 
@@ -15722,32 +17070,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Partie de messagerie musicale confirmée."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Messagerie musicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Un conflit a eu lieu en exécutant la commande :"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Erreur à l'exécution de l'éditeur"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "L'erreur suivante est survenue :"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Configuration de messagerie musicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Chemin de l'éditeur de partitions"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Appliquer"
 
@@ -15759,12 +17107,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin de messagerie musicale pour la composition collaborative."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15773,74 +17121,74 @@
 "de musique en modifiant une partition commune en temps réel."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notification pour"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Seulement quand on dit votre pseudonyme"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fenêtres actives"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Méthode de notification"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Préfixer un _texte au titre de la fenêtre :"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Mettre le n_ombre de nouveaux messages dans le titre de la fenêtre"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Mettre le nombre de nouveaux messages dans une propriété _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Envoyer le message « _URGENT » au gestionnaire de fenêtres"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Passer la conversation en _avant plan"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Suppression de la notification"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Supprimer quand la _fenêtre devient active"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Supprimer quand la fenêtre est _cliquée"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Supprimer lors de l'éc_riture dans la fenêtre"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Supprimer sur envoi d'un _message"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Supprimer lors du changement d'_onglet"
 
@@ -15850,7 +17198,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notification de message"
 
@@ -15858,7 +17206,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Fournit différents moyens d'avertissement de messages non lus."
 
@@ -16230,44 +17578,44 @@
 "Permet à l'utilisateur de personnaliser dans les conversions et les archives "
 "la manière dont est affiché l'horodatage."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacité :"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Fenêtres de conversation"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Fenêtre de _conversation transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Afficher la barre de défilement dans la fenêtre"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Supprimer la transparence pour les fenêtres de conversation actives"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Toujours en avant plan"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Fenêtre de la liste de contacts"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Fenêtre de la liste de _contacts transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Supprimer la transparence quand la liste des contacts est active"
 
@@ -16277,19 +17625,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparence variable pour la liste de contacts et les conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16301,47 +17649,47 @@
 "\n"
 "Note : Ce plugin nécessite Windows 2000 ou plus récent."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Version des bibliothèques GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Démarrage"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Démarrer %s au lancement de Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Liste de contacts _accrochable"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Liste de contacts toujours _visible :"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Seulement quand la fenêtre est accrochée"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Faire clignoter la fenêtre dans les discussions actives"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Options de Pidgin Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options spécifiques à Pidgin Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -16395,6 +17743,45 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
+#~ msgid "nudged"
+#~ msgstr "nudgé"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Vous venez d'envoyer un « Nudge. »"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vient de vous envoyer un « Nudge. »"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s vient de vous envoyer un « Buzz ! »"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Vous venez d'envoyer un « Buzz ! »"
+
+#~ msgid "buzzed"
+#~ msgstr "buzzé"
+
+#~ msgid "Attention! %s %s."
+#~ msgstr "Attention ! %s %s."
+
+#~ msgid "Attention!"
+#~ msgstr "Attention !"
+
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Attention ! Vous avez été %s."
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Voulez-vous l'ajouter ?"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Options/Afficher les _icônes des contacts"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Options/Afficher l'icône des contacts"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvégien"
+
 #~ msgid "Socket send error"
 #~ msgstr "Erreur à l'envoi sur le socket."
 
diff -ru pidgin-2.1.1/po/gl.po pidgin-2.2.0/po/gl.po
--- pidgin-2.1.1/po/gl.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/gl.po	2007-09-14 00:45:43.000000000 -0400
@@ -11270,7 +11270,7 @@
 msgstr "Que ID activar?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3406
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "A quen quere unir á conversa?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3418
diff -ru pidgin-2.1.1/po/gu.po pidgin-2.2.0/po/gu.po
--- pidgin-2.1.1/po/gu.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/gu.po	2007-09-14 00:45:43.000000000 -0400
@@ -10469,7 +10469,7 @@
 msgstr "કયું ID સક્રિય કરવું છે?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "જોડાવ કે કોણ સંવાદમાં છે?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/he.po pidgin-2.2.0/po/he.po
--- pidgin-2.1.1/po/he.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/he.po	2007-09-14 00:45:43.000000000 -0400
@@ -11164,7 +11164,7 @@
 msgstr "איזה ID להפעיל?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "להצטרף למי בצ'אט?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/hi.po pidgin-2.2.0/po/hi.po
--- pidgin-2.1.1/po/hi.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/hi.po	2007-09-14 00:45:43.000000000 -0400
@@ -10987,7 +10987,7 @@
 msgstr "कोनसा आइ डी क्रियांवित करें?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "किससे संवाद करें ?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/hu.po pidgin-2.2.0/po/hu.po
--- pidgin-2.1.1/po/hu.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/hu.po	2007-09-14 00:45:43.000000000 -0400
@@ -1,3 +1,4 @@
+# translation of pid.hu.po to Hungarian
 # Hungarian translation of gaim.
 # Copyright (C) 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gaim package.
@@ -9,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: gaim 2.0-beta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-21 00:01-0400\n"
-"PO-Revision-Date: 2007-05-22 13:31+0200\n"
+"POT-Creation-Date: 2007-09-09 03:22-0400\n"
+"PO-Revision-Date: 2007-09-10 12:28+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +20,19 @@
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Próbálja a \"%s -h\" parancsot további információkért.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -45,600 +53,509 @@
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274
-#: ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301
-#: ../pidgin/gtkmain.c:685
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
-msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
-msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
-
-#: ../finch/gntaccount.c:119
-#: ../finch/gntblist.c:288
-#: ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426
-#: ../finch/gntplugin.c:181
-#: ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294
-#: ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az "
+"átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://"
+"developer.pidgin.im oldalon."
+
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
-#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1218
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Hiba"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "A fiók nem lett felvéve"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Fiók megjelenő neve nem lehet üres."
 
-#: ../finch/gntaccount.c:423
-#: ../pidgin/gtkaccount.c:590
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
-#: ../finch/gntaccount.c:433
-#: ../pidgin/gtkaccount.c:519
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Emlékezzen a jelszóra"
 
-#: ../finch/gntaccount.c:474
-#: ../pidgin/gtkaccount.c:1456
-#: ../pidgin/gtkblist.c:3965
+#: ../finch/gntaccount.c:484
+msgid "There's no protocol plugins installed."
+msgstr "Nincsenek protokollbővítmények telepítve."
+
+#: ../finch/gntaccount.c:485
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(valószínűleg elfelejtette kiadni a \"make install\" parancsot)"
+
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Fiók módosítása"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Új fiók"
 
-#: ../finch/gntaccount.c:500
-#: ../pidgin/gtkaccount.c:427
-#: ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/gtkaccount.c:435
-#: ../pidgin/gtkblist.c:5389
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:528
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Felhasználónév:"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkaccount.c:510
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../finch/gntaccount.c:531
-#: ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5773
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Álnév:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554
-#: ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838
-#: ../finch/gntblist.c:332
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436
-#: ../finch/gntblist.c:768
-#: ../finch/gntblist.c:965
-#: ../finch/gntblist.c:1061
-#: ../finch/gntblist.c:2155
-#: ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:654
-#: ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142
-#: ../finch/gntstatus.c:475
-#: ../finch/gntstatus.c:600
-#: ../libpurple/account.c:984
-#: ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1168
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
+#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259
-#: ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293
-#: ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6004
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330 ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6095
+#: ../libpurple/protocols/oscar/peer.c:1042
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
 #: ../libpurple/protocols/sametime/sametime.c:5397
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3231
-#: ../libpurple/protocols/yahoo/yahoo.c:3242
-#: ../pidgin/gtkaccount.c:1894
-#: ../pidgin/gtkaccount.c:2485
-#: ../pidgin/gtkblist.c:5829
-#: ../pidgin/gtkdialogs.c:725
-#: ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955
-#: ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999
-#: ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166
-#: ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232
-#: ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:302
-#: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566
-#: ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607
-#: ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270
-#: ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:757 ../pidgin/gtkdialogs.c:896
+#: ../pidgin/gtkdialogs.c:988 ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1102 ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1199 ../pidgin/gtkdialogs.c:1238
+#: ../pidgin/gtkdialogs.c:1265 ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Mégsem"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558
-#: ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:478
-#: ../finch/gntstatus.c:588
-#: ../libpurple/account.c:1268
+#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1054 ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583
-#: ../pidgin/gtkdebug.c:747
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Mentés"
 
-#: ../finch/gntaccount.c:611
-#: ../pidgin/gtkaccount.c:1886
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Biztos, hogy törölni akarja %s fiókot?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Fiók törlése"
 
 #. Delete button
-#: ../finch/gntaccount.c:616
-#: ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653
-#: ../finch/gntpounce.c:714
-#: ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204
-#: ../pidgin/gtkaccount.c:1893
-#: ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../finch/gntaccount.c:646
-#: ../finch/gntblist.c:2060
-#: ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2311
-#: ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Fiókok"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "A következő lista fiókjait engedélyezheti/tilthatja le."
 
 #. Add button
-#: ../finch/gntaccount.c:675
-#: ../finch/gntaccount.c:837
-#: ../finch/gntblist.c:331
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:436
-#: ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699
-#: ../finch/gntstatus.c:194
-#: ../libpurple/protocols/gg/gg.c:878
-#: ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599
-#: ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkblist.c:5828
-#: ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. Modify button
-#: ../finch/gntaccount.c:679
-#: ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Módosítás"
 
-#: ../finch/gntaccount.c:760
-#: ../pidgin/gtkaccount.c:2431
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s felvette %s partnert %s%s"
 
-#: ../finch/gntaccount.c:833
-#: ../pidgin/gtkaccount.c:2483
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Felveszi a partnert a partnerlistájára?"
 
-#: ../finch/gntaccount.c:887
-#: ../pidgin/gtkaccount.c:2535
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
 
-#: ../finch/gntaccount.c:907
-#: ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2558
-#: ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Engedélyezi a partnert?"
 
-#: ../finch/gntaccount.c:911
-#: ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2559
-#: ../pidgin/gtkaccount.c:2565
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Engedélyezés"
 
-#: ../finch/gntaccount.c:912
-#: ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2560
-#: ../pidgin/gtkaccount.c:2566
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Elutasítás"
 
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Meg kell adnia a partner megjelenő nevét."
 
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Meg kell adnia egy csoportot."
 
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Ki kell választania egy fiókot."
 
-#: ../finch/gntblist.c:284
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "A kiválasztott fiók nem online."
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Hiba a partner hozzáadásakor"
 
-#: ../finch/gntblist.c:313
-#: ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1969
-#: ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Felhasználónév"
 
-#: ../finch/gntblist.c:316
-#: ../finch/gntblist.c:393
-#: ../finch/gntblist.c:1209
-#: ../libpurple/protocols/msn/msn.c:1359
-#: ../libpurple/protocols/silc/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1401
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998
-#: ../pidgin/gtkdialogs.c:1020
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Álnév"
 
-#: ../finch/gntblist.c:319
-#: ../finch/gntblist.c:396
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Csoport"
 
-#: ../finch/gntblist.c:323
-#: ../finch/gntblist.c:384
-#: ../finch/gntblist.c:1259
-#: ../finch/gntnotify.c:171
-#: ../finch/gntstatus.c:566
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965
-#: ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269
-#: ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Fiók"
 
-#: ../finch/gntblist.c:329
-#: ../finch/gntblist.c:817
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../pidgin/gtkblist.c:5343
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5477
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Partner felvétele"
 
-#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Adja meg a partnerinformációkat."
 
-#: ../finch/gntblist.c:356
-#: ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Csevegések"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:390
-#: ../libpurple/protocols/jabber/jabber.c:809
-#: ../libpurple/protocols/msn/msn.c:1532
-#: ../libpurple/protocols/msn/msn.c:1597
-#: ../libpurple/protocols/msn/msn.c:1624
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590 ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Név"
 
-#: ../finch/gntblist.c:399
-#: ../finch/gntblist.c:819
-#: ../pidgin/gtkblist.c:5719
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Automatikus csatlakozás"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Csevegés hozzáadása"
 
-#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Később a helyi menüből további információkat is módosíthat."
 
-#: ../finch/gntblist.c:413
-#: ../finch/gntblist.c:426
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Hiba a csoport hozzáadásakor"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Meg kell adnia a felvenni kívánt csoport nevét."
 
-#: ../finch/gntblist.c:427
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Ilyen nevű csoport már létezik."
 
-#: ../finch/gntblist.c:434
-#: ../finch/gntblist.c:821
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:5825
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Csoport felvétele"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Adja meg a csoport nevét"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Csevegés szerkesztése"
 
-#: ../finch/gntblist.c:767
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Frissítse a szükséges mezőket."
 
-#: ../finch/gntblist.c:768
-#: ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: ../finch/gntblist.c:784
-msgid "Auto-join"
-msgstr "Automatikus csatlakozás"
-
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Beállítások szerkesztése"
 
-#: ../finch/gntblist.c:831
-#: ../finch/gntconv.c:317
-#: ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Információk"
 
-#: ../finch/gntblist.c:831
-#: ../finch/gntconv.c:317
-#: ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:677
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Lekérés..."
 
-#: ../finch/gntblist.c:864
-#: ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Információ lekérése"
 
-#: ../finch/gntblist.c:868
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Partnerfigyelmeztetés felvétele"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:875
-#: ../finch/gntconv.c:430
-#: ../libpurple/protocols/oscar/oscar.c:636
-#: ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: ../finch/gntblist.c:879
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Napló megtekintése"
 
-#: ../finch/gntblist.c:960
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Kérem adja meg új  %snevét"
 
-#: ../finch/gntblist.c:962
-#: ../finch/gntblist.c:1209
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Álnév beállítása"
 
-#: ../finch/gntblist.c:963
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "A név visszaállításához üres karakterláncot adjon meg."
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "A kapcsolat eltávolítása a kapcsolat partnereit is eltávolítja"
 
-#: ../finch/gntblist.c:1047
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "A csoport eltávolítása a csoportban található partnereket is eltávolítja"
 
-#: ../finch/gntblist.c:1052
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Biztos, hogy törölni akarja a következőt: %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1055
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Eltávolítás jóváhagyása"
 
-#: ../finch/gntblist.c:1060
-#: ../finch/gntblist.c:1211
-#: ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1135
-#: ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Buddy List
-#: ../finch/gntblist.c:1185
-#: ../finch/gntblist.c:2232
-#: ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77
-#: ../pidgin/gtkblist.c:4209
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Partnerlista"
 
-#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Hely megcímkézve"
 
-#: ../finch/gntblist.c:1221
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Címke átváltása"
 
 #. General
-#: ../finch/gntblist.c:1254
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045
-#: ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
-#: ../libpurple/protocols/msn/msn.c:1367
-#: ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409 ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042
-#: ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Becenév"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1274
-#: ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:516
-#: ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:553 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686
-#: ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3399
-#: ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Inaktív"
 
-#: ../finch/gntblist.c:1363
+#: ../finch/gntblist.c:1333
+msgid "On Mobile"
+msgstr "Mobilon"
+
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -647,12 +564,12 @@
 "Elérhető: %d\n"
 "Összesen: %d"
 
-#: ../finch/gntblist.c:1372
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Fiók: %s (%s)"
 
-#: ../finch/gntblist.c:1384
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -661,188 +578,164 @@
 "\n"
 "Utoljára látszott: %s"
 
-#: ../finch/gntblist.c:1649
-#: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Új..."
 
-#: ../finch/gntblist.c:1656
-#: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Mentett..."
 
-#: ../finch/gntblist.c:2028
-#: ../finch/gntplugin.c:244
-#: ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:523
-#: ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../finch/gntblist.c:2136
-#: ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844
-#: ../pidgin/gtkdialogs.c:925
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Név"
 
-#: ../finch/gntblist.c:2141
-#: ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849
-#: ../pidgin/gtkdialogs.c:930
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "_Fiók"
 
-#: ../finch/gntblist.c:2149
-#: ../pidgin/gtkdialogs.c:719
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Új azonnali üzenet"
 
-#: ../finch/gntblist.c:2151
-#: ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek üzenni szeretne."
 
-#: ../finch/gntblist.c:2154
-#: ../finch/gntconn.c:48
-#: ../finch/gntnotify.c:77
-#: ../libpurple/account.c:983
-#: ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258
-#: ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292
-#: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6003
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3241
-#: ../pidgin/gtkblist.c:3964
-#: ../pidgin/gtkdialogs.c:724
-#: ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954
-#: ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/msn/msn.c:295 ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329 ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6094
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:756 ../pidgin/gtkdialogs.c:895
+#: ../pidgin/gtkdialogs.c:987 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Rendben"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2174
-#: ../finch/gntpounce.c:444
-#: ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Üzenet küldése..."
 
-#: ../finch/gntblist.c:2184
+#: ../finch/gntblist.c:2250
+msgid "Show empty groups"
+msgstr "Üres csoportok megjelenítése"
+
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../finch/gntblist.c:2190
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Állapot szerint"
 
-#: ../finch/gntblist.c:2194
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "ABC sorrend"
 
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Naplóméret szerint"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s kapcsolata megszakadt."
 
-#: ../finch/gntconn.c:42
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
-"%s kapcsolata megszakadt a következő hiba miatt:\n"
-"%s"
-
-#: ../finch/gntconn.c:45
-#: ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3961
-msgid "Connection Error"
-msgstr "Kapcsolódási hiba"
-
-#: ../finch/gntconn.c:49
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3966
-msgid "Connect"
-msgstr "Kapcsolódás"
+"%s\n"
+"\n"
+"A Finch nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
+"hibát és nem engedélyezi újra a fiókot."
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Nincs ilyen parancs."
 
-#: ../finch/gntconv.c:120
-#: ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a parancsnak."
+msgstr ""
+"Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a "
+"parancsnak."
 
-#: ../finch/gntconv.c:125
-#: ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "A parancs végrehajtása ismeretlen ok miatt sikertelen."
 
-#: ../finch/gntconv.c:130
-#: ../pidgin/gtkconv.c:519
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Ez a parancs csak csevegéskor működik, azonnali üzeneteknél nem."
 
-#: ../finch/gntconv.c:133
-#: ../pidgin/gtkconv.c:522
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Ez a parancs csak azonnali üzeneteknél működik, csevegéskor nem."
 
-#: ../finch/gntconv.c:137
-#: ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Ez a parancs nem működik ezzel a protokollal."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "A parancsok még nem támogatottak. Az üzenet NEM lett elküldve."
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Az üzenet nem küldhető el, mivel nincs bejelentkezve."
 
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258
-#: ../finch/gntconv.c:619
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -851,115 +744,129 @@
 "\n"
 "%s gépel..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Elhagyta ezt a csevegést."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Küldés ennek"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Társalgás"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Előzmények törlése"
 
-#: ../finch/gntconv.c:407
-#: ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Időbélyegek"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Partnerfigyelmeztetés felvétele..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Naplózás engedélyezése"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Hangok engedélyezése"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Felhasználólista:\n"
 
-#: ../finch/gntconv.c:847
-#: ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "A támogatott hibakeresési parancsok:  version"
 
-#: ../finch/gntconv.c:882
-#: ../pidgin/gtkconv.c:425
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Nincs ilyen parancs (ebben a kontextusban)."
 
-#: ../finch/gntconv.c:885
-#: ../pidgin/gtkconv.c:428
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának megtekintéséhez.\n"
+"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának "
+"megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
-#: ../finch/gntconv.c:943
-#: ../pidgin/gtkconv.c:7085
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
 msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancsot."
 
-#: ../finch/gntconv.c:946
-#: ../pidgin/gtkconv.c:7088
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy csevegésnek."
+msgstr ""
+"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
+"csevegésnek."
 
-#: ../finch/gntconv.c:949
-#: ../pidgin/gtkconv.c:7091
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi társalgásba."
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a "
+"jelenlegi társalgásba."
 
-#: ../finch/gntconv.c:952
-#: ../pidgin/gtkconv.c:7094
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Törli a társalgás előzményeit."
 
-#: ../finch/gntconv.c:955
-#: ../pidgin/gtkconv.c:7097
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;parancs&gt;: Egy adott parancs súgója."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: A csevegés felhasználólistájának megjelenítése."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: A bővítmények ablak megjelenítése."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: A partnerlista megjelenítése."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: A fiókok ablak megjelenítése."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: A hibakereső ablak megjelenítése."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: A beállítások ablak megjelenítése."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: A mentett állapotok ablak megjelenítése."
 
-#: ../finch/gntdebug.c:230
-#: ../finch/gntui.c:79
-#: ../pidgin/gtkdebug.c:693
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Hibakereső ablak"
 
@@ -967,234 +874,199 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251
-#: ../pidgin/gtkdebug.c:752
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Szűrő:"
 
-#: ../finch/gntdebug.c:261
-#: ../pidgin/gtkdebug.c:761
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../finch/gntft.c:117
-#: ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Fájlátvitelek - %2$d fájl %1$d százaléka"
 
-#: ../finch/gntft.c:122
-#: ../finch/gntft.c:194
-#: ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233
-#: ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Fájlátvitel"
 
-#: ../finch/gntft.c:197
-#: ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Folyamat"
 
-#: ../finch/gntft.c:197
-#: ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../finch/gntft.c:197
-#: ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Méret"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Sebesség"
 
-#: ../finch/gntft.c:197
-#: ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Hátralévő"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197
-#: ../finch/gntstatus.c:537
-#: ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034
-#: ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3049
-#: ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066
-#: ../pidgin/gtkblist.c:3068
-#: ../pidgin/gtksavedstatuses.c:943
-#: ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Állapot"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Ezen ablak bezárása az összes átvitel befejeződésekor"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Befejezett átvitelek törlése"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Leállítás"
 
 #. Close button
-#: ../finch/gntft.c:233
-#: ../finch/gntnotify.c:179
-#: ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291
-#: ../finch/gntpounce.c:722
-#: ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375
-#: ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2458
+#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:412 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../finch/gntft.c:299
-#: ../pidgin/gtkft.c:168
-#: ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-#: ../finch/gntft.c:366
-#: ../pidgin/gtkft.c:165
-#: ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Megszakítva"
 
-#: ../finch/gntft.c:368
-#: ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: ../finch/gntft.c:414
-#: ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/mp"
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/mp"
 
-#: ../finch/gntft.c:425
-#: ../finch/gntft.c:426
-#: ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "A fájl %s néven került mentésre."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: ../finch/gntft.c:428
-#: ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Átvitel"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-mailek"
 
-#: ../finch/gntnotify.c:168
-#: ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Levele érkezett!"
 
-#: ../finch/gntnotify.c:171
-#: ../libpurple/protocols/jabber/jabber.c:1174
-msgid "From"
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+msgid "Sender"
 msgstr "Feladó"
 
-#: ../finch/gntnotify.c:171
-#: ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) %d új üzenetet kapott."
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
-#: ../finch/gntnotify.c:222
-#: ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Új e-mail"
 
-#: ../finch/gntnotify.c:287
-#: ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "%s információi"
 
-#: ../finch/gntnotify.c:288
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Partnerinformáció"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../finch/gntnotify.c:372
-#: ../pidgin/gtkconv.c:1627
-#: ../pidgin/gtkdebug.c:833
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Információ"
 
-#: ../finch/gntnotify.c:375
-#: ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Azonnali üzenet"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../finch/gntnotify.c:381
-#: ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ../finch/gntplugin.c:73
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "HIBA"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "a bővítmény betöltése sikertelen"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "a bővítmény eltávolítása meghiúsult"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1211,432 +1083,605 @@
 "Weboldal: %s\n"
 "Fájlnév: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "A bővítményt be kell tölteni, mielőtt beállíthatná."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "A bővítménynek nincsenek beállításai."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "A következő lista bővítményeit töltheti be vagy távolíthatja el."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Bővítmény beállítása"
 
-#: ../finch/gntplugin.c:352
-#: ../finch/gntplugin.c:359
-#: ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:1953
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../finch/gntpounce.c:180
-#: ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Adjon meg egy figyelendő partnert."
 
-#: ../finch/gntpounce.c:325
-#: ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Új partnerfigyelmeztetés"
 
-#: ../finch/gntpounce.c:325
-#: ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Partnerfigyelmeztetés szerkesztése"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Kinél figyelmeztet"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333
-#: ../finch/gntstatus.c:446
-#: ../pidgin/gtkblist.c:5437
-#: ../pidgin/gtkblist.c:5753
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Fiók:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Partner neve:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371
-#: ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Figyelmeztetés, ha a partner..."
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "Bejelentkezik"
 
-#: ../finch/gntpounce.c:374
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "Kijelentkezik"
 
-#: ../finch/gntpounce.c:375
+#: ../finch/gntpounce.c:377
 msgid "Goes away"
 msgstr "A partner elmegy"
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:378
 msgid "Returns from away"
 msgstr "Visszatér távollétből"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:379
 msgid "Becomes idle"
 msgstr "Inaktív lesz"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "Már nem inaktív"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "Elkezd gépelni"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "Felfüggeszti a gépelést"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "Abbahagyja a gépelést"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "Üzenetet küld"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411
-#: ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Művelet"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Azonnali üzenőablak megnyitása"
 
-#: ../finch/gntpounce.c:414
+#: ../finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Értesítés megjelenítése"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Üzenet küldése"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Parancs végrehajtása"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Hang lejátszása"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "Csak akkor figyelmeztet, ha az állapotom nem érhető el"
 
-#: ../finch/gntpounce.c:447
-#: ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Ismétlődő"
 
-#: ../finch/gntpounce.c:649
-#: ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Nem hozható létre figyelmeztetés"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Nincs egyetlen fiókja sem."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "A figyelmeztetések létrehozása előtt létre kell hoznia egy fiókot."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Biztos, hogy törölni akarja %s figyelmeztetését a következőnek: %s?"
 
-#: ../finch/gntpounce.c:682
-#: ../finch/gntui.c:78
-#: ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Partnerfigyelmeztetések"
 
-#: ../finch/gntpounce.c:794
-#: ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s gépelni kezdett Önnek (%s)"
 
-#: ../finch/gntpounce.c:796
-#: ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s szünetet tart az Önnek gépelés közben (%s)"
 
-#: ../finch/gntpounce.c:798
-#: ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s belépett (%s)"
 
-#: ../finch/gntpounce.c:800
-#: ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s inaktív állapota megszűnt (%s)"
 
-#: ../finch/gntpounce.c:802
-#: ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s visszatért (%s)"
 
-#: ../finch/gntpounce.c:804
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s abbahagyta a gépelést (%s)"
 
-#: ../finch/gntpounce.c:806
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s kilépett (%s)"
 
-#: ../finch/gntpounce.c:808
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s állapota inaktív (%s)"
 
-#: ../finch/gntpounce.c:810
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s távol van. (%s)"
 
-#: ../finch/gntpounce.c:812
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s egy üzenetet küldött. (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Billentyűzet használata alapján"
 
-#: ../finch/gntprefs.c:81
-#: ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Utolsó elküldött üzenettől"
 
-#: ../finch/gntprefs.c:83
-#: ../pidgin/gtkprefs.c:820
-#: ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813
-#: ../pidgin/gtkprefs.c:1827
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Soha"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Inaktivitási idők megjelenítése"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Partnerek figyelmeztetése, ha nekik gépel"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Naplóformátum"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Üzenetek naplózása"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Csevegések naplózása"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Állapotváltozások naplózása"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Inaktivitás idejének jelentése"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Állapot módosítása, ha inaktív"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Állapot módosítása ennyi perc után"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Állapot megváltoztatása a következőre"
+
 #. Conversations
-#: ../finch/gntprefs.c:241
-#: ../pidgin/gtkprefs.c:898
-#: ../pidgin/gtkprefs.c:1917
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Társalgások"
 
-#: ../finch/gntprefs.c:242
-#: ../pidgin/gtkprefs.c:1355
-#: ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Naplózás"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
-#: ../finch/gntrequest.c:597
-#: ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Fájl mentése..."
 
-#: ../finch/gntrequest.c:597
-#: ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Fájl megnyitása..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Partner belép"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Partner kilép"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Üzenet fogadása"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Társalgás kezdetét jelző üzenet"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Üzenet elküldve"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Egy személy csatlakozik a csevegéshez"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Egy személy elhagyja a csevegést"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Ön beszél a csevegésben"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Mások beszélnek a csevegésben"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer hiba"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "A GStreamer inicializálása meghiúsult."
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(alapértelmezett)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "Válasszon hangfájlt..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "Hangbeállítások"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "Profilok"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "Automatikus"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "Konzolos hangjelzés"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "Parancs"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "Nincsenek hangok"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "Hangrendszer"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "Módszer: "
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Hanglejátszó parancs\n"
+"(%s fájlnév megadásához)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "Hangbeállítások"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "Hangok lejátszása, ha a társalgás ablaka aktív"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Mindig"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "Csak ha elérhető"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "Csak ha nem érhető el"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "Hangerő (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "Hangesemények"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "Esemény"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "Fájl"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "Teszt"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "Visszaállítás"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "Kiválasztás..."
+
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Biztos, hogy törölni akarja a következőt: \"%s\"?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Állapot törlése"
 
-#: ../finch/gntstatus.c:170
-#: ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
-#: ../finch/gntstatus.c:177
-#: ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Beosztás"
 
-#: ../finch/gntstatus.c:177
-#: ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Típus"
 
-#: ../finch/gntstatus.c:177
-#: ../finch/gntstatus.c:554
-#: ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1072
-#: ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610
-#: ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624
-#: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5464
-#: ../libpurple/protocols/oscar/oscar.c:5682
-#: ../libpurple/protocols/oscar/oscar.c:5696
-#: ../libpurple/protocols/oscar/oscar.c:5712
-#: ../libpurple/protocols/oscar/oscar.c:5719
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/oscar/oscar.c:5773
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5810
+#: ../libpurple/protocols/oscar/oscar.c:5817
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3477
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490
-#: ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Üzenet"
 
 #. Use
-#: ../finch/gntstatus.c:189
-#: ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Használat"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Érvénytelen cím"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "Az állapot címét töltse ki."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Cím kettőzése"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Adjon meg másik címet az állapothoz."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Alállapot"
 
-#: ../finch/gntstatus.c:454
-#: ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Állapot:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Üzenet:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Állapot szerkesztése"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Eltérő állapot használata a következő fiókokhoz"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Mentés és használat"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Tanúsítványok"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "Hangok"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Állapotok"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Hiba történt a bővítmény betöltésekor."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Nem található az X megjelenítő"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Az ablak nem található"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "A bővítmény nem tölthető be, mivel X11 támogatás nélkül került lefordításra."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Vágólap bővítmény"
 
-#: ../finch/plugins/gntclipboard.c:152
-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
-msgstr "A gnt vágólap tartalmának megváltozásakor a tartalom elérhetővé válik az X által, ha lehetséges."
+#: ../finch/plugins/gntclipboard.c:161
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"A gnt vágólap tartalmának megváltozásakor a tartalom elérhetővé válik az X "
+"által, ha lehetséges."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1695,46 +1740,46 @@
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Kenyérpirító bővítmény"
 
-#: ../finch/plugins/gnthistory.c:116
-#: ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Társalgás %s partnerrel ekkor: %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138
-#: ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Az előzmények bővítmény megköveteli a naplózást"
 
-#: ../finch/plugins/gnthistory.c:139
-#: ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "A naplózás engedélyezhető az Eszközök -> Beállítások -> Naplózás alatt.\n"
 "\n"
-"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok előzményeit is aktiválja."
+"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok "
+"előzményeit is aktiválja."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt előzmények"
 
-#: ../finch/plugins/gnthistory.c:181
-#: ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
 
-#: ../finch/plugins/gnthistory.c:182
-#: ../pidgin/plugins/history.c:191
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az aktuális társalgásba."
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az "
+"aktuális társalgásba."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1748,8 +1793,7 @@
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123
-#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Lastlog bővítmény."
 
@@ -1757,9 +1801,8 @@
 msgid "accounts"
 msgstr "fiókok"
 
-#: ../libpurple/account.c:937
-#: ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "A bejelentkezéshez jelszó szükséges."
 
@@ -1776,15 +1819,18 @@
 msgid "Save password"
 msgstr "Jelszó mentése"
 
-#: ../libpurple/account.c:1010
-#: ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Hiányzó protokollbővítmény a következőhöz: %s"
 
-#: ../libpurple/account.c:1170
-#: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
+msgid "Connection Error"
+msgstr "Kapcsolódási hiba"
+
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Az új jelszavak nem egyeznek."
 
@@ -1818,33 +1864,28 @@
 msgid "Change user information for %s"
 msgstr "Felhasználó-információk megváltoztatása %s számára"
 
-#: ../libpurple/account.c:1264
-#: ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Felhasználói adatok beállítása"
 
-#: ../libpurple/account.c:1744
-#: ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/account.c:1735 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libpurple/blist.c:523
-#: ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520
-#: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5233
-#: ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Partnerek"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "partnerlista"
 
@@ -1862,91 +1903,89 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s kilépett"
 
-#: ../libpurple/connection.c:440
-#: ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "Nem küldhető üzenet: az üzenet túl nagy."
 
-#: ../libpurple/conversation.c:168
-#: ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:174 ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nem küldhető üzenet a következőnek: %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Az üzenet túl nagy."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:184 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Az üzenetet nem lehet elküldeni."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Üzenet küldése"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "Üzenet kül_dése"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belépett a szobába."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] belépett a szobába."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobát."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Nem hozható létre kapcsolat: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "A név lekérése nem sikerült: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "A szolgáltatásnév lekérése nem sikerült: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "A Purple D-BUS kiszolgálója nem fut az alábbi okok miatt"
 
-#: ../libpurple/desktopitem.c:286
-#: ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Névtelen"
 
@@ -1958,8 +1997,7 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Nem küldhető üzenet a feloldó folyamatnak\n"
 
-#: ../libpurple/dnsquery.c:548
-#: ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1968,8 +2006,7 @@
 "Hiba %s feloldásakor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551
-#: ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
 #: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
@@ -1997,7 +2034,7 @@
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2006,7 +2043,7 @@
 "Hiba %s olvasásakor: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2015,7 +2052,7 @@
 "Hiba %s írásakor: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2024,39 +2061,39 @@
 "Hiba %s elérésekor: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "A könyvtár nem írható."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "0 bájt hosszúságú fájl nem küldhető."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Könyvtár nem küldhető."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nem szabályos fájl. A felülírása gyáva módon visszautasítva.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s a következőt akarja küldeni: %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s egy fájlt akar küldeni"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Elfogadja a fájlküldési kérelmet a következőtől: %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2067,60 +2104,60 @@
 "Távoli kiszolgáló: %s\n"
 "Távoli port: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s felajánlja %s fájl elküldését"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s érvénytelen fájlnév.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%s elküldésének felajánlása %s részére"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "%s átvitelének megkezdése a következőtől: %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "%s fájl átvitele befejeződött"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Fájlátvitel megszakítva"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s megszakította a fájlátvitelt"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A fájlátvitel %s partnerhez félbeszakadt."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "A fájlátvitel %s partnertől félbeszakadt."
@@ -2194,40 +2231,76 @@
 msgstr "\"ymsgr\" URL címek kezelője"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"aim\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"aim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"gg\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
+"\"gg\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"icq\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"icq\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"irc\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"irc\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"msnim\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"msnim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"sip\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
+"\"sip\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"xmpp\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"xmpp\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"ymsgr\" URL címeket."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
+"\"ymsgr\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid "True if the command used to handle this type of URL should be run in a terminal."
-msgstr "Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak terminálban kell futnia."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak "
+"terminálban kell futnia."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2261,52 +2334,58 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "A megadott parancs kezelje-e az \"ymsgr\" URL címeket"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">A naplózónak nincsen olvasás funkciója</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Egyszerű szöveg"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Régi egyszerű formátum"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Ezen társalgás naplózása meghiúsult."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1365
 #, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
+"VÁLASZ&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1367
 #, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
+"VÁLASZ&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311
-#: ../libpurple/log.c:1444
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>A naplófájl útvonala nem található!</b></font>"
 
-#: ../libpurple/log.c:1323
-#: ../libpurple/log.c:1453
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VÁLASZ>: %s\n"
@@ -2336,7 +2415,9 @@
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
 msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
 #: ../libpurple/plugin.c:552
@@ -2365,15 +2446,16 @@
 msgid "Autoaccept"
 msgstr "Automatikus elfogadás"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Fájlküldési kérések automatikus elfogadása kijelölt felhasználóktól."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a következőtől: \"%s\"."
+msgstr ""
+"\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a "
+"következőtől: \"%s\"."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2392,18 +2474,15 @@
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../libpurple/plugins/autoaccept.c:165
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5796
-#: ../libpurple/protocols/oscar/oscar.c:5851
-#: ../libpurple/protocols/oscar/oscar.c:6077
-#: ../libpurple/protocols/oscar/oscar.c:6147
-#: ../libpurple/request.h:1387
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:6168
+#: ../libpurple/protocols/oscar/oscar.c:6238 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "Mé_gsem"
@@ -2420,12 +2499,12 @@
 msgid "Auto Reject"
 msgstr "Automatikus visszautasítás"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Fájlátvitelek automatikus elfogadása..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2433,21 +2512,21 @@
 "A fájlok mentési útvonala\n"
 "(Teljes elérési utat adjon meg)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatikus visszautasítás a partnerlistán nem szereplő felhasználóktól"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel befejeződésekor\n"
+"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel "
+"befejeződésekor\n"
 "(csak ha nem társalog a küldővel)"
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1608
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Megjegyzések"
 
@@ -2455,7 +2534,7 @@
 msgid "Enter your notes below..."
 msgstr "Írja be alább a jegyzetet..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Jegyzetek szerkesztése..."
 
@@ -2467,20 +2546,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Partnerjegyzetek"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Jegyzetek tárolása adott partnerekről."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő partnerekhez."
+msgstr ""
+"Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő "
+"partnerekhez."
 
 #. *< type
 #. *< ui_requirement
@@ -2496,8 +2577,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Teszteli a libpurple beépített titkosítóit."
 
@@ -2534,32 +2614,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Lehetőséget nyújt fájlban megadott parancsokkal történő irányításra."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Perc"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165
-#: ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225
-#: ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktív idő szerkesztése"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Fiók inaktivitási idejének beállítása"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Beállítás"
 
@@ -2567,8 +2641,7 @@
 msgid "None of your accounts are idle."
 msgstr "Egyik fiókja sem inaktív."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Fiók inaktivitási idejének visszaállítása"
 
@@ -2576,8 +2649,7 @@
 msgid "_Unset"
 msgstr "_Visszaállítás"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Inaktivitási idő beállítása minden fiókhoz"
 
@@ -2585,8 +2657,7 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inaktivitási idő törlése az összes inaktív fiókhoz"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 
@@ -2609,8 +2680,12 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a "
+"kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
 
 #. *< type
 #. *< ui_requirement
@@ -2632,7 +2707,9 @@
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az IPC parancsokat."
+msgstr ""
+"Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az "
+"IPC parancsokat."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -2665,107 +2742,121 @@
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
-msgstr "Ez a bővítmény elrejti a belépés/kilépés üzeneteket nagy szobákban, a társalgásban aktívan résztvevő felhasználók kivételével."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Ez a bővítmény elrejti a belépés/kilépés üzeneteket nagy szobákban, a "
+"társalgásban aktívan résztvevő felhasználók kivételével."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "A felhasználó nem érhető el."
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Automatikus válasz elküldve:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s kilépett."
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Lehet, hogy néhány üzenet nem kézbesíthető."
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Megszakadt a kapcsolat a kiszolgálóval."
 
-#: ../libpurple/plugins/log_reader.c:1603
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+#: ../libpurple/plugins/log_reader.c:1628
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
 msgstr "Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Az üzenet nem küldhető el, mivel a maximális hossz el lett érve."
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Az üzenet nem küldhető el."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Tűz"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
-msgid "Trillian"
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
+msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Általános naplóolvasás beállítása"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Gyors méretszámítások"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Névheurisztika használata"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Naplókönyvtár"
 
@@ -2775,27 +2866,31 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Naplómegjelenítő"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Felveszi más azonnaliüzenő-kliensek naplóit a naplómegjelenítőbe."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
 msgstr ""
-"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
+"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. "
+"Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
 "\n"
-"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran összeomolhat. Csak saját felelősségére használja!"
+"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran "
+"összeomolhat. Csak saját felelősségére használja!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -2827,64 +2922,78 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
-msgstr "Új sort szúr be az üzenetek elé, így az üzenet további része a felhasználónév alatt jelenik meg a társalgás ablakában."
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr ""
+"Új sort szúr be az üzenetek elé, így az üzenet további része a "
+"felhasználónév alatt jelenik meg a társalgás ablakában."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline üzenetek emulációja"
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
-msgstr "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+"A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
+"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
-msgstr "\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb bejelentkezik?"
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+"\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket "
+"figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb "
+"bejelentkezik?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Offline üzenet"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/törölheti"
+msgstr ""
+"A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/"
+"törölheti"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119
-#: ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Igen"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120
-#: ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nem"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Offline üzenetek mentése figyelmeztetésben"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne kérdezzen. Mindig mentsen figyelmeztetésben."
 
@@ -2901,8 +3010,7 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Perl bővítmények betöltését támogatja."
 
@@ -2915,8 +3023,13 @@
 msgstr "Szellemmód bejövő kapcsolathoz"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik üzenetüket írni.  Ez az AIM, ICQ, XMPP, Sametime és Yahoo! protokollokkal működik."
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik "
+"üzenetüket írni.  Ez az AIM, ICQ, XMPP, Sametime és Yahoo! protokollokkal "
+"működik."
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2944,7 +3057,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Szignálok tesztelése"
 
@@ -2952,8 +3065,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Ellenőrzi, hogy minden szignál megfelelően működik-e."
 
@@ -2971,8 +3084,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tesztek, hogy a legtöbb dolog működik-e."
 
@@ -2990,18 +3102,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "X.509 tanúsítványok"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3009,8 +3126,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL támogatást biztosít a GNUTLS-en keresztül."
 
@@ -3020,7 +3137,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
 msgid "NSS"
 msgstr "NSS"
 
@@ -3028,8 +3145,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL támogatást biztosít a Mozilla NSS-en keresztül."
 
@@ -3090,53 +3207,75 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, visszaérkezik vagy az inaktív állapota megszűnik."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, "
+"visszaérkezik vagy az inaktív állapota megszűnik."
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl bővítménybetöltő"
 
-#: ../libpurple/plugins/tcl/tcl.c:423
-#: ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl bővítmények betöltését támogatja"
 
-#: ../libpurple/plugins/tcl/tcl.c:495
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
+#: ../libpurple/plugins/tcl/tcl.c:507
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, "
+"akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nem hozható létre kapcsolat a helyi mDNS kiszolgálóval. Egyáltalán fut?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#: ../libpurple/protocols/oscar/oscar.c:5542
-#: ../libpurple/protocols/qq/qq.c:180
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../libpurple/protocols/yahoo/yahoo.c:3453
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1823
-#: ../pidgin/gtkstatusbox.c:1052
-msgid "Away"
-msgstr "Távol"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:819
+msgid "First name"
+msgstr "Utónév"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:824
+msgid "Last name"
+msgstr "Vezetéknév"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-mail"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM fiók"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP fiók"
 
 #. *< type
 #. *< ui_requirement
@@ -3148,105 +3287,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokollbővítmény"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple személy"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Gépnév"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
-msgid "First name"
-msgstr "Utónév"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
-msgid "Last name"
-msgstr "Vezetéknév"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:602
-msgid "AIM Account"
-msgstr "AIM fiók"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:605
-msgid "XMPP Account"
-msgstr "XMPP fiók"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s bezárta a társalgást."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
+
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Nem nyitható meg a foglalat"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Hiba a foglalat tulajdonságainak beállításakor"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Nem köthető a foglalat a porthoz"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Nem lehet figyelni a foglalatot"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
-
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Érvénytelen proxybeállítások"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1800
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy típusához."
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy "
+"típusához."
 
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Jelsor hiba"
 
-#: ../libpurple/protocols/gg/gg.c:116
-#: ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Nem tölthető le a jelsor.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269
-#: ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Partnerlista mentése..."
 
@@ -3254,8 +3374,7 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
 
-#: ../libpurple/protocols/gg/gg.c:276
-#: ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "A fájl nem nyitható meg"
 
@@ -3263,8 +3382,7 @@
 msgid "Buddylist saved successfully!"
 msgstr "A partnerlista mentése sikeres!"
 
-#: ../libpurple/protocols/gg/gg.c:307
-#: ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Nem tölthető be a partnerlista"
 
@@ -3300,30 +3418,25 @@
 msgid "Registration completed successfully!"
 msgstr "A regisztráció sikeresen befejeződött!"
 
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libpurple/protocols/gg/gg.c:482
-#: ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Jelszó (megerősítés)"
 
-#: ../libpurple/protocols/gg/gg.c:487
-#: ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Adja meg az aktuális jelsort"
 
-#: ../libpurple/protocols/gg/gg.c:493
-#: ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuális jelsor"
 
-#: ../libpurple/protocols/gg/gg.c:497
-#: ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
 
@@ -3331,12 +3444,11 @@
 msgid "Please, fill in the following fields"
 msgstr "Töltse ki az alábbi mezőket"
 
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Város"
@@ -3345,15 +3457,12 @@
 msgid "Year of birth"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:645
-#: ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Nem"
 
@@ -3362,16 +3471,16 @@
 msgstr "Férfi vagy nő"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Férfi"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Nő"
 
@@ -3379,8 +3488,7 @@
 msgid "Only online"
 msgstr "Csak elérhetők"
 
-#: ../libpurple/protocols/gg/gg.c:656
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Partnerek keresése"
 
@@ -3416,8 +3524,7 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
-#: ../libpurple/protocols/gg/gg.c:794
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "A Gadu-Gadu jelszó megváltoztatása"
 
@@ -3426,168 +3533,175 @@
 msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874
-#: ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5514
-#: ../libpurple/protocols/qq/qq.c:170
-#: ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2900
-#: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3378
-#: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5605
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Kilépett"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
-#: ../libpurple/protocols/msn/state.c:29
-#: ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37
-#: ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/gg/gg.c:1038
-#: ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5633
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Távol"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Utónév"
 
-#: ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:1108
-#: ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "A keresés eredményei nem jeleníthetők meg."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu nyilvános címtár"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Keresési eredmények"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Nem találhatók megfelelő felhasználók"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-#: ../libpurple/protocols/gg/gg.c:1307
-#: ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "A foglalatot nem lehet olvasni"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "A partnerlista letöltve"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "A partnerlistája letöltve a kiszolgálóról."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "A partnerlista feltöltve"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-#: ../libpurple/protocols/gg/gg.c:1506
-#: ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "A kapcsolódás meghiúsult."
 
-#: ../libpurple/protocols/gg/gg.c:1618
-#: ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Tiltott"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Felvétel csevegéshez"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Tiltás feloldása"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Tiltás"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Csevegés _neve:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Csevegéshiba"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Ez a csevegésnév már használatban van"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Nincs kapcsolat a kiszolgálóval."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Partnerek keresése..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Jelszó megváltoztatása..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Partnerlista feltöltése a kiszolgálóra"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Partnerlista letöltése a kiszolgálóról"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Partnerlista törlése a kiszolgálóról"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Partnerlista mentése fájlba..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Partnerlista betöltése fájlból..."
 
@@ -3602,43 +3716,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokollbővítmény"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Népszerű lengyel azonnali üzenő"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu felhasználó"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ismeretlen parancs: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "a jelenlegi téma: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Nincs beállítva téma"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "A fájlátvitel meghiúsult"
 
@@ -3664,10 +3781,9 @@
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-#: ../libpurple/protocols/irc/irc.c:127
-#: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614
-#: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
@@ -3675,13 +3791,13 @@
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
 
-#: ../libpurple/protocols/irc/irc.c:261
-#: ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "Cs_atorna:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Jelszó:"
 
@@ -3689,65 +3805,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Az IRC becenevek nem tartalmazhatnak szóközt"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1037
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2745
-#: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Nem sikerült létrehozni a foglalatot"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
-msgid "Connection Failed"
-msgstr "A kapcsolódás sikertelen"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
-msgid "SSL Handshake Failed"
-msgstr "Az SSL kézfogás sikertelen"
-
-#: ../libpurple/protocols/irc/irc.c:611
-#: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Téma"
 
@@ -3759,59 +3872,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Az IRC protokollbővítmény, amely kevésbé rossz"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941
-#: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2130
-#: ../libpurple/protocols/oscar/oscar.c:6581
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6672
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Kiszolgáló"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944
-#: ../libpurple/protocols/msn/msn.c:2135
-#: ../libpurple/protocols/oscar/oscar.c:6584
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6675
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kódolások"
 
-#: ../libpurple/protocols/irc/irc.c:950
-#: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/irc/irc.c:953
-#: ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Valódi név"
 
@@ -3819,7 +3938,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:961
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "SSL használata"
 
@@ -3850,13 +3969,15 @@
 msgstr " <i>(azonosítva)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Becenév"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Jelenleg a következőn"
 
@@ -3876,144 +3997,152 @@
 msgid "Glorious"
 msgstr "Ragyogó"
 
-#: ../libpurple/protocols/irc/msgs.c:417
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s megváltoztatta a témát a következőre: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:419
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s törölte a témát."
 
-#: ../libpurple/protocols/irc/msgs.c:427
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s témája: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:445
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "\"%s\" üzenet ismeretlen"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Ismeretlen üzenet"
 
-#: ../libpurple/protocols/irc/msgs.c:446
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Az IRC kiszolgáló olyan üzenetet kapott, amit nem tudott értelmezni."
 
-#: ../libpurple/protocols/irc/msgs.c:467
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Felhasználók a következőn: %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:572
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Válaszidő"
 
-#: ../libpurple/protocols/irc/msgs.c:573
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Az IRC kiszolgáló helyi ideje:"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Nincs ilyen csatorna"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:595
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "nincs ilyen csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "A felhasználó nincs bejelentkezve"
 
-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Nincs ilyen becenév/csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Nem sikerült elküldeni"
 
-#: ../libpurple/protocols/irc/msgs.c:679
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Meghívásra van szükség a következőhöz csatlakozáshoz: %s."
 
-#: ../libpurple/protocols/irc/msgs.c:680
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Meghívásos"
 
-#: ../libpurple/protocols/irc/msgs.c:792
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s kirúgta Önt: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:797
-#: ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s kizárta (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:820
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mód (%s %s) %s által"
 
-#: ../libpurple/protocols/irc/msgs.c:905
-#: ../libpurple/protocols/irc/msgs.c:906
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: ../libpurple/protocols/irc/msgs.c:907
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
-
-#: ../libpurple/protocols/irc/msgs.c:912
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+#: ../libpurple/protocols/irc/msgs.c:910
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg "
+"érvénytelen karaktereket tartalmaz."
+
+#: ../libpurple/protocols/irc/msgs.c:915
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
+"érvénytelen karaktereket tartalmaz."
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "A becenév nem változtatható meg"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Nem sikerült megváltoztatni a becenevet"
 
-#: ../libpurple/protocols/irc/msgs.c:972
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Elhagyta a(z) %s%s csatornát"
 
-#: ../libpurple/protocols/irc/msgs.c:1014
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Hiba: érvénytelen PONG a kiszolgálótól"
 
-#: ../libpurple/protocols/irc/msgs.c:1016
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING válasz -- Késleltetés %lu másodperc"
 
-#: ../libpurple/protocols/irc/msgs.c:1097
+#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "%s csatornához nem lehet csatlakozni: Regisztráció szükséges."
 
-#: ../libpurple/protocols/irc/msgs.c:1098
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nem lehet csatlakozni a csatornához"
 
-#: ../libpurple/protocols/irc/msgs.c:1132
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "A becenév vagy csatorna átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/irc/msgs.c:1144
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Ütések a következőtől: %s"
@@ -4023,40 +4152,76 @@
 msgstr "action &lt;elvégzendő művelet&gt;:  Egy művelet elvégzése."
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva visszatér a távollétből."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva "
+"visszatér a távollétből."
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele "
+"valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele valakitől, így nem beszélhet, ha a csatorna moderált (+m). Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele "
+"valakitől, így nem beszélhet, ha a csatorna moderált (+m). "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a megadott vagy a jelenlegi csatornán."
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a "
+"megadott vagy a jelenlegi csatornán."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy "
+"több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy "
+"vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha "
+"szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. <i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt a parancsot.</i>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. "
+"<i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt "
+"a parancsot.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4067,19 +4232,27 @@
 msgstr "memoserv: parancs küldése a memoserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy felhasználómód beállítása vagy visszavonása."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy "
+"felhasználómód beállítása vagy visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
+"(nem pedig a csatornának)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [csatorna]:  Kilistázza a csatornán jelenlévő felhasználókat."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;új becenév&gt;:  Megváltoztatja a becenevét."
 
@@ -4088,40 +4261,66 @@
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása "
+"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
+"tudja."
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "openserv: parancs küldése az openserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, egy opcionális üzenettel."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, "
+"egy opcionális üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha nincs megadva) késése."
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha "
+"nincs megadva) késése."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
+"(nem pedig a csatornának)."
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális üzenettel."
+msgstr ""
+"quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális "
+"üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. "
+"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4133,19 +4332,29 @@
 
 #: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy visszavonása."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy "
+"visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása "
+"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
+"tudja."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4153,365 +4362,378 @@
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;becenév&gt;: Információk lekérése egy kijelentkezett felhasználóról."
+msgstr ""
+"whowas &lt;becenév&gt;: Információk lekérése egy kijelentkezett "
+"felhasználóról."
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Válaszidő a következőtől: %s: %lu másodperc"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:450
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING válasz"
 
-#: ../libpurple/protocols/irc/parse.c:561
-#: ../libpurple/protocols/irc/parse.c:565
-#: ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694
-#: ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Kapcsolat bontva."
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek támogatása nem található."
+msgstr ""
+"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
+"támogatása nem található."
 
 #: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "%s szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s szöveges hitelesítést követel meg egy nem titkosított csatornán. "
+"Engedélyezi ezt és folytatja a hitelesítést?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Egyszerű szöveges hitelesítés"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:714
-#: ../libpurple/protocols/jabber/auth.c:848
-#: ../libpurple/protocols/jabber/auth.c:873
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Érvénytelen válasz a kiszolgálótól."
 
-#: ../libpurple/protocols/jabber/auth.c:572
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
+#: ../libpurple/protocols/jabber/auth.c:595
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított "
+"csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
 
-#: ../libpurple/protocols/jabber/auth.c:735
+#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-#: ../libpurple/protocols/jabber/auth.c:823
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL hiba"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Teljes név"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Utónév"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Keresztnév"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Utca"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "További cím"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Helység"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Régió"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Irányítószám"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Ország"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefonszám"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "E-mail"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Szervezet neve"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Szervezeti egység"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Funkció"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Születésnap"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3064
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Leírás"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "XMPP vCard szerkesztése"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, amelyek nem okoznak kényelmetlenséget."
+#: ../libpurple/protocols/jabber/buddy.c:584
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, "
+"amelyek nem okoznak kényelmetlenséget."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Kliens"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Operációs rendszer"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Erőforrás"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Prioritás"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Középső név"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Cím"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postafiók"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Fotó"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logó"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Rejtettség visszavonása"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Beszédes"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436
-#: ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5809
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne zavarjanak"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "A keresés eredményei a következők"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr "Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
+#: ../libpurple/protocols/jabber/buddy.c:1732
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne "
+"feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "A címtárlekérdezés sikertelen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "A címtárkiszolgáló lekérdezése nem sikerült."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Kiszolgálóutasítások: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "XMPP felhasználók keresése"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Érvénytelen címtár"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Adjon meg egy felhasználói címtárat"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Válasszon ki egy felhasználói címtárat a kereséshez"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Keresés a címtárban"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5224
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "Sz_oba:"
 
@@ -4580,7 +4802,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Hiba szobalista letöltése közben"
 
@@ -4615,447 +4838,479 @@
 msgid "Read Error"
 msgstr "Olvasási hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Nem lehet létrehozni foglalatot"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Érvénytelen XMPP azonosító"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
 msgid "Registration Successful"
 msgstr "A regisztráció sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Failed"
 msgstr "A regisztráció sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Már regisztrálva van"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Állam"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Dátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
 msgstr "Kérem adja meg a következő információkat az új fiók regisztrálásához."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Új XMPP fiók regisztrálása"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877
-#: ../pidgin/gtkaccount.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Regisztráció"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Folyam inicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Hitelesítés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5603
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Mindkettő"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr "Feladó (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1163
+msgid "From"
+msgstr "Feladó"
+
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr "Címzett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nincs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Jelszó megváltoztatva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "A jelszava meg lett változtatva."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Hiba a jelszó megváltoztatásakor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "XMPP jelszó megváltoztatása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Kérem adja meg az új jelszavát"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Felhasználói információk beállítása..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6309
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Jelszó megváltoztatása..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Felhasználók keresése..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Hibás kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr "A szolgáltatás nincs megvalósítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Tiltva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr "Elment"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Az elem nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Rosszul formázott XMPP azonosító"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr "Nem fogadható el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr "Fizetés szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr "A címzett nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr "Regisztráció szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "A távoli kiszolgáló nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Időtúllépés a távoli kiszolgálón"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "A kiszolgáló túl van terhelve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "A szolgáltatás nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr "Feliratkozás szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
 msgstr "Váratlan kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
 msgstr "Hitelesítés megszakítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr "Hibás kódolás a hitelesítésben"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr "Érvénytelen authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
 msgstr "Érvénytelen hitelesítési eljárás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
 msgstr "A hitelesítési eljárás túl gyenge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr "Átmeneti hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Rossz formátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr "Rossz névtér-előtag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Erőforrás-ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr "A gép eltűnt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Ismeretlen gép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr "Hiányos címzés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Érvénytelen azonosító"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Érvénytelen névtér"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Érvénytelen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
 msgstr "Nem illeszkedő gépek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr "Szabályok megsértése"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
 msgstr "Távoli kapcsolat sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Erőforrás-megszorítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr "Korlátozott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr "Lásd a másik gépet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr "Rendszerleállítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr "Meghatározatlan feltétel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Nem támogatott kódolás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr "Nem támogatott Stanza típus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Nem támogatott verzió"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "Nem megfelelően formázott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Folyamhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nem lehet kitiltani %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ismeretlen kapcsolat: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "%s felhasználó kapcsolata nem állítható be a következőre: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ismeretlen szerep: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "A(z) \"%s\" szerep nem állítható be a következő felhasználónak: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nem lehet kirúgni %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1817
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "part [room]:  Leave the room."
 msgstr "part [szoba]:  A szoba elhagyása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr "register:  Regisztráció csevegőszobánál."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [új téma]:  A téma megtekintése vagy megváltoztatása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;felhasználó&gt; [szoba]:  Felhasználó kitiltása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy felhasználó a szobával fennálló kapcsolatának beállítása."
-
-#: ../libpurple/protocols/jabber/jabber.c:1847
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: Beállítja a felhasználó szerepét a szobában."
+#: ../libpurple/protocols/jabber/jabber.c:1849
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
+"felhasználó a szobával fennálló kapcsolatának beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+#: ../libpurple/protocols/jabber/jabber.c:1855
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
+"Beállítja a felhasználó szerepét a szobában."
+
+#: ../libpurple/protocols/jabber/jabber.c:1861
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;felhasználó&gt; [üzenet]:  Felhasználó meghívása a szobába."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott kiszolgálón."
+msgstr ""
+"join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott "
+"kiszolgálón."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;felhasználó&gt; [szoba]:  Felhasználó kirúgása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik felhasználónak."
+msgstr ""
+"msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
+"felhasználónak."
 
 #. *< type
 #. *< ui_requirement
@@ -5067,32 +5322,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP protokollbővítmény"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Régi (5223 port) SSL kényszerítése"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3276
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Kapcsolódási port"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Kapcsolatkiszolgáló"
 
@@ -5125,7 +5385,7 @@
 msgid "XMPP Message Error"
 msgstr "XMPP üzenethiba"
 
-#: ../libpurple/protocols/jabber/message.c:350
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (%s kód)"
@@ -5134,47 +5394,80 @@
 msgid "XML Parse error"
 msgstr "XML elemzési hiba"
 
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba a jelenlétben"
 
-#: ../libpurple/protocols/jabber/presence.c:352
-#: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Új szoba létrehozása"
 
-#: ../libpurple/protocols/jabber/presence.c:354
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az alapbeállításokat?"
+#: ../libpurple/protocols/jabber/presence.c:368
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az "
+"alapbeállításokat?"
 
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "Sz_oba beállítása"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "Alapértel_mezések elfogadása"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Hiba a(z) %s csevegésben"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja fájlok átvitelét"
+msgstr ""
+"Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja "
+"fájlok átvitelét"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Fájl küldése sikertelen"
 
+#: ../libpurple/protocols/jabber/si.c:838
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Nem küldhető fájl a következőnek: %s, a JID érvénytelen"
+
+#: ../libpurple/protocols/jabber/si.c:840
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Nem küldhető fájl a következőnek: %s, a felhasználó nem érhető el"
+
+#: ../libpurple/protocols/jabber/si.c:842
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Nem küldhető fájl a következőnek: %s, nincs feliratkozva a felhasználó "
+"jelenlétére"
+
+#: ../libpurple/protocols/jabber/si.c:857
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Válassza ki %s azon erőforrását, ahová fájlt kíván küldeni"
+
+#: ../libpurple/protocols/jabber/si.c:873
+msgid "Select a Resource"
+msgstr "Válasszon erőforrást"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5182,13 +5475,21 @@
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. Szeretné ezt a partnert felvenni?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. "
+"Szeretné ezt a partnert felvenni?"
 
 #: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr "%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a partnert felvenni?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
+"partnert felvenni?"
 
 #: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
@@ -5383,10 +5684,10 @@
 msgstr "A kiszolgáló túl elfoglalt"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
 
@@ -5420,372 +5721,392 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN hiba: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "bökés"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "megbökve"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Bökés"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ezen a néven fogják látni az MSN partnerei."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Otthoni telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Munkahelyi telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Mobiltelefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr "Engedélyezi az MSN mobil oldalakat?"
 
-#: ../libpurple/protocols/msn/msn.c:323
-msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
-msgstr "Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
+#: ../libpurple/protocols/msn/msn.c:360
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil "
+"oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Tiltás"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr "Mobilüzenet küldése."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr "Oldal"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
-#: ../libpurple/protocols/msn/msn.c:551
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/msn/msn.c:588 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Rögtön jövök"
 
-#: ../libpurple/protocols/msn/msn.c:555
-#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:592 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3490
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Elfoglalt vagyok"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3502
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Telefonálok"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Becenév beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Otthoni telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Munkahelyi telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiltelefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobileszközök engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiloldalak engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail bejövő levelek megnyitása"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr "Küldés mobiltelefonra"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Csevegés ke_zdeményezése"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL könyvtárat."
+msgstr ""
+"Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL "
+"könyvtárat."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
 
-#: ../libpurple/protocols/msn/msn.c:1458
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1516 ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
-#: ../libpurple/protocols/msn/msn.c:1529
-#: ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1587 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Általános"
 
-#: ../libpurple/protocols/msn/msn.c:1536
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Kor"
 
-#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Hely"
 
-#: ../libpurple/protocols/msn/msn.c:1544
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msn/msn.c:1742
-#: ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800 ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Hobbik és érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1550
-#: ../libpurple/protocols/msn/msn.c:1670
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1608 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749 ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Magamról röviden"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr "Társadalmi"
 
-#: ../libpurple/protocols/msn/msn.c:1569
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Családi állapot"
 
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Állatok"
 
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Szülőváros"
 
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
 msgstr "Lakóhelyek"
 
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Divat"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Zene"
 
-#: ../libpurple/protocols/msn/msn.c:1577
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1764
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1635 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Kedvenc idézet"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Kapcsolatinformációk"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Személyes"
 
-#: ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr "Társ"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1601
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Otthoni cím"
 
-#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Személyes mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Saját e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Évforduló"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Munka"
 
-#: ../libpurple/protocols/msn/msn.c:1625
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Beosztás"
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Cég"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1631
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Munkahelyi cím"
 
-#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Munkahelyi mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Munkahelyi személyhívó"
 
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "Munkahelyi e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Kezdés dátuma"
 
-#: ../libpurple/protocols/msn/msn.c:1707
-#: ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1720
-#: ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1765 ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778 ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Kedvenc dolgok"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Honlap"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "A felhasználó nem hozott létre nyilvános profilt."
 
-#: ../libpurple/protocols/msn/msn.c:1805
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre nyilvános profilt."
-
-#: ../libpurple/protocols/msn/msn.c:1809
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
+#: ../libpurple/protocols/msn/msn.c:1866
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a "
+"felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre "
+"nyilvános profilt."
+
+#: ../libpurple/protocols/msn/msn.c:1870
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Nem találhatók információk a felhasználó profiljában. A felhasználó "
+"valószínűleg nem létezik."
 
-#: ../libpurple/protocols/msn/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil URL-je"
 
@@ -5799,20 +6120,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2103
-#: ../libpurple/protocols/msn/msn.c:2105
+#: ../libpurple/protocols/msn/msn.c:2169 ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
-#: ../libpurple/protocols/msn/msn.c:2139
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "HTTP eljárás használata"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Egyéni hangulatjelek megjelenítése"
 
-#: ../libpurple/protocols/msn/msn.c:2152
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
@@ -5831,8 +6151,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Nem lehet kapcsolódni"
 
@@ -5843,7 +6163,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Ismeretlen hiba."
 
@@ -5881,30 +6201,40 @@
 msgid "Service Temporarily Unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Nem lehet átnevezni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Nem lehet törölni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:1321
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
+"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
+"társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 msgstr[1] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
+"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
+"társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
@@ -5934,46 +6264,50 @@
 msgstr "Hiba a HTTP feldolgozása közben."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Bejelentkezett egy másik helyről."
 
 #: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja újra később."
+msgstr ""
+"Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja "
+"újra később."
 
 #: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Az MSN kiszolgálók átmenetileg leállnak."
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Nem sikerült a hitelesítés: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja újra később."
+msgstr ""
+"Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
+"újra később."
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Kézfogás"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Hitelesítés megkezdése"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Süti letöltése"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Süti küldése"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Partnerlista fogadása"
 
@@ -6010,37 +6344,262 @@
 msgstr "Az üzenet nem küldhető el, mivel túl gyorsan küldi:"
 
 #: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Az üzenet nem küldhető el, mmivel nem hozható létre munkamenet a "
+"kiszolgálóval. Ez valószínűleg kiszolgálóhiba, pár perc múlva próbálkozzon "
+"újra."
+
+#: ../libpurple/protocols/msn/switchboard.c:431
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Az üzenet nem küldhető el, mivel hiba lépett fel a közvetítés közben:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Az üzenet ismeretlen hiba miatt lehet, hogy nem lett elküldve:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s egy bökést küldött Önnek!"
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s felvette Önt a partnerlistájára."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eltávolította Önt a partnerlistájáról."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Nem lehet hozzáadni a következőt: \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Hiányzó titkosító"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Az RC4 titkosító nem található"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr "Frissítsen az RC4 támogatással rendelkező libpurple verzióra (>= 2.0.1). A MySpaceIM bővítmény nem kerül betöltésre."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr "Elnézést, a %d karakternél hosszabb jelszavakat (az Öné %d) nem támogatja a MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM hiba"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Hívás olvasása"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Váratlan híváshossz a kiszolgálótól"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Bejelentkezés"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "A kapcsolat elveszett a kiszolgálóhoz (nem érkezett adat %d másodpercen belül)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Új levelek"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Új bloghozzászólások"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Új profilhozzászólások"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Új barátkérések!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Új képhosszászólások"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Kapcsolódva"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Nincs beállítva felhasználónév"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Nyissa meg a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"felhasználónév oldalt és válasszon egy felhasználónevet, majd próbáljon meg újra bejelentkezni."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokollhiba, %d. kód: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "A partner felvétele sikertelen"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "az \"addbuddy\" parancs sikertelen."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "A tárolás parancs sikertelen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Nincs ilyen felhasználó: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Felhasználókeresés"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "A partner eltávolítása sikertelen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "a \"delbuddy parancs sikertelen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "a blocklist parancs sikertelen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Érvénytelen bemeneti feltétel"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Az olvasási puffer megtelt"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Értelmezhetetlen üzenet"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "IM barátok"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "%d partner került felvételre vagy frissítésre a kiszolgálóról (beleértve a kiszolgálóoldali listán már jelen lévő partnereket)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Kapcsolatok felvétele a kiszolgálóról."
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Barátok felvétele a MySpace.com-ról"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "A barátok importálása sikertelen"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Emberek keresése..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "IM név megváltoztatása..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "myim URL kezelő"
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Nem található megfelelő MySpaceIM fiók ezen myim URL megnyitásához."
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Engedélyezze a megfelelő MySpaceIM fiókot és próbálkozzon újra."
+
+#: ../libpurple/protocols/myspace/myspace.c:3280
+msgid "Show display name in status text"
+msgstr "A megjelenő név megjelenítése az állapotszövegben"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Fejléc megjelenítése az állapotszövegben"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Hangulatjelek küldése"
+
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Képernyőfelbontás (pont/hüvelyk)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Alap betűkészletméret (pont)"
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "A szükséges paraméterek átadása sikertelen"
@@ -6122,7 +6681,9 @@
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
 msgstr "A fiókja le lett tiltva, mivel túl sok érvénytelen jelszót adott meg"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -6150,7 +6711,9 @@
 msgstr "A felhasználó letiltotta Önt"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
 msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -6170,7 +6733,9 @@
 #: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%s)."
+msgstr ""
+"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
+"s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
@@ -6192,7 +6757,9 @@
 #: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni a konferenciát (%s)."
+msgstr ""
+"Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni "
+"a konferenciát (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
@@ -6201,13 +6768,21 @@
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali listán. Hiba a mappa létrehozása közben (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali "
+"listán. Hiba a mappa létrehozása közben (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:632
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa létrehozása közben a kiszolgálóoldali listában (%s)."
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa "
+"létrehozása közben a kiszolgálóoldali listában (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
@@ -6338,8 +6913,12 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, amelyikhez kapcsolódni szeretne."
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
+"amelyikhez kapcsolódni szeretne."
 
 #: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
@@ -6372,26 +6951,20 @@
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2290
-#: ../libpurple/protocols/yahoo/yahoo.c:2449
-#: ../libpurple/protocols/yahoo/ycht.c:481
-#: ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085
-#: ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296
-#: ../libpurple/proxy.c:1424
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "A kiszolgáló lezárta a kapcsolatot."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2284
-#: ../libpurple/protocols/yahoo/yahoo.c:2443
-#: ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097
-#: ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308
-#: ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6400,24 +6973,13 @@
 "Elveszett a kapcsolat a kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114
-#: ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320
-#: ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6449,7 +7011,7 @@
 msgstr "ICQ protokollbővítmény"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kódolás"
@@ -6479,7 +7041,7 @@
 msgid "Direct IM established"
 msgstr "A közvetlen kapcsolat létrejött"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "A(z) %s fájl %s, amely nagyobb, mint a legnagyobb méret (%s)."
@@ -6580,159 +7142,169 @@
 msgid "Not while on AOL"
 msgstr "Nem, amíg az AOL-on tartózkodik"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr "(Hiba történt az üzenet fogadása során. A partner, akivel cseveg valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó fiókbeállításainál.)"
+#: ../libpurple/protocols/oscar/oscar.c:347
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Hiba történt az üzenet fogadása során. A partner, akivel cseveg "
+"valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner "
+"milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó "
+"fiókbeállításainál.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
-msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
-msgstr "(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző kódolást használnak, vagy %s hibás klienst használ.)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+"(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző "
+"kódolást használnak, vagy %s hibás klienst használ.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621
-#: ../pidgin/gtkutils.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
 #: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Partnerikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Hang"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM közvetlen azonnali üzenetek"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6011
 msgid "Get File"
 msgstr "Fájl letöltése"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Játékok"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Kiegészítők"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Partnerlista küldése"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ közvetlen kapcsolat"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP felhasználó"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ közvetítő kiszolgáló"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Régi ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian titkosítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Biztonság engedélyezve"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videócsevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Élő videó"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5690
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5781
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5816
 msgid "Not Available"
 msgstr "Nem érhető el"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5711
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5802
 msgid "Occupied"
 msgstr "Elfoglalt"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "A weben"
 
-#: ../libpurple/protocols/oscar/oscar.c:719
-#: ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697
-#: ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP cím"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Figyelmeztetési szint"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6741,7 +7313,7 @@
 "Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6750,159 +7322,179 @@
 "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Felhasználónév elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat létrejött, süti elküldve"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
+"érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy "
+"betűvel kell kezdődniük és betűket, számokat, szóközöket, vagy csak számokat "
+"tartalmazhatnak."
 
-#: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1932
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Érvénytelen felhasználónév."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Helytelen jelszó."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "A fiókja jelenleg fel van függesztve."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha tovább folytatja, még többet kell majd várnia."
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
+"tovább folytatja, még többet kell majd várnia."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a következő helyről: %s"
+msgstr ""
+"A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a "
+"következő helyről: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "A hitelesítés fogadva"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "A megadott SecurID kulcs érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Adja meg a SecurID-t"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6167 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. Frissítésekért keresse fel a következő címet: %s."
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
+"Frissítésekért keresse fel a következő címet: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nem kérhető le érvényes AIM belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő címet: %s."
+msgstr ""
+"Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő "
+"címet: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Nem kérhető le érvényes belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "A kapcsolat nem inicializálható"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Engedélyezést kérő üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Kérem engedélyezze, hogy felvegyem!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5193
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Engedélyezést elutasító üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
+"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
+"következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
 
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6915,7 +7507,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6928,7 +7520,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6941,32 +7533,31 @@
 "Az üzenet:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "%u ICQ felhasználó küldött Önnek egy partnert: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Fel kívánja venni ezt a partnert a listájára?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2467
-#: ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -6976,28 +7567,40 @@
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
+"gyakoriságának a korlátját."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
+"gyakoriságának a korlátját."
 
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
+"rosszindulatú volt."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
+"rosszindulatú volt."
 
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
-msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+msgstr[0] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
+"volt."
+msgstr[1] ""
+"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
+"volt."
 
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7005,471 +7608,544 @@
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Az üzenetet nem lehet elküldeni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Ismeretlen ok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2809
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "A felhasználó információi nem érhetőek el: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2822
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s felhasználó információi nem érhetőek el:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2856
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Tag ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Képességek"
 
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Elérhetőségi üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az érvénytelen karaktereket tartalmazott.]"
-
-#: ../libpurple/protocols/oscar/oscar.c:3384
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr "Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. Kérem várjon 10 másodpercet és próbálja meg újra."
-
-#: ../libpurple/protocols/oscar/oscar.c:3456
-msgid "You have been signed off for an unknown reason."
-msgstr "Ismeretlen okból ki lett jelentkeztetve."
+#: ../libpurple/protocols/oscar/oscar.c:3242
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
+"érvénytelen karaktereket tartalmazott.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3406
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
+"Kérem várjon 10 másodpercet és próbálja meg újra."
 
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
 
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Saját weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "További információ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Pozíció"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Munkahelyi adatok"
 
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "A következő felhasználónév a következőhöz van rendelve: %s"
 msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nem található eredmény a(z) %s e-mail címre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Fiókjóváhagyás megkérve"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "Hiba a fiók információinak megváltoztatása közben"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév eltér az eredetitől."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
+"felhasználónév eltér az eredetitől."
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az érvénytelen."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az "
+"érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév túl hosszú."
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
+"felhasználónév túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már függőben van erre a felhasználónévre."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már "
+"függőben van erre a felhasználónévre."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
-msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím túl sok felhasználónévhez van társítva."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many screen names associated with it."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"cím túl sok felhasználónévhez van társítva."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím érvénytelen."
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
+"cím érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hiba 0x%04x: Ismeretlen hiba."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s e-mail címe a következő: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
-#: ../libpurple/protocols/oscar/oscar.c:4194
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban kell lennie."
+msgstr ""
+"Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
+"kell lennie."
 
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Nem lehet beállítani az AIM profilt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4440
-msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
-msgstr "Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már megtörtént."
+#: ../libpurple/protocols/oscar/oscar.c:4500
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg "
+"beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már "
+"megtörtént."
 
-#: ../libpurple/protocols/oscar/oscar.c:4454
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 msgstr[1] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4459
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "A profil túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
-msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra "
+"került."
+msgstr[1] ""
+"A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra "
+"került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "A távollét-üzenet túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4578
+#: ../libpurple/protocols/oscar/oscar.c:4638
 #, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
-
-#: ../libpurple/protocols/oscar/oscar.c:4580
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
+"felhasználóneveknek érvényes e-mail címnek kell lenniük, vagy betűvel kell "
+"kezdődniük, és betűket, számokat és szóközöket, vagy csak számokból "
+"állhatnak."
+
+#: ../libpurple/protocols/oscar/oscar.c:4640
+#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5088
 msgid "Unable To Add"
 msgstr "Nem sikerült felvenni"
 
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4749
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nem lehet lekérni a partnerek listáját"
 
-#: ../libpurple/protocols/oscar/oscar.c:4685
-msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
-msgstr "Az AIM kiszolgálók ideiglenesen nem tudták elküldeni a partnerlistáját. A partnerlistája nem veszett el és néhány órán belül valószínűleg elérhetővé válik."
-
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4890
-#: ../libpurple/protocols/oscar/oscar.c:4895
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#: ../libpurple/protocols/oscar/oscar.c:5077
+#: ../libpurple/protocols/oscar/oscar.c:4750
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr ""
+"Az AIM kiszolgálók ideiglenesen nem tudták elküldeni a partnerlistáját. A "
+"partnerlistája nem veszett el és néhány órán belül valószínűleg elérhetővé "
+"válik."
+
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5143
+#: ../libpurple/protocols/oscar/oscar.c:5148
 msgid "Orphans"
 msgstr "Árvák"
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5071
 #, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. Kérem töröljön egyet közülük és próbálja meg újra."
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
+"Kérem töröljön egyet közülük és próbálja meg újra."
 
-#: ../libpurple/protocols/oscar/oscar.c:5001
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "(no name)"
 msgstr "(nincs név)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5015
+#: ../libpurple/protocols/oscar/oscar.c:5085
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
-msgstr "Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "A(z) %s partner ismeretlen ok miatt nem adható hozzá."
 
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5179
 #, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr "%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel akarja venni őt?"
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel "
+"akarja venni őt?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Authorization Given"
 msgstr "Engedély megadva"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s felhasználó engedélyezi, hogy felvegye őt a partnerei közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:5190
+#: ../libpurple/protocols/oscar/oscar.c:5261
 msgid "Authorization Granted"
 msgstr "Engedély kiadva"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5264
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
+"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
+"következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5265
 msgid "Authorization Denied"
 msgstr "Engedély elutasítva"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Váltás:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5270
+#: ../libpurple/protocols/oscar/oscar.c:5341
 msgid "Invalid chat name specified."
 msgstr "A megadott csevegésnév érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5410
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
 
-#: ../libpurple/protocols/oscar/oscar.c:5479
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "Away Message"
 msgstr "Távol üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(lekérés)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5775
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s partnermegjegyzése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Buddy Comment:"
 msgstr "Partnermegjegyzés:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5840
+#: ../libpurple/protocols/oscar/oscar.c:5931
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Közvetlen kapcsolat nyitását választotta %s partnerrel."
 
-#: ../libpurple/protocols/oscar/oscar.c:5844
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági kockázatként. Folytatni kívánja?"
+#: ../libpurple/protocols/oscar/oscar.c:5935
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági "
+"kockázatként. Folytatni kívánja?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5850
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/peer.c:1041
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Get AIM Info"
 msgstr "AIM információk lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:5982
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5990
 msgid "Get Status Msg"
 msgstr "Állapotüzenet lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Direct IM"
 msgstr "Közvetlen IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Re-request Authorization"
 msgstr "Engedélyezés újrakérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5993
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Require authorization"
 msgstr "Engedélyezés kérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5996
+#: ../libpurple/protocols/oscar/oscar.c:6087
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "A weben ismert (ennek engedélyezése után SPAM-et fog kapni!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "ICQ Privacy Options"
 msgstr "ICQ magánszféra beállításai"
 
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "The new formatting is invalid."
 msgstr "Az új formázás érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6021
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely karaktereket változtathatja meg."
+msgstr ""
+"A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely "
+"karaktereket változtathatja meg."
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Change Address To:"
 msgstr "Cím megváltoztatása a következőre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Ön nem vár engedélyezésre</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "You are awaiting authorization from the following buddies"
 msgstr "A következő partnerektől vár engedélyezésre"
 
-#: ../libpurple/protocols/oscar/oscar.c:6124
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
+#: ../libpurple/protocols/oscar/oscar.c:6215
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
+"kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Find Buddy by E-Mail"
 msgstr "Partnerek keresése e-mail cím szerint"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Search for a buddy by e-mail address"
 msgstr "Partner keresése e-mail cím alapján"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6237
 msgid "_Search"
 msgstr "_Keresés"
 
-#: ../libpurple/protocols/oscar/oscar.c:6304
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Set User Info (URL)..."
 msgstr "Felhasználói információk beállítása (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6315
+#: ../libpurple/protocols/oscar/oscar.c:6406
 msgid "Change Password (URL)"
 msgstr "Jelszó megváltoztatása (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6319
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Configure IM Forwarding (URL)"
 msgstr "Üzenettovábbítás beállítása (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6329
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Set Privacy Options..."
 msgstr "Magánszféra-beállítások..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/oscar/oscar.c:6427
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Display Currently Registered E-Mail Address"
 msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "A jelenleg regisztrált e-mail cím megváltoztatása..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Partner keresése e-mail cím szerint..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6453
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Use recent buddies group"
 msgstr "A legutóbbi partnerek csoport használata"
 
-#: ../libpurple/protocols/oscar/oscar.c:6433
+#: ../libpurple/protocols/oscar/oscar.c:6524
 msgid "Show how long you have been idle"
 msgstr "Megjeleníti, meddig volt inaktív"
 
-#: ../libpurple/protocols/oscar/oscar.c:6588
+#: ../libpurple/protocols/oscar/oscar.c:6679
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7477,32 +8153,34 @@
 "Mindig az ICQ proxy kiszolgáló használata fájlátvitelhez\n"
 "(lassabb, de nem jeleníti meg az IP címet)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:693
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s felkérése, hogy kapcsolódjon hozzánk ezen: %s:%hu közvetlen kapcsolattal."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:778
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Kapcsolódási kísérlet a következőhöz: %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:852
 msgid "Attempting to connect via proxy server."
 msgstr "Kapcsolódási kísérlet proxy kiszolgálón keresztül."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1029
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s felkérte a közvetlen kapcsolatra a következőhöz: %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a magánszférája biztonságát."
-
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "Kapcs_olódás"
+#: ../libpurple/protocols/oscar/peer.c:1033
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM "
+"képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
+"magánszférája biztonságát."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -7671,8 +8349,12 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid "Setting custom faces is not currently supported. Please choose an image from %s."
-msgstr "Az egyéni arcképek beállítása jelenleg nem támogatott. Válasszon egy képet innen: %s."
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+"Az egyéni arcképek beállítása jelenleg nem támogatott. Válasszon egy képet "
+"innen: %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
 #: ../libpurple/protocols/qq/buddy_info.c:590
@@ -7680,13 +8362,12 @@
 msgstr "Érvénytelen QQ arckép"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Visszautasította %d kérését"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Indokolja meg:"
 
@@ -7696,65 +8377,67 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Bocs, nem vagy az esetem..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Visszautasítás"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "A partner felvétele felhatalmazási kéréssel meghiúsult"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Sikeresen eltávolított egy partnert"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Sikeresen eltávolította magát egy partnertől"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Sikeresen eltávolította magát egy partner partnerlistájáról"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "A(z) %d felhasználó felhatalmazást kér"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Írja be ide kérését"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Leszünk barátok?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Küldés"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
-msgstr "Felvette %d felhasználót a partnerlistájára"
+msgid "You have added %d to buddy list"
+msgstr "Felvette a(z) %d azonosítójú felhasználót a partnerlistájára"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid hiba"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Érvénytelen QQid"
 
@@ -7783,71 +8466,71 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "Adja meg a külső csoportazonosítót"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Csak állandó QQ csoportok között kereshet\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
 msgstr "A(z) %d felhasználó csatlakozásra jelentkezett a(z) %d csoporthoz"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Ok: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun művelet"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Jóváhagyás"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "A csatlakozási kérelmét a(z) %d csoporthoz %d admin visszautasította"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr "A csatlakozási kérelmét a(z) %d csoporthoz %d admin jóváhagyta"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "Ön [%d] kilépett a következő csoportból: \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
+msgid "You [%d] have been added to group \"%d\""
 msgstr "Ön [%d] fel lett véve a következő csoportba: \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "A csoport fel lett véve a partnerlistájára"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "Nem vagyok tag"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -7866,31 +8549,31 @@
 msgid "Unknown status"
 msgstr "Ismeretlen állapot"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Ez a csoport nem engedélyezi mások csatlakozását"
 
-#: ../libpurple/protocols/qq/group_join.c:231
-msgid "You have successfully exited the group"
+#: ../libpurple/protocols/qq/group_join.c:233
+msgid "You have successfully left the group"
 msgstr "Sikeresen elhagyta a csoportot"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ csoporthitelesítés"
 
-#: ../libpurple/protocols/qq/group_join.c:256
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr "A hitelesítési műveletét elfogadta a QQ kiszolgáló"
+#: ../libpurple/protocols/qq/group_join.c:258
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "A hitelesítési kérését elfogadta a QQ kiszolgáló"
 
-#: ../libpurple/protocols/qq/group_join.c:327
-msgid "You inputted a group id outside the acceptable range"
+#: ../libpurple/protocols/qq/group_join.c:329
+msgid "You entered a group ID outside the acceptable range"
 msgstr "Az elfogadható tartományon kívüli csoportazonosítót adott meg"
 
-#: ../libpurple/protocols/qq/group_join.c:358
-msgid "Are you sure to exit this Qun?"
-msgstr "Biztosan ki akar lépni ebből a Qun-ből?"
-
 #: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Biztos, hogy el kívánja hagyni ezt a Qun-t?"
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7898,80 +8581,69 @@
 "Ne feledje, ha Ön hozta létre,\n"
 "akkor ez a művelet törli a Qun-t."
 
-#: ../libpurple/protocols/qq/group_join.c:365
-msgid "Go ahead"
-msgstr "Folytatás"
-
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kód: [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Csoportművelet-hiba"
 
-#. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#. we want to see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "Jóvá kívánja hagyni a kérést?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
-msgid "You have successfully modify Qun member"
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Indokolja meg:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+msgid "You have successfully modified Qun member"
 msgstr "Sikeresen módosította a Qun tagot"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
-msgid "You have successfully modify Qun information"
+#: ../libpurple/protocols/qq/group_opt.c:305
+msgid "You have successfully modified Qun information"
 msgstr "Sikeresen módosította a Qun információkat"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Sikeresen létrehozott egy Qun-t"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Be kívánja állítani most a Qun részleteit?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Beállítás"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Rendszerüzenet"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Server ACK"
-msgstr "Kiszolgáló ACK"
-
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Üzenet küldése meghiúsult\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr "Életben tartási hiba, úgy tűnik a kapcsolat elveszett!"
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Az azonnali üzenet küldése meghiúsult."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+msgid "Keep alive error"
+msgstr "Kapcsolat-fenntartási hiba"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "Bejelentkezési jelsor kérési hiba!"
+msgid "Error requesting login token"
+msgstr "Hiba a bejelentkezési jelsor lekérésekor"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Nem lehet bejelentkezni, nézze meg a hibakeresési naplót"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
-#: ../libpurple/protocols/qq/qq.c:139
-#: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2378
-#: ../libpurple/protocols/yahoo/yahoo.c:2406
-#: ../libpurple/protocols/yahoo/yahoo.c:2513
-#: ../libpurple/protocols/yahoo/yahoo.c:2534
-#: ../libpurple/protocols/yahoo/yahoo.c:2618
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Nem lehet kapcsolódni."
@@ -7981,97 +8653,83 @@
 msgid "Unknown-%d"
 msgstr "Ismeretlen-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s cím"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP cím"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP cím"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Szint"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Elérhető"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Távol"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Láthatatlan"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Kilépett"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Érvénytelen név"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Jelenleg elérhető</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Utolsó frissítés</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Kapcsolat módja</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Kiszolgáló IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Nyilvános IP címem</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Bejelentkezés ideje</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Utolsó bejelentkezési IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Utolsó bejelentkezés ideje</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Bejelentkezési információk"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Információim módosítása"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Saját információk beállítása"
 
-#: ../libpurple/protocols/qq/qq.c:534
-#: ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Bejelentkezési információk megjelenítése"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "Kilépés ebből a QQ Qun-ből"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "A partner tiltása"
 
@@ -8085,26 +8743,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723
-#: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tbővítmény"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "Bejelentkezés TCP felett"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Bejelentkezés rejtve"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Küldési hiba a foglalaton"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Kapcsolat visszautasítva"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Kapcsolódás TCP segítségével"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8114,80 +8759,76 @@
 msgid "Unable to read from socket"
 msgstr "A foglalatból nem lehet olvasni"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d visszautasította a következő fájlt: %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Fájlküldés"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d megszakította a(z) %s átvitelét"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "A kapcsolat elveszett"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "A bejelentkezés meghiúsult, nincs válasz"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
 msgstr "Fel kívánja venni ezt a partnert?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s felvette"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Szeretné felvenni?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s felvette [%s]"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s felvette Önt [%s] a partnerlistájára"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "%s felhasználó visszautasította a kérését"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
+msgid "User %s approved your request"
 msgstr "%s felhasználó jóváhagyta kérését"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s fel kívánja venni Önt [%s] barátként"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Üzenet: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s nincs a partnerlistáján"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "Szeretné felvenni?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Kapcsolat lezárva (írás)"
@@ -8251,14 +8892,12 @@
 msgid "Starting Services"
 msgstr "Szolgáltatások indítása"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Kapcsolódva"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s kiszolgálón"
+msgstr ""
+"Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
+"kiszolgálón"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -8328,8 +8967,12 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
-msgstr "Adja meg az új konferencia témáját és a(z) %s számára elküldendő meghívóüzenetet."
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+"Adja meg az új konferencia témáját és a(z) %s számára elküldendő "
+"meghívóüzenetet."
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
@@ -8353,8 +8996,14 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s "
+"felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új "
+"konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -8368,8 +9017,7 @@
 msgid "Send TEST Announcement"
 msgstr "TESZT bejelentés küldése"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Téma:"
 
@@ -8379,8 +9027,12 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
-msgstr "Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés folytatásához adjon meg egyet alább."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés "
+"folytatásához adjon meg egyet alább."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -8390,6 +9042,10 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Nincs megadva Sametime közösségi kiszolgáló"
 
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
+msgid "Connect"
+msgstr "Kapcsolódás"
+
 #: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
@@ -8415,8 +9071,12 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza "
+"ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -8428,8 +9088,12 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
-msgstr "A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a bejegyzés eltávolításra került a partnerlistájából."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a "
+"bejegyzés eltávolításra került a partnerlistájából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
@@ -8502,8 +9166,14 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr "A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az alábbi listából."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére "
+"hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az "
+"alábbi listából."
 
 #: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
@@ -8515,16 +9185,24 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
-msgstr "A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes címjegyzékcsoportjának sem felelt meg."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes "
+"címjegyzékcsoportjának sem felelt meg."
 
 #: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes címjegyzékcsoport"
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr "Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet tagjaival együtt fel kíván venni a partnerlistájára."
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet "
+"tagjaival együtt fel kíván venni a partnerlistájára."
 
 #: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
@@ -8533,11 +9211,16 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az alábbi műveletgombokkal."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti "
+"partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az "
+"alábbi műveletgombokkal."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtknotify.c:716
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "A keresés eredménye"
 
@@ -8548,7 +9231,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr "Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime közösségben."
+msgstr ""
+"Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime "
+"közösségben."
 
 #: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
@@ -8559,8 +9244,12 @@
 msgstr "Felhasználó keresése"
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez felhasználókat keres a Sametime közösségben."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez "
+"felhasználókat keres a Sametime közösségben."
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
@@ -8592,65 +9281,95 @@
 msgstr "Kliens azonosságának elrejtése"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "%s felhasználó nincs jelen a hálózatban"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Kulcscsere"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "A kulcscsere nem végezhető el"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Hiba lépett fel a kulcscsere közben"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "A kulcscsere sikertelen"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Időtúllépés kulcscsere közben"
 
-#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "A kulcscsere megszakítva"
 
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "A kulcscsere már elkezdődött"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nem indíthat kulcscserét önmagával"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "A távoli felhasználó már nincs jelen a hálózatban"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a kulcscserét?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a "
+"kulcscserét?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8661,671 +9380,925 @@
 "Távoli gép: %s\n"
 "Távoli port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Kulcscsere-kérés"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "Azonnali üzenetváltás jelszóval"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Nem lehet beállítani az azonnaliüzenő-kulcsot"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Azonnaliüzenő-jelszó beállítása"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Nyilvános kulcs lekérése"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "A nyilvános kulcs nem tölthető le"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Nyilvános kulcs megjelenítése"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Nem sikerült a nyilvános kulcsot betölteni"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Felhasználói információk"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "A felhasználói információk lekérése sikertelen"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s partner nem megbízható"
 
-#: ../libpurple/protocols/silc/buddy.c:738
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal töltheti le."
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános "
+"kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal "
+"töltheti le."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Megnyitás..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s partner nincs jelen a hálózatban"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson az Importálásra."
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson "
+"az Importálásra."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importálás..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Megfelelő felhasználó kiválasztása"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
-
 #: ../libpurple/protocols/silc/buddy.c:1185
-msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
-msgstr "Több felhasználó található ugyanazzal a névvel. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
+#: ../libpurple/protocols/silc10/buddy.c:1183
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a "
+"partnerlistához adandó megfelelő felhasználót a listából."
+
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Több felhasználó található ugyanazzal a névvel. Válassza ki a "
+"partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Leválasztott"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Gyengélkedik"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Ébresszen fel"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktív"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Boldog"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Szomorú"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Dühös"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Féltékeny"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Megszégyenült"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Szerelmes"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Álmos"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Unott"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Érdeklődő"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Nyugtalan"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Felhasználói módok"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Hangulat"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Előnyben részesített kapcsolat"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Előnyben részesített nyelv"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Eszköz"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Időzóna"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Földrajzi hely"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Azonnali üzenőkulcs visszaállítása"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Azonnali üzenet kulcscserével"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "Azonnali üzenet jelszóval"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Nyilvános kulcs letöltése..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Felhasználó kidobása"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Rajzolás a rajzlapra"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Jelmondat:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "A(z) %s csatorna nem létezik a hálózatban"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Csatornainformációk"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Csatornainformációk lekérése sikertelen"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Csatorna neve:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Felhasználók száma:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Csatorna alapítója:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Csatorna titkosítója:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Csatorna HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Csatorna témája:</b><br> %s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Csatorna módjai:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Alapító kulcsának ujjlenyomata:</b><br> %s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Alapító kulcsának blablakódja:</b><br> %s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Csatorna nyilvános kulcsának hozzáadása"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Nyilvános kulcs megnyitása..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Csatorna jelmondata"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Csatorna nyilvános kulcsainak listája"
 
-#: ../libpurple/protocols/silc/chat.c:413
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
-
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni "
+"védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon "
+"alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete "
+"szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok "
+"a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
+
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Csatornahitelesítés"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Hozzáadás / Eltávolítás"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Csoportnév"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Jelmondat"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és jelmondatát."
+msgstr ""
+"Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és "
+"jelmondatát."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Csatorna magáncsoport felvétele"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Felhasználók korlátozása"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-korlátozás feloldásához állítsa nullára."
+msgstr ""
+"A csatorna legnagyobb felhasználószámának beállítása. A felhasználószám-"
+"korlátozás feloldásához állítsa nullára."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Meghívási lista"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Kitiltási lista"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Magáncsoport felvétele"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Állandóság visszavonása"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Állandóság beállítása"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Felhasználószám korlátozása"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Témamegszorítás visszavonása"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Témamegszorítás beállítása"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Magáncsatorna visszavonása"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Magáncsatorna beállítása"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Titkos csatorna visszavonása"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Titkos csatorna beállítása"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Ön a csatornaalapító a következőn: <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "A csatornaalapító a következőn: <I>%s</I>: <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
-msgstr "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s csatornához"
+msgstr ""
+"Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
+"csatornához"
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Kapcsolódás magáncsoporthoz"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Nem lehet kapcsolódni a magáncsoporthoz"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Hívás parancsa"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Nem lehet meghívni a parancsot"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libpurple/protocols/silc/ft.c:89
-#: ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96
-#: ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210
-#: ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221
-#: ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Biztonságos fájlátvitel"
 
-#: ../libpurple/protocols/silc/ft.c:90
-#: ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Hiba a fájlátvitel közben"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "A távoli fél bontotta a kapcsolatot"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Kulcscsere sikertelen"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "A kapcsolat túllépte az időkorlátot"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "A kapcsolat létrehozása sikertelen"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "A fájlátviteli folyamat nem létezik"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nincs aktív fájlátviteli folyamat"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "A fájlátvitel már elindult"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "A kulcscsere nem végezhető el az átvitelhez"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "A fájlátvitel elindítása nem sikerült"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "A fájl nem küldhető el"
 
-#: ../libpurple/protocols/silc/ops.c:554
-#: ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Hiba történt"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s megváltoztatta a(z) <I>%s</I> témáját a következőre: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> átállította a(z) <I>%s</I> csatorna üzemmódjait a következőkre: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> eltávolította a(z) <I>%s</I> csatorna üzemmódjait"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> beállította <I>%s</I> üzemmódjait a következőkre: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> eltávolította <I>%s</I> összes üzemmódját"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Önt a következőről: <I>%s</I> kirúgta <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742
-#: ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Önt kidobta a következő: %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773
-#: ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Kidobta: %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Kiszolgáló kijelentkezett"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Személyes információk"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Születésnap"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Pozíció"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Szervezet"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Egység"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Csatlakozás csevegéshez"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Ön a csatornaalapító a következőn: <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "A csatornaalapító a következőn: <I>%s</I>: <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Valódi név"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Állapotszöveg"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Nyilvános kulcs ujjlenyomata"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Nyilvános kulcs blablakódja"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Több..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Leválás a kiszolgálóról"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Nem lehet leválni"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nem lehet beállítani a témát"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Nem sikerült a becenevet megváltoztatni"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Szobalista"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nem sikerült lekérni a szobalistát"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "A hálózat üres"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nem érkezett nyilvános kulcs"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Kiszolgálóinformációk"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nem lehet lekérni a kiszolgálóinformációkat"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Kiszolgálóstatisztikák"
 
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nem lehet lekérni a kiszolgálóstatisztikákat"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Nincsenek elérhető kiszolgálóstatisztikák"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9360,112 +10333,80 @@
 "Kiszolgáló-operátorok összesen: %d\n"
 "Útválasztó-operátorok összesen: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Hálózati statisztika"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping sikertelen"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Ping válasz érkezett a kiszolgálótól"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Nem sikerült kidobni a felhasználót"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Kulcscsere sikertelen"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás gombra egy új kapcsolat létrehozásához."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "A kiszolgáló bontotta a kapcsolatot"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "FIGYELÉS"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "A felhasználó nem figyelhető"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Folyamat folytatása"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Kapcsolat hitelesítése"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Kiszolgáló nyilvános kulcsának ellenőrzése"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Jelmondat szükséges"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Hiba: A verziók különböznek, kérem frissítse a kliensét"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Hiba: A távoli fél nem bízik meg vagy nem támogatja az Ön nyilvános kulcsát"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Hiba: A távoli fél nem támogatja a javasolt KE csoportot"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Hiba: A távoli fél nem támogatja a javasolt titkosítót"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Hiba: A távoli fél nem támogatja a javasolt PKCS-t"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Hiba: A távoli fél nem támogatja a javasolt hash függvényt"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Hiba: A távoli fél nem támogatja a javasolt HMAC-ot"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Hiba: Nem megfelelő aláírás"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Hiba: Érvénytelen süti"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Hiba: Hitelesítés sikertelen"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel "
+"a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s nyilvános kulcsa megérkezett. El kívánja fogadni ezt a nyilvános kulcsot?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9478,75 +10419,99 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116
-#: ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Nyilvános kulcs ellenőrzése"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Nézet.."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nem támogatott típusú nyilvános kulcs"
 
-#: ../libpurple/protocols/silc/silc.c:153
-msgid "Connection failed"
-msgstr "Kapcsolódás sikertelen"
-
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot"
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-#: ../libpurple/protocols/silc/silc.c:185
-msgid "Performing key exchange"
-msgstr "Kulcscsere elvégzése"
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
 
-#: ../libpurple/protocols/silc/silc.c:271
-msgid "Out of memory"
-msgstr "Elfogyott a memória"
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Kulcscsere sikertelen"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Névtelen"
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
+"gombra egy új kapcsolat létrehozásához."
 
-#: ../libpurple/protocols/silc/silc.c:317
-msgid "Cannot initialize SILC protocol"
-msgstr "Nem lehet inicializálni a SILC protokollt"
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
+msgid "Connection failed"
+msgstr "Kapcsolódás sikertelen"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "A ~/.silc könyvtár nem található vagy nem érhető el"
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
+msgid "Performing key exchange"
+msgstr "Kulcscsere elvégzése"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Kapcsolódás a SILC kiszolgálóhoz"
 
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Nem sikerült a SILC kulcspárt betölteni: %s"
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Nem sikerült a SILC kulcspárt betölteni"
 
-#: ../libpurple/protocols/silc/silc.c:359
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Nem hozható létre kapcsolat"
 
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
+msgid "Out of memory"
+msgstr "Elfogyott a memória"
+
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
+msgid "Cannot initialize SILC protocol"
+msgstr "Nem lehet inicializálni a SILC protokollt"
+
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Hiba a SILC kulcspár betöltésekor"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Az Ön jelenlegi hangulata"
 
-#: ../libpurple/protocols/silc/silc.c:660
-#: ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normál"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Szerelmes"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9554,261 +10519,372 @@
 "\n"
 "Az előnyben részesített kapcsolatfelvételi módszerek"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferencia"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Az Ön jelenlegi állapota"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Elérhető szolgáltatások"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Mások láthatják milyen szolgáltatásokat használ"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Mások láthatják milyen számítógépet használ"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Az Ön VCard fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Időzóna (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Felhasználó online állapotattribútumai"
 
-#: ../libpurple/protocols/silc/silc.c:739
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és személyes információit. Kérem töltse ki azokat az információkat, amelyeket más felhasználók láthatnak Önről."
-
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és "
+"személyes információit. Kérem töltse ki azokat az információkat, amelyeket "
+"más felhasználók láthatnak Önről."
+
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "A nap üzenete"
 
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Nem érhető el a nap üzenete"
 
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nincs \"nap üzenete\" hozzárendelve ehhez a kapcsolathoz"
 
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Új SILC kulcspár létrehozása"
 
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "A jelmondatok nem egyeznek"
 
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "A kulcselőállítás meghiúsult"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Kulcs hossza"
 
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Jelmondat (megerősítés)"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Kulcspár előállítása"
 
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Elérhető állapot"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "A nap üzenetének megtekintése"
 
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "SILC kulcspár létrehozása..."
 
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> felhasználó nincs jelen a hálózatban"
 
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "A téma túl hosszú"
 
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Meg kell adnia egy becenevet"
 
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "%s csatorna nem található"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "csatorna üzemmódok a következőhöz: %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nincsenek csatorna üzemmódok beállítva a következőn: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nem sikerült beállítani a csatorna üzemmódokat a következőhöz: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Ismeretlen parancs: %s, (talán klienshiba)"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [csatorna]:  A csevegés elhagyása"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [csatorna]:  A csevegés elhagyása"
 
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;új téma&gt;]:  A téma megtekintése vagy módosítása"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a hálózaton"
+msgstr ""
+"join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a "
+"hálózaton"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Csatornák listázása ezen a hálózaton"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a felhasználónak"
+msgstr ""
+"query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a "
+"felhasználónak"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  A kiszolgáló napi üzenetének megjelenítése"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Ezen folyamat leválasztása"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet kíséretében"
+msgstr ""
+"quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet "
+"kíséretében"
 
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Egy silc kliensparancs meghívása"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó kidobása"
+msgstr ""
+"kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó "
+"kidobása"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;új becenév&gt;:  A becenevének megváltoztatása"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak megjelenítése"
+msgstr ""
+"whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak "
+"megjelenítése"
 
-#: ../libpurple/protocols/silc/silc.c:1656
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna üzemmódjainak megjelenítése vagy megváltoztatása"
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna "
+"üzemmódjainak megjelenítése vagy megváltoztatása"
 
-#: ../libpurple/protocols/silc/silc.c:1660
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév módjainak megváltoztatása a csatornán"
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév "
+"módjainak megváltoztatása a csatornán"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a hálózaton"
+msgstr ""
+"umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a "
+"hálózaton"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;becenév&gt; [-pubkey]:  Kiszolgáló-operátori jogok kérése"
 
-#: ../libpurple/protocols/silc/silc.c:1672
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó "
+"meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a csatornáról"
+msgstr ""
+"kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a "
+"csatornáról"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [kiszolgáló]:  A kiszolgáló adminisztrációs részleteinek megjelenítése"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;csatorna&gt; +|-&lt;becenév&gt;]:  Kliens kitiltása a csatornáról"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános kulcsának letöltése"
+msgstr ""
+"getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános "
+"kulcsának letöltése"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  A kiszolgáló és a hálózat statisztikáinak megjelenítése"
 
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING küldése a kapcsolódott kiszolgálónak"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;csatorna&gt;:  Egy csatorna felhasználóit listázza ki"
 
-#: ../libpurple/protocols/silc/silc.c:1705
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A csatorna/csatornák bizonyos felhasználóinak listázása"
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A "
+"csatorna/csatornák bizonyos felhasználóinak listázása"
 
 #. *< type
 #. *< ui_requirement
@@ -9819,117 +10895,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokollbővítmény"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1862
-#: ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Titkosító"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Tökéletes továbbítási titkosság használata"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Nyilvános kulcs hitelesítése"
 
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Más felhasználók nem láthatnak"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Meghívások tiltása"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Kulcscsere nélküli azonnali üzenetváltások tiltása"
 
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Online állapotattribútum-kérések visszautasítása"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Üzenetek tiltása a rajzlapra"
 
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Rajzlap automatikus megnyitása"
 
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "SILC kulcspár létrehozása..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Nem hozható létre SILC kulcspár\n"
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Valódi név: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Felhasználónév: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Kiszolgálónév: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Szervezet: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Ország: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmus: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Kulcs hossza: \t%d bit\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Verzió: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9940,7 +11040,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9949,44 +11050,116 @@
 "Nyilvános kulcs blablakódja:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Nyilvános kulcs információi"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Lapozás"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferencia"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Számítógép"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminál"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s üzenetet küldött a rajzlapra. Meg kívánja nyitni a rajzlapot?"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr "%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a rajzlapot?"
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a "
+"rajzlapot?"
+
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+msgid "Whiteboard"
+msgstr "Rajzlap"
+
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Nincsenek elérhető kiszolgálóstatisztikák"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Hiba: A verziók különböznek, kérem frissítse a kliensét"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Hiba: A távoli fél nem bízik meg vagy nem támogatja az Ön nyilvános kulcsát"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Hiba: A távoli fél nem támogatja a javasolt KE csoportot"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Hiba: A távoli fél nem támogatja a javasolt titkosítót"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Hiba: A távoli fél nem támogatja a javasolt PKCS-t"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Hiba: A távoli fél nem támogatja a javasolt hash függvényt"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Hiba: A távoli fél nem támogatja a javasolt HMAC-ot"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Hiba: Nem megfelelő aláírás"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Hiba: Érvénytelen süti"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Hiba: Hitelesítés sikertelen"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Névtelen"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "A ~/.silc könyvtár nem található vagy nem érhető el"
 
-#: ../libpurple/protocols/silc/wb.c:302
-msgid "Whiteboard"
-msgstr "Rajzlap"
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Nem sikerült a SILC kulcspárt betölteni: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
@@ -9994,26 +11167,26 @@
 msgstr "Nem sikerült az írás"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Nem sikerült a kiszolgáló feloldása"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "A gépnév nem oldható fel"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "A SIP felhasználónevek nem tartalmazhatnak szóközt vagy @ szimbólumot"
 
@@ -10025,36 +11198,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "A SIP/SIMPLE protokollbővítmény"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Állapot közzététele (megjegyzés: mindenki figyelheti)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "UDP használata"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Proxy használata"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Felhasználó hitelesítése"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
@@ -10120,7 +11293,9 @@
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan küldte."
+msgstr ""
+"Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
+"küldte."
 
 #: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
@@ -10176,8 +11351,12 @@
 msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
 
 #: ../libpurple/protocols/toc/toc.c:558
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha tovább folytatja, akkor még tovább kell majd várnia."
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
+"tovább folytatja, akkor még tovább kell majd várnia."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10209,7 +11388,8 @@
 msgid "Password Change Successful"
 msgstr "Jelszó sikeresen megváltoztatva"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Csoport:"
 
@@ -10230,10 +11410,8 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
 
-#: ../libpurple/protocols/toc/toc.c:1878
-#: ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042
-#: ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
 
@@ -10267,200 +11445,258 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokollbővítmény"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s webkamera-meghívást küldött, ami még nem támogatott."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Az Ön Yahoo! üzenete nem lett elküldve."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s egy bökést küldött!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! rendszerüzenet %s számára:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:984
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Hozzáférés elutasítva üzenet:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
+"közé, a következő magyarázattal: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé, a következő magyarázattal: %s."
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
+"közé."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1071
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Partner felvétele megtagadva"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. Valószínűleg nem fog tudni sikeresen bejelentkezni. Keressen esetleges frissítéseket a következő helyen: %s."
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. "
+"Valószínűleg nem fog tudni sikeresen bejelentkezni. Keressen esetleges "
+"frissítéseket a következő helyen: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1825
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! hitelesítés sikertelen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
-msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
-msgstr "Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a felhasználót."
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha "
+"az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a "
+"felhasználót."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1894
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Mellőzi a partnert?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A fiókja zárolva van, kérem jelentkezzen be a Yahoo! weboldalára."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1956
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán megoldhatja ezt a problémát."
+msgstr ""
+"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
+"megoldhatja ezt a problémát."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz tartozó kiszolgálóoldali listán."
+msgstr ""
+"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
+"tartozó kiszolgálóoldali listán."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2013
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2464
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2488
-#: ../libpurple/protocols/yahoo/yahoo.c:2667
-#: ../libpurple/protocols/yahoo/yahoo.c:2770
-#: ../libpurple/protocols/yahoo/yahoo.c:2780
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Kapcsolathiba"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3493
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Elveszett a kapcsolat a következővel: %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Nem hozható létre kapcsolat a következővel: %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3496
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Nem vagyok az asztalnál"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Nem vagyok a munkahelyemen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3505
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Nyaralok"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Kilépett"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2987
-#: ../libpurple/protocols/yahoo/yahoo.c:3017
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Belépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3037
-#: ../libpurple/protocols/yahoo/yahoo.c:3113
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Jelenlét"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3107
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Csatlakozás a csevegéshez"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Konferencia kezdeményezése"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3189
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Jelenlét beállításai"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3195
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Firkálás megkezdése"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+msgid "Activate which ID?"
 msgstr "Melyik azonosítót aktiválja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3239
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join whom in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Azonosító aktiválása..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Felhasználó csatlakoztatása csevegéshez..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
+msgid "Open Inbox"
+msgstr "Bejövő levelek megnyitása"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr "csörgetés"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr "megcsörgetve"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr "Csörgetés"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Csatornák listázása a Yahoo hálózatán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
 
@@ -10474,123 +11710,129 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
-#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokollbővítmény"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4067
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Yahoo Japán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4070
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr "Személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4073
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr "Japán személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4076
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr "Személyhívó Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4079
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4082
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Japán fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4085
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Fájlátviteli port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4088
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Csevegőszoba nyelve"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4091
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo csevegőkiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo csevegőport"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%s\"."
+msgstr ""
+"%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%"
+"s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Meghívás visszautasítva"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Nem sikerült kapcsolódni a csevegéshez"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Ismeretlen szoba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Esetleg tele van a szoba"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Nem érhető el"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
-msgstr "Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, mielőtt újra csatlakozhatna a csevegőszobához"
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, "
+"mielőtt újra csatlakozhatna a csevegőszobához"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Jelenleg a következőben cseveg: %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Partner csatlakoztatása a csevegéshez sikertelen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Lehet, hogy jelenleg nincsenek csevegőszobában?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "A szobalista letöltése sikertelen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Hangok"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Webkamerák"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Nem lehet letölteni a szobalistát."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Felhasználói szobák"
 
@@ -10601,86 +11843,109 @@
 msgid "Sent Doodle request."
 msgstr "Firkálási kérés elküldve."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Nem lehet a fájlleírót létrehozni."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Írási hiba"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt profilok jelenleg nem támogatottak."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia a böngészőjében:"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt "
+"profilok jelenleg nem támogatottak."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia "
+"a böngészőjében:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! azonosító"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbik"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Legfrissebb hírek"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Honlap"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Érdekes link 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Érdekes link 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Érdekes link 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Utolsó frissítés"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s felhasználói információi nem érhetőek el"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
-msgstr "Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg nem támogatott."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti kiszolgálóoldali hiba, kérem próbálja újra később."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem próbálkozzon újra később."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+"Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg "
+"nem támogatott."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti "
+"kiszolgálóoldali hiba, kérem próbálja újra később."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, "
+"hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a "
+"felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem "
+"próbálkozzon újra később."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "A felhasználó profilja üres."
 
@@ -10698,8 +11963,12 @@
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" beállításait a Fiókszerkesztőben)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" "
+"beállításait a Fiókszerkesztőben)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -10766,27 +12035,45 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új csevegéshez"
+msgstr ""
+"sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
+"csevegéshez"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,*&gt;"
+msgstr ""
+"zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
+"*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,*&gt;"
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;"
+"<i>osztály</i>,<i>példány</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a "
+"következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;"
+"ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,SZEMÉLY,*&gt;"
+msgstr ""
+"zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,"
+"SZEMÉLY,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
@@ -10843,10 +12130,8 @@
 msgid "Exposure"
 msgstr "Exportálás"
 
-#: ../libpurple/proxy.c:458
-#: ../libpurple/proxy.c:877
-#: ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -10860,9 +12145,7 @@
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
 
-#: ../libpurple/proxy.c:686
-#: ../libpurple/proxy.c:732
-#: ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
 #: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10871,14 +12154,16 @@
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %d. porton."
+msgstr ""
+"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
+"d. porton."
 
 #: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Hiba %s feloldásakor"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "A gépnév nem oldható fel"
 
@@ -10903,11 +12188,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Nem vagyok itt"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "mentett állapotok"
 
@@ -10916,7 +12201,21 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s ezentúl %s néven szerepel.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Figyelem! %s %s."
+
+#: ../libpurple/server.c:295 ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Figyelem!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "Figyelem! %s érkezett."
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10925,12 +12224,12 @@
 "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Elfogadja a meghívást a csevegésre?"
 
@@ -10938,9 +12237,13 @@
 msgid "Unset"
 msgstr "Visszaállítás"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Nem érhető el"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+msgid "Do not disturb"
+msgstr "Ne zavarjanak"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Bővített távollét"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -10971,103 +12274,115 @@
 msgid "%s became unidle"
 msgstr "%s már nem inaktív"
 
-#: ../libpurple/status.c:1312
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s inaktív lett"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s már nem inaktív"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2553
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Hiba %s olvasásakor"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2721
 #, c-format
-msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
-msgstr "Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a régi fájl %s~ néven lett elmentve."
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
+"régi fájl %s~ néven lett elmentve."
 
-#: ../libpurple/util.c:3024
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Számítás..."
 
-#: ../libpurple/util.c:3027
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Ismeretlen."
 
-#: ../libpurple/util.c:3053
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
-#: ../libpurple/util.c:3065
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d nap"
 msgstr[1] "%d nap"
 
-#: ../libpurple/util.c:3073
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d óra"
 msgstr[1] "%s, %d óra"
 
-#: ../libpurple/util.c:3079
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../libpurple/util.c:3087
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d perc"
 msgstr[1] "%s, %d perc"
 
-#: ../libpurple/util.c:3093
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../libpurple/util.c:3362
-#: ../libpurple/util.c:3660
+#: ../libpurple/util.c:3550
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "%s nem nyitható meg: túl sok átirányítás"
+
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nem lehet csatlakozni a következőhöz: %s"
 
-#: ../libpurple/util.c:3488
+#: ../libpurple/util.c:3710
 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. "
+"Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
 
-#: ../libpurple/util.c:3523
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Hiba %s olvasása közben: %s"
 
-#: ../libpurple/util.c:3554
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Hiba %s írása közben: %s"
 
-#: ../libpurple/util.c:3579
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nem lehet a következőhöz kapcsolódni: %s: %s"
@@ -11093,56 +12408,71 @@
 msgstr "A tálca tájolása."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:406
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Bejelentkezés beállításai"
 
-#: ../pidgin/gtkaccount.c:515
-msgid "Local alias:"
-msgstr "Helyi álnév:"
+#: ../pidgin/gtkaccount.c:428
+msgid "Pro_tocol:"
+msgstr "_Protokoll:"
+
+#: ../pidgin/gtkaccount.c:439
+msgid "Screen _name:"
+msgstr "_Felhasználónév:"
+
+#: ../pidgin/gtkaccount.c:529
+msgid "_Local alias:"
+msgstr "_Helyi álnév:"
+
+#: ../pidgin/gtkaccount.c:533
+msgid "Remember pass_word"
+msgstr "E_mlékezzen a jelszóra"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:577
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Felhasználói beállítások"
 
+#: ../pidgin/gtkaccount.c:604
+msgid "New _mail notifications"
+msgstr "Értesítések új le_vélre"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:595
-msgid "Use this buddy icon for this account:"
-msgstr "Ezen partnerikon használata a fiókhoz:"
+#: ../pidgin/gtkaccount.c:609
+msgid "Use this buddy _icon for this account:"
+msgstr "Ezen _partnerikon használata a fiókhoz:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:715
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s beállításai"
 
-#: ../pidgin/gtkaccount.c:912
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:913
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Globális proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:919
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Nincs Proxy"
 
-#: ../pidgin/gtkaccount.c:925
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:931
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:943
-#: ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Környezeti beállítások használata"
 
@@ -11151,316 +12481,334 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:982
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "ha igazán közelről nézi"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:985
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "láthatja a pillangók nászát"
 
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy beállításai"
 
-#: ../pidgin/gtkaccount.c:1020
-#: ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Proxy _típusa:"
 
-#: ../pidgin/gtkaccount.c:1029
-#: ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Gépnév:"
 
-#: ../pidgin/gtkaccount.c:1033
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1041
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Felhasználó:"
 
-#: ../pidgin/gtkaccount.c:1048
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "Jel_szó:"
 
-#: ../pidgin/gtkaccount.c:1454
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Nem menthető az új fiók"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Már létezik fiók a megadott feltételekkel."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Fiók hozzáadása"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Alap"
 
-#: ../pidgin/gtkaccount.c:1489
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Ezen új fiók létrehozása a kiszolgálón"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Haladó"
 
-#: ../pidgin/gtkaccount.c:1961
-#: ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../pidgin/gtkaccount.c:1989
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
 # fixme: üdvözli a %s az {pidgin | finch} lehet, nemde?
-#: ../pidgin/gtkaccount.c:2183
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
-"Nincsenek beállítva azonnaliüzenő-fiókjai. A %s használatának megkezdéséhez kattintson az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha azt szeretné hogy a %s több fiókhoz csatlakozzon, kattintson újra a <b>Hozzáadás</b> gombra és állítsa be mindet.\n"
+"Nincsenek beállítva azonnaliüzenő-fiókjai. A %s használatának megkezdéséhez "
+"kattintson az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha "
+"azt szeretné hogy a %s több fiókhoz csatlakozzon, kattintson újra a "
+"<b>Hozzáadás</b> gombra és állítsa be mindet.\n"
 "\n"
-"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, szerkesztéséhez vagy eltávolításához."
+"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja "
+"segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, "
+"szerkesztéséhez vagy eltávolításához."
 
-#: ../pidgin/gtkblist.c:724
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Csatlakozás egy csevegéshez"
 
-#: ../pidgin/gtkblist.c:745
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez csatlakozni kíván.\n"
+#: ../pidgin/gtkblist.c:786
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
+"csatlakozni kíván.\n"
 
-#: ../pidgin/gtkblist.c:756
-#: ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "F_iók:"
 
-#: ../pidgin/gtkblist.c:1045
-#: ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "_Tiltás feloldása"
 
-#: ../pidgin/gtkblist.c:1096
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1099
-#: ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "Ü_zenet"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Fájl küldése"
 
-#: ../pidgin/gtkblist.c:1112
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "_Partnerfigyelmeztetés felvétele"
 
-#: ../pidgin/gtkblist.c:1116
-#: ../pidgin/gtkblist.c:1120
-#: ../pidgin/gtkblist.c:1222
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
 
-#: ../pidgin/gtkblist.c:1132
-msgid "Alias..."
-msgstr "Álnév..."
-
-#: ../pidgin/gtkblist.c:1141
-#: ../pidgin/gtkblist.c:1230
-#: ../pidgin/gtkblist.c:1251
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "Ál_név..."
 
-#: ../pidgin/gtkblist.c:1143
-#: ../pidgin/gtkblist.c:1232
-#: ../pidgin/gtkblist.c:1253
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "P_artner felvétele"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "_Csevegés felvétele"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Csoport törlése"
 
-#: ../pidgin/gtkblist.c:1200
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
 #. join button
-#: ../pidgin/gtkblist.c:1218
-#: ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463
-#: ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../pidgin/gtkblist.c:1220
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automatikus csatlakozás"
 
-#: ../pidgin/gtkblist.c:1258
-#: ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Összecs_ukás"
 
-#: ../pidgin/gtkblist.c:1286
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Kibontás"
 
-#: ../pidgin/gtkblist.c:1531
-#: ../pidgin/gtkblist.c:1543
-#: ../pidgin/gtkblist.c:4511
-#: ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Eszközök/Hangok némítása"
 
-#: ../pidgin/gtkblist.c:2003
-#: ../pidgin/gtkconv.c:4535
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
+#: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a partnert."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
+"partnert."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Partnerek"
 
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Partnerek/Új azonnal_i üzenet..."
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Partnerek/_Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
 
-#: ../pidgin/gtkblist.c:2838
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Partnerek/Ki_lépett partnerek megjelenítése"
-
-#: ../pidgin/gtkblist.c:2839
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Partnerek/Ür_es csoportok megjelenítése"
-
-#: ../pidgin/gtkblist.c:2840
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Partnerek/_Partner részleteinek megjelenítése"
-
-#: ../pidgin/gtkblist.c:2841
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Partnerek/Inaktív i_dők megjelenítése"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Partnerek/Megjelenítés"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Partnerek/Megjelenítés/Ki_lépett partnerek"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Partnerek/Megjelenítés/Ür_es csoportok"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Partnerek/Megjelenítés/_Partner részletei"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Partnerek/Megjelenítés/Inaktív i_dők"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Partnerek/Megjelenítés/Protokolli_konok"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Partnerek/Part_nerek rendezése"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Partnerek/_Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Partnerek/Cse_vegés felvétele..."
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Partnerek/C_soport felvétele..."
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Partnerek/_Kilépés"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Fiókok"
 
-#: ../pidgin/gtkblist.c:2852
-#: ../pidgin/gtkblist.c:6446
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Eszközök/_Partnerfigyelmeztetések"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Eszközök/_Tanúsítványok"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Eszközök/Bő_vítmények"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Eszközök/_Beállítások"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Eszközök/_Szobalista"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Eszközök/_Rendszernapló"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Eszközök/_Hangok némítása"
 
 #. Help
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Súgó/Online _súgó"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Súgó/_Hibakereső ablak"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -11469,217 +12817,242 @@
 "\n"
 "<b>Fiók:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Partnerálnév"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Bejelentkezve"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Utoljára látszott"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Idegroncs"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Szuper"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Király"
 
-#: ../pidgin/gtkblist.c:3394
+#: ../pidgin/gtkblist.c:3450
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Inaktív (%d n %d ó %02d p)"
+
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inaktív (%d ó %02d p)"
 
-#: ../pidgin/gtkblist.c:3396
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Inaktív (%d p)"
 
-#: ../pidgin/gtkblist.c:3533
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Partnerek/Új azonnali üzenet..."
 
-#: ../pidgin/gtkblist.c:3534
-#: ../pidgin/gtkblist.c:3567
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Partnerek/Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:3535
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Partnerek/Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:3536
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Partnerek/Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:3537
-#: ../pidgin/gtkblist.c:3570
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Partnerek/Csevegés felvétele..."
 
-#: ../pidgin/gtkblist.c:3538
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Partnerek/Csoport felvétele..."
 
-#: ../pidgin/gtkblist.c:3573
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Eszközök/Magánszféra"
 
-#: ../pidgin/gtkblist.c:3576
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Eszközök/Szobalista"
 
-#: ../pidgin/gtkblist.c:3673
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
 msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
 
-#: ../pidgin/gtkblist.c:3750
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Kézi"
 
-#: ../pidgin/gtkblist.c:3752
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "ABC sorrend"
 
-#: ../pidgin/gtkblist.c:3753
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Állapot szerint"
 
-#: ../pidgin/gtkblist.c:3754
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Napló mérete szerint"
 
-#: ../pidgin/gtkblist.c:3956
-#: ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bontotta a kapcsolatot"
 
-#: ../pidgin/gtkblist.c:3966
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Fiók újraengedélyezése"
 
-#: ../pidgin/gtkblist.c:3990
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bontotta a kapcsolatot: %s</span>"
 
-#: ../pidgin/gtkblist.c:4142
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Felhasználónév:</b>"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Jelszó:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Bejelentkezés"
 
-#: ../pidgin/gtkblist.c:4245
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Fiókok"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4259
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
-"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát és cseveghet barátaival."
+"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/"
+"Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő "
+"fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát "
+"és cseveghet barátaival."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4505
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Partnerek/Kilépett partnerek megjelenítése"
-
-#: ../pidgin/gtkblist.c:4508
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Partnerek/Üres csoportok megjelenítése"
-
-#: ../pidgin/gtkblist.c:4514
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Partnerek/Partner részleteinek megjelenítése"
-
-#: ../pidgin/gtkblist.c:4517
-msgid "/Buddies/Show Idle Times"
-msgstr "/Partnerek/Inaktivitási idők megjelenítése"
-
-#: ../pidgin/gtkblist.c:5367
-msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr "Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett kerül megjelenítésre, amennyiben az lehetséges.\n"
-
-#: ../pidgin/gtkblist.c:5427
-#: ../pidgin/gtkblist.c:5788
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Csoport:"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Partnerek/Megjelenítés/Kilépett partnerek"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Partnerek/Megjelenítés/Üres csoportok"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Partnerek/Megjelenítés/Partner részletei"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Partnerek/Megjelenítés/Inaktív idők"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Partnerek/Megjelenítés/Protokollikonok"
+
+#: ../pidgin/gtkblist.c:5501
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
+"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
+"kerül megjelenítésre, amennyiben az lehetséges.\n"
+
+#. End of account box
+#: ../pidgin/gtkblist.c:5536
+msgid "_Screen name:"
+msgstr "_Felhasználónév:"
+
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
+msgid "A_lias:"
+msgstr "Ál_név:"
 
-#: ../pidgin/gtkblist.c:5686
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
 
-#: ../pidgin/gtkblist.c:5702
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas lenne."
-
-#: ../pidgin/gtkblist.c:5743
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni kívánt csevegésről.\n"
+#: ../pidgin/gtkblist.c:5839
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
+"lenne."
+
+#: ../pidgin/gtkblist.c:5880
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
+"kívánt csevegésről.\n"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Kérem adja meg a felvenni kívánt csoport nevét."
 
-#: ../pidgin/gtkblist.c:6466
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Fiókok/"
 
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
-#: ../pidgin/gtkblist.c:6503
-#: ../pidgin/gtkconv.c:2923
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
 
-#: ../pidgin/gtkblist.c:6511
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:6523
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6529
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6578
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Eszközök"
 
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Partnerek/Partnerek rendezése"
 
@@ -11688,970 +13061,987 @@
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát és nem engedélyezi újra a fiókot."
+"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát "
+"és nem engedélyezi újra a fiókot."
 
-#: ../pidgin/gtkconv.c:788
-#: ../pidgin/gtkconv.c:814
+#: ../pidgin/gtkconv.c:462
+msgid "Unknown command."
+msgstr "Ismeretlen parancs."
+
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
 
-#: ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:754
 msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a partnert."
+msgstr ""
+"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
+"partnert."
 
-#: ../pidgin/gtkconv.c:861
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Partner meghívása a csevegőszobába"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:891
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy tetszőleges meghívóüzenettel együtt."
+#: ../pidgin/gtkconv.c:837
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
+"tetszőleges meghívóüzenettel együtt."
 
-#: ../pidgin/gtkconv.c:912
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Partner:"
 
-#: ../pidgin/gtkconv.c:932
-#: ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "Ü_zenet:"
 
-#: ../pidgin/gtkconv.c:989
-#: ../pidgin/gtkconv.c:2499
-#: ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Nem lehet megnyitni a fájlt."
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Társalgás %s partnerrel</h1>\n"
 
-#: ../pidgin/gtkconv.c:1031
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Társalgás mentése"
 
-#: ../pidgin/gtkconv.c:1180
-#: ../pidgin/gtkdebug.c:165
-#: ../pidgin/gtkdebug.c:741
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Keresés"
 
-#: ../pidgin/gtkconv.c:1206
-#: ../pidgin/gtkdebug.c:193
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Kere_sés:"
 
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
-
-#: ../pidgin/gtkconv.c:1366
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Mellőzés visszavonása"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Mellőzés"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Utoljára ezt mondta"
 
-#: ../pidgin/gtkconv.c:2507
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Nem menthető lemezre az ikonfájl."
 
-#: ../pidgin/gtkconv.c:2558
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Ikon mentése"
 
-#: ../pidgin/gtkconv.c:2610
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animálás"
 
-#: ../pidgin/gtkconv.c:2615
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Ikon elrejtése"
 
-#: ../pidgin/gtkconv.c:2618
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Ikon mentése másként..."
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Egyéni ikon beállítása..."
 
-#: ../pidgin/gtkconv.c:2635
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Egyéni ikon eltávolítása"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Összes megjelenítése"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Társalgás"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Társalgás/Új azonnali ü_zenet..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Társalgás/Ker_esés..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Társalgás/Nap_ló megtekintése"
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Társalgás/_Mentés másként..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Társalgás/Elő_zmények törlése"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Társalgás/Fájl kül_dése..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Társalgás/_Információ lekérése"
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Társalgás/Me_ghívás..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Társalgás/_Több"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Társalgás/Ál_név..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Társalgás/_Tiltás..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Társalgás/_Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Társalgás/_Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Társalgás/_Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2903
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Társalgás/_Hivatkozás beszúrása..."
+
+#: ../pidgin/gtkconv.c:2905
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Társalgás/Ké_p beszúrása..."
+
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Társalgás/_Bezárás"
 
 #. Options
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Beállítások"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Beállítások/_Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Beállítások/_Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:2824
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Beállítások/_Partnerikonok megjelenítése"
-
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Beállítások/_Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Beállítások/I_dőbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:2902
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Társalgás/Több"
 
+#: ../pidgin/gtkconv.c:3100
+msgid "/Options"
+msgstr "/Beállítások"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2947
-#: ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Társalgás"
 
-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Társalgás/Napló megtekintése"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése..."
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Társalgás/Információ lekérése"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Társalgás/Meghívás..."
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Társalgás/Álnév..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Társalgás/Tiltás..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Társalgás/Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Társalgás/Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Társalgás/Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3223
+msgid "/Conversation/Insert Link..."
+msgstr "/Társalgás/Hivatkozás beszúrása..."
+
+#: ../pidgin/gtkconv.c:3227
+msgid "/Conversation/Insert Image..."
+msgstr "/Társalgás/Kép beszúrása..."
+
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Beállítások/Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:3036
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Beállítások/Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Beállítások/Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Beállítások/Időbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:3055
-msgid "/Options/Show Buddy Icon"
-msgstr "/Beállítások/Partnerikon megjelenítése"
-
-#: ../pidgin/gtkconv.c:3139
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "A felhasználó gépel..."
 
-#: ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "A felhasználó gépelt valamit és megállt"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3366
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Küldés mint"
 
-#: ../pidgin/gtkconv.c:4080
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4229
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 személy tartózkodik a szobában"
 
-#: ../pidgin/gtkconv.c:5421
-#: ../pidgin/gtkconv.c:5542
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d személy van a szobában"
 msgstr[1] "%d személy van a szobában"
 
-#: ../pidgin/gtkconv.c:6108
-#: ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Gépel"
 
-#: ../pidgin/gtkconv.c:6114
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Abbahagyta a gépelést"
 
-#: ../pidgin/gtkconv.c:6119
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Becenév kimondva"
 
-#: ../pidgin/gtkconv.c:6124
-#: ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Olvasatlan üzenetek"
 
-#: ../pidgin/gtkconv.c:6129
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Új esemény"
 
-#: ../pidgin/gtkconv.c:7258
+#: ../pidgin/gtkconv.c:7550
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Törli a társalgás előzményeit."
+
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Bezárás jóváhagyása"
 
-#: ../pidgin/gtkconv.c:7290
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Olvasatlan üzenetei vannak. Biztos, hogy bezárja az ablakot?"
 
-#: ../pidgin/gtkconv.c:7807
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Más lapok bezárása"
 
-#: ../pidgin/gtkconv.c:7813
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Minden lap bezárása"
 
-#: ../pidgin/gtkconv.c:7821
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Ezen lap leválasztása"
 
-#: ../pidgin/gtkconv.c:7827
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Ezen lap bezárása"
 
-#: ../pidgin/gtkconv.c:8211
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Társalgás bezárása"
 
-#: ../pidgin/gtkconv.c:8732
+#: ../pidgin/gtkconv.c:9452
 msgid "Last created window"
 msgstr "Utoljára létrehozott ablak"
 
-#: ../pidgin/gtkconv.c:8734
+#: ../pidgin/gtkconv.c:9454
 msgid "Separate IM and Chat windows"
 msgstr "Üzenő- és csevegőablakok elkülönítése"
 
-#: ../pidgin/gtkconv.c:8736
-#: ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:9456 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Új ablak"
 
-#: ../pidgin/gtkconv.c:8738
+#: ../pidgin/gtkconv.c:9458
 msgid "By group"
 msgstr "Csoport szerint"
 
-#: ../pidgin/gtkconv.c:8740
+#: ../pidgin/gtkconv.c:9460
 msgid "By account"
 msgstr "Fiók szerint"
 
-#: ../pidgin/gtkdebug.c:232
+#: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Hibakereső napló mentése"
 
-#: ../pidgin/gtkdebug.c:580
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Invertálás"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Találatok kiemelése"
 
-#: ../pidgin/gtkdebug.c:650
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Csak i_kon"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Csak s_zöveg"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "Ik_on és szöveg"
 
-#: ../pidgin/gtkdebug.c:773
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Szűrő"
 
-#: ../pidgin/gtkdebug.c:792
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Kattintson a jobb egérgombbal további beállításokért."
 
-#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Szint: "
 
-#: ../pidgin/gtkdebug.c:823
-#: ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Válassza ki a hibakeresési szűrő szintjét."
 
-#: ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Minden"
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Egyéb"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Hiba "
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Végzetes hiba"
 
-#: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87
-#: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "fejlesztő"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "fejlesztő és webmester"
-
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "támogató"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "támogató/QA"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "fejlesztő és webmester"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Veterán közreműködő/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "win32 portolás"
 
-#: ../pidgin/gtkdialogs.c:110
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "karbantartó"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim karbantartó"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker és kijelölt vezető"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP fejlesztő"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "eredeti szerző"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../pidgin/gtkdialogs.c:125
-#: ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../pidgin/gtkdialogs.c:127
-#: ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129
-#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengáli"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Katalán"
 
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valenciai katalán"
 
-#: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Dán"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Német"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Görög"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Ausztrál angol"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanadai angol"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Brit angol"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Észt"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Baszk"
 
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../pidgin/gtkdialogs.c:156
-#: ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Francia"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galíciai"
 
-#: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gudzsarati fordítócsapat"
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Héber"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Magyar"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonéz"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Grúz"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Grúz Ubuntu fordítók"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada fordítócsapat"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Litván"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Macedón"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norvég Bokmål"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepáli"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Holland, flamand"
 
-#: ../pidgin/gtkdialogs.c:177
-msgid "Norwegian"
-msgstr "Norvég"
+#: ../pidgin/gtkdialogs.c:189
+msgid "Norwegian Nynorsk"
+msgstr "Norvég Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Lengyel"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugál"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Brazil portugál"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pastu"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Román"
 
-#: ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Szlovén"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albán"
 
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Szerb"
 
-#: ../pidgin/gtkdialogs.c:192
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Svéd"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Török"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh és a Gnome-Vi csapat"
 
-#: ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hongkongi kínai"
 
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
 
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amhara"
 
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "A %s névjegye"
 
-#: ../pidgin/gtkdialogs.c:365
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "A %s egy libpurple alapú moduláris üzenetküldő kliens AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu és QQ protokollok egyidejű használatának lehetőségével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett \"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 az irc.freenode.net hálózaton<BR><BR>"
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"A %s egy libpurple alapú moduláris üzenetküldő kliens AIM, MSN, Yahoo!, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, MySpaceIM, Gadu-Gadu és QQ protokollok egyidejű használatának lehetőségével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett \"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT "
+"fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin az irc.freenode.net hálózaton<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:405
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Őrült patch szerzők"
 
-#: ../pidgin/gtkdialogs.c:420
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Visszavonult fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:435
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "Visszavonult őrült patch szerzők"
+
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Grafikusok"
 
-#: ../pidgin/gtkdialogs.c:450
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Jelenlegi fordítók"
 
-#: ../pidgin/gtkdialogs.c:470
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Korábbi fordítók"
 
-#: ../pidgin/gtkdialogs.c:488
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Hibakeresési információk"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Felhasználó adatainak lekérése"
 
-#: ../pidgin/gtkdialogs.c:859
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg szeretné tekinteni."
+#: ../pidgin/gtkdialogs.c:892
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
+"szeretné tekinteni."
 
-#: ../pidgin/gtkdialogs.c:949
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Felhasználó naplójának lekérése"
 
-#: ../pidgin/gtkdialogs.c:951
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg szeretné tekinteni."
+#: ../pidgin/gtkdialogs.c:984
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
+"szeretné tekinteni."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Kapcsolat álneve"
 
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Adjon meg egy álnevet %s számára."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Partner álneve"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Csevegés álneve"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Adjon meg egy álnevet ehhez a csevegéshez."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
-msgstr[1] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
+msgstr[1] ""
+"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. Folytatni akarja?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. "
+"Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr "A(z) %s csoport és annak összes tagja eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"A(z) %s csoport és annak összes tagja eltávolítására készül a "
+"partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Csoport törlése"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Csoport eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Partner törlése"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "Partner _törlése"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
 msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Csevegés eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Csevegés eltávolítása"
 
@@ -12746,67 +14136,66 @@
 msgid "Time Remaining:"
 msgstr "Hátralévő idő:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Ezen _ablak bezárása az összes átvitel befejeződésekor"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "B_efejezett átvitelek törlése"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Fájlát_vitel részletei"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Szünet"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Folytatás"
 
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Beillesztés egyszerű szö_vegként"
 
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "F_ormázás törlése"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Hiperhivatkozás színe"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Hiperhivatkozások rajzolásához használt szín."
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Hiperhivatkozás előfényszíne"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Hiperhivatkozások rajzolásához használt szín, amikor az egér rájuk mutat."
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "E-mail cím _másolása"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "Hivatk_ozás megnyitása böngészőben"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Hivatkozás helyének másolása"
 
-#: ../pidgin/gtkimhtml.c:3211
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12816,7 +14205,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3214
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12826,7 +14215,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12837,7 +14226,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12848,196 +14237,285 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3310
-#: ../pidgin/gtkimhtml.c:3322
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Kép mentése"
 
-#: ../pidgin/gtkimhtml.c:3350
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "Kép menté_se..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Betűkészlet kiválasztása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Szöveg színének kiválasztása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Háttérszín kiválasztása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Leírás"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás opcionális."
+#: ../pidgin/gtkimhtmltoolbar.c:420
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
+"opcionális."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét."
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Hivatkozás beszúrása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Beszúrás"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "A kép tárolása nem sikerült: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513
-#: ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Kép beszúrása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Ehhez a témához nem állnak rendelkezésre hangulatjelek."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Hangulatjel választása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922
-#: ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "_Betű"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Elemek csoportosítása"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Csoportosítás megszüntetése"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Félkövér"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933
-#: ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Dőlt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944
-#: ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Aláhúzott"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Nagyobb betűméret"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Kisebb betűméret"
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Áthúzott"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Betűméret növelése"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Betűméret csökkentése"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
 msgstr "Betűkészlet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Betűszín"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
 msgstr "Háttérszín"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Formázás törlése"
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Előtérszín"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Hivatkozás beszúrása"
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Formázás törlése"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
 msgstr "Kép beszúrása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
-#: ../pidgin/gtklog.c:267
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>_Félkövér</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>_Dőlt</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>_Aláhúzott</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span size='larger'>Áthúzott</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Nagyobb</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "_Normal"
+msgstr "N_ormál"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>_Kisebb</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "_Font face"
+msgstr "_Betűkészlet"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "_Előtérszín"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "_Háttérszín"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1266
+msgid "_Smiley"
+msgstr "Hang_ulatjel"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1272
+msgid "_Image"
+msgstr "Ké_p"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1278
+msgid "_Link"
+msgstr "_Hivatkozás"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Vízszintes szabály"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
-msgstr "Biztos, hogy törölni akarja a(z) %s partnerrel folytatott, %s időpontban kezdődött beszélgetés naplóját?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Biztos, hogy törölni akarja a(z) %s partnerrel folytatott, %s időpontban "
+"kezdődött beszélgetés naplóját?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
-msgstr "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban kezdődött beszélgetés naplóját?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban "
+"kezdődött beszélgetés naplóját?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Társalgás itt: %s, ekkor: %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Társalgás ezzel: %s, ekkor: %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: ../pidgin/gtklog.c:524
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
-
-#: ../pidgin/gtklog.c:528
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali üzenet naplózása\" tulajdonság be van állítva."
+#: ../pidgin/gtklog.c:549
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
+"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
+
+#: ../pidgin/gtklog.c:553
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali "
+"üzenet naplózása\" tulajdonság be van állítva."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása\" tulajdonság be van állítva."
+msgstr ""
+"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
+"\" tulajdonság be van állítva."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Nem találhatók naplók"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "A _naplómappa böngészése"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Teljes naplóméret:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Társalgások ezen: %s"
 
-#: ../pidgin/gtklog.c:691
-#: ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Társalgások a következővel: %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "Rendszernapló"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Próbálja a \"%s -h\" parancsot további információkért.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13046,6 +14524,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -13057,12 +14536,13 @@
 "  -c, --config=KÖNYVTÁR A KÖNYVTÁR használata a beállítófájlokhoz\n"
 "  -d, --debug         hibakereső üzenetek kiírása a szabványos kimenetre\n"
 "  -h, --help          ezen súgó megjelenítése és kilépés\n"
+"  -m, --multiple      ne csak egy példány futhasson\n"
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
 "  -l, --login[=NÉV]   automatikus bejelentkezés (a NÉV paraméter megadja a\n"
 "                      használandó fiókok vesszőkkel tagolt listáját)\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../pidgin/gtkmain.c:493
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13071,7 +14551,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -13088,7 +14568,7 @@
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Győződjön meg róla, hogy megadta, mit csinált az összeomlás előtt,\n"
 "és küldje be a visszakövetésből származó magfájlt. Ha nem tudja, hogyan\n"
@@ -13096,56 +14576,56 @@
 "utasításokat:\n"
 "%swiki/GetABacktrace\n"
 "\n"
-"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (AIM protokollon, angolul)\n"
+"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (AIM "
+"protokollon, angolul)\n"
 "SeanEgn-nak vagy LSchiere-nek. Sean és Luke kapcsolatinformációi más\n"
 "protokollokhoz elérhetők a következő oldalon:\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Összes üzenet megnyitása"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Feladó"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s %d új üzenetet kapott."
 msgstr[1] "%s %d új üzenetet kapott."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>%d új e-mailje érkezett.</b>"
 msgstr[1] "<b>%d új e-mailje érkezett.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "A(z) \"%s\" böngészőparancs érvénytelen."
 
-#: ../pidgin/gtknotify.c:953
-#: ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978
-#: ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Az URL megnyitása sikertelen"
 
-#: ../pidgin/gtknotify.c:963
-#: ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Hiba \"%s\" indításakor: %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "A \"Kézi\" böngészőparancsot választotta, de nem adott meg parancsot."
 
@@ -13191,343 +14671,370 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Bővítmény részletei</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Fájl kiválasztása"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Kinél figyelmeztet"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Partner neve:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Be_jelentkezik"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "_Kijelentkezik"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "A partner _elmegy"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "Visszaté_r távollétből"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "_Inaktív lesz"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "_Már nem inaktív"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Elkez_d gépelni"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "_Felfüggeszti a gépelést"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "_Abbahagyja a gépelést"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Ü_zenetet küld"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Azonnali üzenőablak _megnyitása"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Értesítés _megjelenítése"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Ü_zenet küldése"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Paran_cs végrehajtása"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Hang _lejátszása"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Tallózás..."
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Tallózás..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Előnézet"
 
-#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
-msgstr "_Csak akkor figyelmeztet, ha az állapotom nem érhető el"
+#: ../pidgin/gtkpounce.c:797
+msgid "P_ounce only when my status is not Available"
+msgstr "_Csak akkor figyelmeztet, ha az állapotom nem \"Elérhető\""
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Ismétlődő"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Figyelmeztetés címzettje"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
 
-#: ../pidgin/gtkprefs.c:638
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új témák a témalistába dobással telepíthetők."
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Téma telepítése"
+
+#: ../pidgin/gtkprefs.c:696
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
+"témák a témalistába dobással telepíthetők."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Rendszertálca-ikon"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_Rendszertálca-ikon megjelenítése:"
 
-#: ../pidgin/gtkprefs.c:819
-#: ../pidgin/gtkprefs.c:831
-#: ../pidgin/gtkprefs.c:1648
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Mindig"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Olvasatlan üzenetek esetén"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Társalgási ablak elrejtése"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "Új társal_gások elrejtése:"
 
-#: ../pidgin/gtkprefs.c:830
-#: ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Ha távol vagyok"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Lapok"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Üzenetek és csevegések megjelenítése _lapokkal ellátott ablakokban"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "_Bezárás gomb megjelenítése a lapokon"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Elhelyezés:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Felül"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Alul"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Bal oldalon"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Jobb oldalon"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Balra függőlegesen"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Jobbra függőlegesen"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "Új _társalgások:"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "_Formázás mutatása bejövő üzeneteknél"
 
-#: ../pidgin/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "_Partnerikonok megjelenítése"
+#: ../pidgin/gtkprefs.c:997
+msgid "Show _detailed information"
+msgstr "_Részletes információk megjelenítése"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Partnerikon-a_nimáció engedélyezése"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Partnerek figyelmez_tetése, ha nekik gépel"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Helytelenül írt szavak kiemelése"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Finom görgetés használata"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Villanjon az ablak új üzenetek fogadásakor"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Új társalgási ablakok _minimalizálása"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Betűkészlet"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "A _téma dokumentum-betűkészletének használata"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "A téma _betűkészletének használata"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "_Társalgás betűkészlete:"
+
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Alapértelmezett formázás"
 
-#: ../pidgin/gtkprefs.c:941
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, amelyek támogatják a formázást. :)"
+#: ../pidgin/gtkprefs.c:1061
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
+"amelyek támogatják a formázást."
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN kiszolgáló:"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Például: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_IP cím automatikus felismerése"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "_Nyilvános IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portok"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "A figyelendő porttartomány _kézi megadása"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Első port:"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Utolsó port:"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proxy-kiszolgáló"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Nincs Proxy"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Felhasználó:"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME alapértelmezés"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Egyéni"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Böngészőválasztás"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Böngésző:"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "Hivatk_ozás megnyitása:"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Alapértelmezett böngésző"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Létező ablak"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Új lap"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13536,81 +15043,63 @@
 "_Kézi:\n"
 "(%s az URL-hez)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Napló_formátum:"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Összes azonnali üzenet na_plózása"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Összes _csevegés naplózása"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Összes állapot_változás naplózása a rendszernaplóba"
 
-#: ../pidgin/gtkprefs.c:1475
-#: ../pidgin/gtkprefs.c:1564
-#: ../pidgin/gtkprefs.c:1756
-msgid "(default)"
-msgstr "(alapértelmezett)"
-
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Hang kiválasztása"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Leghalkabb"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Halkabb"
 
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Halk"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Hangos"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Hangosabb"
 
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Leghangosabb"
 
-#: ../pidgin/gtkprefs.c:1598
-msgid "Sound Method"
-msgstr "Hangrendszer"
-
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "Hang_rendszer kiválasztása:"
 
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Rendszer-hangszóró"
 
-#: ../pidgin/gtkprefs.c:1603
-msgid "Automatic"
-msgstr "Automatikus"
-
-#: ../pidgin/gtkprefs.c:1606
-msgid "Command"
-msgstr "Parancs"
-
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Nincsenek hangok"
 
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13619,117 +15108,81 @@
 "Hanglejátszó _parancs:\n"
 "(%s fájlnév megadásához)"
 
-#: ../pidgin/gtkprefs.c:1641
-msgid "Sound Options"
-msgstr "Hangbeállítások"
-
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Hangok lejátszása, ha a társalgás ablaka a_ktív"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Hangok engedélyezése:"
 
-#: ../pidgin/gtkprefs.c:1646
-msgid "Only when available"
-msgstr "Csak ha elérhető"
-
-#: ../pidgin/gtkprefs.c:1647
-msgid "Only when not available"
-msgstr "Csak ha nem érhető el"
-
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Hangerő:"
 
-#: ../pidgin/gtkprefs.c:1683
-msgid "Sound Events"
-msgstr "Hangesemények"
-
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Lejátszás"
 
-#: ../pidgin/gtkprefs.c:1741
-msgid "Event"
-msgstr "Esemény"
-
-#: ../pidgin/gtkprefs.c:1760
-msgid "Test"
-msgstr "Teszt"
-
-#: ../pidgin/gtkprefs.c:1764
-msgid "Reset"
-msgstr "Visszaállítás"
-
-#: ../pidgin/gtkprefs.c:1768
-msgid "Choose..."
-msgstr "Kiválasztás..."
-
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Inaktivitás idejének jelentése:"
 
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Billentyűzet vagy egér használata alapján"
 
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Automatikus válasz:"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Ha távol van és inaktív"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Automatikus távollét"
 
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Állapot módosítása, _ha inaktív"
 
-#: ../pidgin/gtkprefs.c:1841
-msgid "_Minutes before changing status:"
-msgstr "Állapot módosítása ennyi _perc után:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
+msgstr "Üresjárat ennyi _perc után:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Állap_ot megváltoztatása a következőre:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Állapot induláskor"
 
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Az utolsó kilé_péskor érvényes állapot használata induláskor"
 
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "In_dításkor alkalmazandó állapot:"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Felület"
 
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Hangulatjel-témák"
 
-#: ../pidgin/gtkprefs.c:1919
-msgid "Sounds"
-msgstr "Hangok"
-
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Böngésző"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Állapot / Inaktív"
 
@@ -13753,66 +15206,65 @@
 msgid "Block only the users below"
 msgstr "Csak a következő felhasználók letiltása:"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Magánszféra"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "A magánszféra beállításainak módosításai azonnal életbe lépnek."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Magánszféra beállításai ehhez:"
 
-#: ../pidgin/gtkprivacy.c:560
-#: ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Felhasználó engedélyezése"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Adjon meg egy felhasználót, aki kapcsolatba léphet Önnel."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy kapcsolatba lépjen Önnel."
+msgstr ""
+"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
+"kapcsolatba lépjen Önnel."
 
-#: ../pidgin/gtkprivacy.c:565
-#: ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Engedélyezés"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Megengedi, hogy %s kapcsolatba lépjen Önnel?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
 
-#: ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Felhasználó tiltása"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Adjon meg egy letiltandó felhasználót."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Adja meg a letiltani kívánt felhasználó nevét."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Letiltja a következőt: %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Biztosan le akarja tiltani %s felhasználót?"
@@ -13821,209 +15273,173 @@
 msgid "Apply"
 msgstr "Alkalmazás"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ez a fájl már létezik"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Szeretné felülírni?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Új név választása"
 
-#: ../pidgin/gtkrequest.c:1624
-#: ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Válasszon mappát..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Szobalista"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "Lista _lekérése"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "Cse_vegés hozzáadása"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Biztos, hogy törölni akarja a kijelölt mentett állapotokat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580
-#: ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Használat"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "A cím már használatban van. Használjon egyedi címet."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Eltérő"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Cím:"
 
-#: ../pidgin/gtksavedstatuses.c:1126
-#: ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "Áll_apot:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "_Eltérő állapot használata egyes fiókokhoz"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Menté_s és használat"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "%s állapota"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Partner belép"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Partner kilép"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Üzenet fogadása"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Társalgás kezdetét jelző üzenet"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Üzenet elküldve"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Egy személy csatlakozik a csevegéshez"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Egy személy elhagyja a csevegést"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Ön beszél a csevegésben"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Mások beszélnek a csevegésben"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer hiba"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "A GStreamer inicializálása meghiúsult."
-
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Várakozás a hálózati kapcsolatra"
 
-#: ../pidgin/gtkutils.c:516
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1372
-#: ../pidgin/gtkutils.c:1395
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "A következő hiba történt %s betöltése közben: %s"
 
-#: ../pidgin/gtkutils.c:1375
-#: ../pidgin/gtkutils.c:1397
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "A kép betöltése meghiúsult"
 
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "A(z) %s mappa nem küldhető el."
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1498
 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr "A(z) %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat egyenként kell elküldenie."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"A(z) %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat "
+"egyenként kell elküldenie."
 
-#: ../pidgin/gtkutils.c:1504
-#: ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1523
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Egy képet húzott be"
 
-#: ../pidgin/gtkutils.c:1505
-msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
-msgstr "Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+#: ../pidgin/gtkutils.c:1531
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
+"használhatja ezen felhasználó partnerikonjaként."
 
-#: ../pidgin/gtkutils.c:1511
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Beállítás partnerikonként"
 
-#: ../pidgin/gtkutils.c:1512
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Képfájl küldése"
 
-#: ../pidgin/gtkutils.c:1513
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Beszúrás az üzenetbe"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
 
-#: ../pidgin/gtkutils.c:1524
-msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
-msgstr "Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
-
-#: ../pidgin/gtkutils.c:1526
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó partnerikonjaként."
+#: ../pidgin/gtkutils.c:1550
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként vagy használhatja ezen felhasználó "
+"partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1551
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
+"partnerikonjaként."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Az indítóikon nem küldhető el"
 
-#: ../pidgin/gtkutils.c:1584
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr "Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott objektumot akarta elküldeni az indítóikon helyett."
+#: ../pidgin/gtkutils.c:1609
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
+"objektumot akarta elküldeni az indítóikon helyett."
 
 #: ../pidgin/gtkutils.c:2344
 #, c-format
@@ -14057,79 +15473,87 @@
 #: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült a képfájl"
+msgstr ""
+"A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült "
+"a képfájl"
 
-#: ../pidgin/gtkwhiteboard.c:760
-#: ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Fájl mentése"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Szín kiválasztása"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "Ál_név"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "_Lapok bezárása"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Információ le_kérése"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "Meg_hívás"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Módosítás"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin hangulatjelek"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "Ennek kiválasztása letiltja a grafikus hangulatjeleket."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "nincs"
+
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Statisztikák megjelenítése"
 
-#: ../pidgin/plugins/cap/cap.c:461
-#: ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Válasz valószínűsége:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statisztika beállítása"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Legnagyobb válasz-időkorlát:"
 
-#: ../pidgin/plugins/cap/cap.c:816
-#: ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830
-#: ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "perc"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Legnagyobb utoljára-látszott különbség:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Küszöb:"
 
@@ -14139,20 +15563,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Partnerelérhetőség-előrejelzés"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Partnerelérhetőség-előrejelző bővítmény."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
-msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
-msgstr "A partnerelérhetőség bővítmény statisztikai információk megjelenítésére szolgál a felhasználó partnerlistáján található partnerekről."
+#: ../pidgin/plugins/cap/cap.c:939
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"A partnerelérhetőség bővítmény statisztikai információk megjelenítésére "
+"szolgál a felhasználó partnerlistáján található partnerekről."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -14180,8 +15608,12 @@
 msgstr "Pontértékek használata, ha..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
-msgstr "A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog rendelkezni a kapcsolatban.\n"
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
+"rendelkezni a kapcsolatban.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -14206,19 +15638,24 @@
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:190
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek beállítását."
+msgstr ""
+"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
+"beállítását."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
+"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Társalgás színei"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "A társalgási ablak színeinek testreszabása"
 
@@ -14242,8 +15679,7 @@
 msgid "Received Messages"
 msgstr "Fogadott üzenetek"
 
-#: ../pidgin/plugins/convcolors.c:210
-#: ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Válassza ki %s színét"
@@ -14270,8 +15706,12 @@
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
-msgstr "Megjegyzés: Az \"Új társalgások\" beállítást \"Társalgások száma szerint\" értékre kell állítani."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Megjegyzés: Az \"Új társalgások\" beállítást \"Társalgások száma szerint\" "
+"értékre kell állítani."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -14300,8 +15740,12 @@
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali üzenetek és csevegés elkülönítése"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali "
+"üzenetek és csevegés elkülönítése"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -14360,67 +15804,80 @@
 msgstr "Azonnali üzenetküldés"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Jelöljön ki egy személyt a címjegyzékéből vagy adjon hozzá egy újat."
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Csoport:"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Új személy"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Partner kiválasztása"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek vagy hozzon létre egy újat."
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
+"vagy hozzon létre egy újat."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "F_elhasználó részletei"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Partner összerendelése"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "Nem küldhető e-mail"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr "Az evolution végrehajtható állomány nem található a PATH változóban megadott útvonalon."
+msgstr ""
+"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
+"útvonalon."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Nem található e-mail cím ehhez a partnerhez."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Hozzáadás a címjegyzékhez"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "E-mail küldése"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution integráció beállítása"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá kell rendelni."
+msgstr ""
+"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
+"kell rendelni."
 
 #. *< type
 #. *< ui_requirement
@@ -14428,7 +15885,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution integráció"
 
@@ -14436,40 +15893,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Integrációt biztosít az Evolutionnel."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Kérem adja meg alább a személy adatait."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Kérem adja meg a partner felhasználónevét és fiókjának típusát."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Fiók típusa:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Opcionális információk:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Utónév:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Vezetéknév:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-mail:"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Partnerjegyzet</b>: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14507,8 +15973,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
 
@@ -14528,8 +15993,7 @@
 msgid "Markerline"
 msgstr "Jelölő vonal"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Vonal húzása a társalgás új üzeneteinek jelzése érdekében."
 
@@ -14537,50 +16001,52 @@
 msgid "Draw Markerline in "
 msgstr "Jelölő vonal húzása a következőkben:"
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_IM ablakok"
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Csevegőablakok"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson az MM ikonra."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
+"az MM ikonra."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "A zenei üzenetküldő munkamenet megerősítve."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Zenei üzenetküldés"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Ütközés történt a következő parancs futtatása közben:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Hiba a szerkesztő futtatása közben"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "A következő hiba történt:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Zenei üzenetküldés beállítása"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Kottaszerkesztő útvonala"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
@@ -14592,84 +16058,88 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
-msgstr "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
+"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Figyelmeztetés"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Csak ha valaki kimondja az Ön felhasználónevét"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fókuszban lévő ablakok"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Értesítési módok"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "_Szöveg beszúrása az ablak címe elé:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Új üzenetek számának _beszúrása az ablak címébe"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Új üzenetek számának beszúrása az _X tulajdonságba"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "\"_SÜRGŐS\" tipp beállítása az ablakkezelő számára"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_Társalgási ablak előtérbe hozása"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Értesítés eltávolítása"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Eltávolítás, mikor a társalgás ablaka _aktívvá válik"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Eltávolítás a tá_rsalgás ablakára kattintáskor"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eltávolítás a _társalgás ablakában történő gépeléskor"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eltávolítás, mikor egy ü_zenet elküldésre kerül"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eltávolítás a társalgás lapjára _váltáskor"
 
@@ -14679,7 +16149,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Üzenetértesítés"
 
@@ -14687,8 +16157,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904
-#: ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
 
@@ -14758,24 +16227,24 @@
 msgid "Notify Dialog"
 msgstr "Figyelmeztetés párbeszédablak"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Válasszon színt"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Válassza ki a felület betűkészletét"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Válassza ki %s betűkészletét"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Válassza ki a felület betűkészletét"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ felület betűkészlete"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ szöveges gyorsbillentyű téma"
 
@@ -14799,37 +16268,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Felület színei"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
-msgstr "Felöleti elemek méretei"
+msgstr "Felületi elemek méretei"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Eszközök"
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc fájleszközök"
 
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Beállítások kiírása ide: %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "A gtkrc fájlok újraolvasása"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ témavezérlés"
 
-#: ../pidgin/plugins/pidginrc.c:626
-#: ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
 
@@ -14842,30 +16310,29 @@
 msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
 
 #: ../pidgin/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (XMPP, MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a hibakereső ablakot."
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (XMPP, "
+"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
+"hibakereső ablakot."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
-msgstr "A %s %s verzióját használja. A jelenleg legfrissebb verzió: %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
 msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
-"<b>Változások naplója:</b>\n"
-"%s<br><br>"
+"A %s %s verzióját használja. A jelenlegi verzió: %s. A <a href=\"%s\">%s</a> "
+"oldalról letöltheti<hr>"
 
-#: ../pidgin/plugins/relnot.c:82
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
-msgid "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin.im</a>."
-msgstr "A(z) %s verzióhoz hozzájuthat a <br><a href=\"http://pidgin.im/\">http://pidgin.im</a> címről."
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Változások naplója:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:86
-#: ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Új verzió érhető el"
 
@@ -14875,87 +16342,94 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Kiadásértesítés"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Rendszeresen ellenőrzi az új programverziók megjelenését."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának segítségével értesíti a felhasználót."
+#: ../pidgin/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
+"segítségével értesíti a felhasználót."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Kettőzés javítása"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "A megadott szó már létezik a javítási listában."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Szövegek cseréje"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Ezt írja"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Ezt küldi"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Csak teljes szavak"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Kis- és nagybetű"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Új szöveghelyettesítés felvétele"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Ezt ír_ja:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Ezt _küldi:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus kezeléséhez)"
+msgstr ""
+"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
+"kezeléséhez)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "_Csak teljes szavak cseréje"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Szövegcsere általános beállításai"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Az utolsó szó helyettesítésének engedélyezése küldéskor"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Szöveg cseréje"
 
-#: ../pidgin/plugins/spellchk.c:2375
-#: ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a kimenő üzenetekben."
+msgstr ""
+"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
+"kimenő üzenetekben."
 
 #. *< type
 #. *< ui_requirement
@@ -14963,8 +16437,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77
-#: ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Partnerfigyelő"
 
@@ -14972,8 +16445,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358
-#: ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vízszintesen gördülő partnerlista."
 
@@ -15052,47 +16524,51 @@
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és naplóüzenetek időpecsét-formátumainak testreszabását."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
+"naplóüzenetek időpecsét-formátumainak testreszabását."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Átlátszatlanság:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "IM társalgási ablakok"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_IM ablak átlátszósága"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "C_súszka mutatása az IM ablakban"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "IM ablak átlátszóságának eltávolítása, ha fókuszt kap"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Mindig legfelül"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Partnerlista-ablak"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "_Partnerlista-ablak átlátszósága"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Partnerlista-ablak átlátszóságának eltávolítása, ha fókuszt kap"
 
@@ -15102,73 +16578,77 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Átlátszóság"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Változtatható átlátszóság a partnerlistához és a társalgásokhoz."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a társalgás és a partnerlista ablakában.\n"
+"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
+"társalgás és a partnerlista ablakában.\n"
 "\n"
 "* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ runtime verzió"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Indítás"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "A %s indítá_sa a Windows indulásakor"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Dokkolható partnerlista"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Partnerlista-ablak mindig felül:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Csak ha dokkolt"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Villogtassa az ablakot új csevegésüzenetek fogadásakor"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "A windowsos Pidin beállításai"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "A windowsos Pidginre jellemző beállítások."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "A windowsos Pidginre jellemző beállításokat biztosít, mint például a partnerlista dokkolása."
+msgstr ""
+"A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
+"partnerlista dokkolása."
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Kijelentkezve.</font>"
 
@@ -15178,8 +16658,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745
-#: ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP konzol"
@@ -15214,5 +16693,7 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez hasznos."
+msgstr ""
+"Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
+"hasznos."
 
diff -ru pidgin-2.1.1/po/id.po pidgin-2.2.0/po/id.po
--- pidgin-2.1.1/po/id.po	2007-08-20 14:13:03.000000000 -0400
+++ pidgin-2.2.0/po/id.po	2007-09-14 00:45:43.000000000 -0400
@@ -14281,7 +14281,7 @@
 msgstr "Aktifkan ID yang mana?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Gabung siapa dalam percakapan?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/it.po pidgin-2.2.0/po/it.po
--- pidgin-2.1.1/po/it.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/it.po	2007-09-14 00:45:43.000000000 -0400
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-14 16:00+0200\n"
-"PO-Revision-Date: 2007-07-14 17:25+0100\n"
+"POT-Creation-Date: 2007-08-26 12:25+0200\n"
+"PO-Revision-Date: 2007-08-26 14:25+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -19,19 +19,19 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70
-#: ../finch/finch.c:298
-#: ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64
+#: ../finch/finch.c:300
+#: ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -51,26 +51,27 @@
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -n, --nologin       non effettuare il login automatico  -v, --version       mostra la versione attuale ed esce\n"
 
-#: ../finch/finch.c:325
-#: ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327
+#: ../pidgin/gtkmain.c:711
 #, c-format
 msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
 msgstr "%s si è imbattuto in un errore nella migrazione delle tue impostazioni da %s a %s. Prova a verificare e completare la migrazione a mano. Per piacere, riporta questo errore su http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:123
-#: ../finch/gntaccount.c:478
+#: ../finch/gntaccount.c:483
 #: ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424
-#: ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
 #: ../finch/gntplugin.c:185
 #: ../finch/gntplugin.c:233
 #: ../finch/gntstatus.c:300
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1227
 #: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576
 #: ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
@@ -85,69 +86,70 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Il nome utente per un account non può essere vuoto."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Notifica i nuovi messaggi di posta"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Ricorda la password"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Non c'è nessun plugin per i protocolli installato."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Hai probabilmente dimenticato il comando 'make install'.)"
 
-#: ../finch/gntaccount.c:490
-#: ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495
+#: ../pidgin/gtkaccount.c:1468
+#: ../pidgin/gtkblist.c:4025
 msgid "Modify Account"
 msgstr "Modifica l'account"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nuovo account"
 
-#: ../finch/gntaccount.c:515
+#: ../finch/gntaccount.c:520
 #: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nome utente:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569
-#: ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878
+#: ../finch/gntaccount.c:574
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883
 #: ../finch/gntblist.c:343
-#: ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447
-#: ../finch/gntblist.c:794
-#: ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092
-#: ../finch/gntblist.c:2198
+#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455
+#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100
+#: ../finch/gntblist.c:2221
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:458
-#: ../finch/gntpounce.c:656
+#: ../finch/gntpounce.c:666
 #: ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054
 #: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606
+#: ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609
 #: ../libpurple/account.c:984
 #: ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269
@@ -170,19 +172,19 @@
 #: ../libpurple/protocols/msn/msn.c:293
 #: ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6044
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
@@ -205,45 +207,46 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
-#: ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727
-#: ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957
-#: ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001
-#: ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071
-#: ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168
-#: ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../pidgin/gtkaccount.c:1903
+#: ../pidgin/gtkaccount.c:2497
+#: ../pidgin/gtkblist.c:5927
+#: ../pidgin/gtkdialogs.c:750
+#: ../pidgin/gtkdialogs.c:888
+#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1024
+#: ../pidgin/gtkdialogs.c:1046
+#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1135
+#: ../pidgin/gtkdialogs.c:1191
+#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1257
 #: ../pidgin/gtkimhtmltoolbar.c:425
 #: ../pidgin/gtklog.c:327
 #: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562
 #: ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
 #: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Annulla"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573
+#: ../finch/gntaccount.c:578
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:464
 #: ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594
+#: ../finch/gntsound.c:1051
+#: ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597
 #: ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587
@@ -252,111 +255,111 @@
 msgid "Save"
 msgstr "Salva"
 
-#: ../finch/gntaccount.c:626
-#: ../pidgin/gtkaccount.c:1900
+#: ../finch/gntaccount.c:631
+#: ../pidgin/gtkaccount.c:1895
 #: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1576
+#: ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Cancella account"
 
 #. Delete button
-#: ../finch/gntaccount.c:631
-#: ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655
-#: ../finch/gntpounce.c:718
+#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665
+#: ../finch/gntpounce.c:728
 #: ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1907
+#: ../pidgin/gtkaccount.c:1902
 #: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114
+#: ../pidgin/gtkpounce.c:1099
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1581
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../finch/gntaccount.c:663
-#: ../finch/gntblist.c:2104
-#: ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327
+#: ../finch/gntaccount.c:668
+#: ../finch/gntblist.c:2118
+#: ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2320
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Account"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Puoi abilitare/disabilitare gli account dalla seguente lista."
 
 #. Add button
-#: ../finch/gntaccount.c:692
-#: ../finch/gntaccount.c:877
+#: ../finch/gntaccount.c:697
+#: ../finch/gntaccount.c:882
 #: ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455
 #: ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702
+#: ../finch/gntpounce.c:712
 #: ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878
-#: ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914
-#: ../pidgin/gtkconv.c:1651
+#: ../pidgin/gtkaccount.c:2496
+#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkconv.c:1624
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Aggiungi"
 
 #. Modify button
-#: ../finch/gntaccount.c:697
-#: ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702
+#: ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../finch/gntaccount.c:800
-#: ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:805
+#: ../pidgin/gtkaccount.c:2443
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s"
 
-#: ../finch/gntaccount.c:873
-#: ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:878
+#: ../pidgin/gtkaccount.c:2495
 msgid "Add buddy to your list?"
 msgstr "Vuoi aggiungere il contatto alla tua lista?"
 
-#: ../finch/gntaccount.c:927
-#: ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938
+#: ../pidgin/gtkaccount.c:2553
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s vuole aggiungere %s alla sua lista dei contatti%s%s"
 
-#: ../finch/gntaccount.c:952
-#: ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982
-#: ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:963
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Authorize buddy?"
 msgstr "Autorizzare l'utente?"
 
-#: ../finch/gntaccount.c:959
-#: ../finch/gntaccount.c:986
-#: ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2577
+#: ../pidgin/gtkaccount.c:2583
 msgid "Authorize"
 msgstr "Autorizza"
 
-#: ../finch/gntaccount.c:960
-#: ../finch/gntaccount.c:987
-#: ../pidgin/gtkaccount.c:2576
-#: ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2578
+#: ../pidgin/gtkaccount.c:2584
 msgid "Deny"
 msgstr "Blocca"
 
@@ -381,49 +384,49 @@
 msgstr "Errore nell'aggiunta del contatto"
 
 #: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983
+#: ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1976
 #: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nome utente"
 
 #: ../finch/gntblist.c:327
-#: ../finch/gntblist.c:404
-#: ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:409
+#: ../finch/gntblist.c:1249
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
 #: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1045
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
 #: ../finch/gntblist.c:330
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Gruppo"
 
 #: ../finch/gntblist.c:334
-#: ../finch/gntblist.c:395
-#: ../finch/gntblist.c:1292
+#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173
-#: ../finch/gntstatus.c:572
+#: ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974
-#: ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282
-#: ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2988
+#: ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Account"
 
 #: ../finch/gntblist.c:340
-#: ../finch/gntblist.c:843
+#: ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -432,8 +435,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
-#: ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../pidgin/gtkblist.c:5433
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Aggiungi un contatto"
@@ -442,13 +445,13 @@
 msgid "Please enter buddy information."
 msgstr "Inserisci le informazioni sul contatto."
 
-#: ../finch/gntblist.c:367
+#: ../finch/gntblist.c:369
 #: ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chat"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:406
 #: ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553
 #: ../libpurple/protocols/msn/msn.c:1618
@@ -461,164 +464,164 @@
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:410
-#: ../finch/gntblist.c:845
-#: ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415
+#: ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Entra automaticamente"
+
+#: ../finch/gntblist.c:418
+#: ../finch/gntblist.c:853
+#: ../pidgin/gtkblist.c:5812
 msgid "Add Chat"
 msgstr "Aggiungi una chat"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Puoi inserire maggiori informazioni successivamente dal menù contestuale."
 
-#: ../finch/gntblist.c:424
-#: ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Errore nell'aggiunta del gruppo"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Specificare un nome per il gruppo da aggiungere."
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Esiste già una gruppo con questo nome."
 
-#: ../finch/gntblist.c:445
-#: ../finch/gntblist.c:847
+#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
 #: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:5911
+#: ../pidgin/gtkblist.c:5923
 msgid "Add Group"
 msgstr "Aggiungi un gruppo"
 
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Inserisci il nome del gruppo"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Modifica la chat"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Aggiorna i campi obbligatori."
 
-#: ../finch/gntblist.c:794
+#: ../finch/gntblist.c:802
 #: ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "Entra automaticamente"
-
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Modifica le impostazioni"
 
-#: ../finch/gntblist.c:855
-#: ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Informazione"
 
-#: ../finch/gntblist.c:855
-#: ../pidgin/gtkutils.c:926
-#, fuzzy
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
-msgstr "Connessione in corso..."
+msgstr "Sacaricamento in corso..."
 
-#: ../finch/gntblist.c:895
-#: ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903
+#: ../finch/gntconv.c:436
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Info"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Aggiungi un allarme"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906
-#: ../finch/gntconv.c:419
+#: ../finch/gntblist.c:914
+#: ../finch/gntconv.c:448
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654
-#: ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../libpurple/protocols/oscar/oscar.c:653
+#: ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1572
 msgid "Send File"
 msgstr "Invia file"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Mostra il log"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Inserire un nuovo nome per %s"
 
-#: ../finch/gntblist.c:993
-#: ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Imposta un alias"
 
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Inserisci una stringa vuota per resettare il nome."
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti appartenenti al gruppo"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "La rimozione di questo gruppo comporterà l'eliminazione di tutti i contatti appartenenti al gruppo"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Sei sicuro di voler rimuovere %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Conferma rimozione"
 
-#: ../finch/gntblist.c:1091
-#: ../finch/gntblist.c:1242
-#: ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648
+#: ../finch/gntblist.c:1099
+#: ../finch/gntblist.c:1251
+#: ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1621
 #: ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. Buddy List
-#: ../finch/gntblist.c:1216
-#: ../finch/gntblist.c:2283
+#: ../finch/gntblist.c:1225
+#: ../finch/gntblist.c:2306
 #: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78
-#: ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkblist.c:4269
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
 #, fuzzy
 msgid "Place tagged"
 msgstr "Posti in cui hai vissuto"
 
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1287
+#: ../finch/gntblist.c:1297
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045
 #: ../libpurple/protocols/gg/gg.c:1118
@@ -639,34 +642,34 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042
-#: ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3012
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1307
+#: ../finch/gntblist.c:1319
 #: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../libpurple/protocols/bonjour/bonjour.c:333
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686
-#: ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435
-#: ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3040
+#: ../pidgin/gtkblist.c:3445
+#: ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr "Inattivo"
 
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Al cellulare"
 
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -675,12 +678,12 @@
 "In linea: %d\n"
 "Totale: %d"
 
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -689,51 +692,51 @@
 "\n"
 "Visto l'ultima volta: %s fa"
 
-#: ../finch/gntblist.c:1687
+#: ../finch/gntblist.c:1701
 #: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Nuovo..."
 
-#: ../finch/gntblist.c:1694
+#: ../finch/gntblist.c:1708
 #: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Salvato..."
 
-#: ../finch/gntblist.c:2072
+#: ../finch/gntblist.c:2086
 #: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:82
+#: ../finch/gntui.c:86
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../finch/gntblist.c:2179
-#: ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846
-#: ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202
+#: ../pidgin/gtkdialogs.c:731
+#: ../pidgin/gtkdialogs.c:869
+#: ../pidgin/gtkdialogs.c:950
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2184
-#: ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851
-#: ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207
+#: ../pidgin/gtkdialogs.c:736
+#: ../pidgin/gtkdialogs.c:874
+#: ../pidgin/gtkdialogs.c:955
 msgid "_Account"
 msgstr "_Account"
 
-#: ../finch/gntblist.c:2192
-#: ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215
+#: ../pidgin/gtkdialogs.c:744
 msgid "New Instant Message"
 msgstr "Nuovo messaggio immediato"
 
-#: ../finch/gntblist.c:2194
-#: ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217
+#: ../pidgin/gtkdialogs.c:746
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Inserisci il nome utente o l'alias della persona alla quale vuoi inviare un messaggio immediato."
 
-#: ../finch/gntblist.c:2197
+#: ../finch/gntblist.c:2220
 #: ../finch/gntnotify.c:79
 #: ../libpurple/account.c:983
 #: ../libpurple/account.c:1233
@@ -746,7 +749,7 @@
 #: ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292
 #: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/oscar/oscar.c:6043
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -763,52 +766,52 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258
-#: ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726
-#: ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
+#: ../libpurple/protocols/yahoo/yahoo.c:3471
+#: ../libpurple/protocols/yahoo/yahoo.c:3482
+#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkdialogs.c:749
+#: ../pidgin/gtkdialogs.c:887
+#: ../pidgin/gtkdialogs.c:979
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2217
+#: ../finch/gntblist.c:2240
 #: ../finch/gntpounce.c:446
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Invia MI..."
 
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Mostra i gruppi vuoti"
 
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Mostra i contatti non in linea"
 
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Ordina per stato"
 
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Ordina alfabeticamente"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Ordina per dimensione del log"
 
 #: ../finch/gntconn.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s su %s: (%s)"
+msgstr "%s (%s)"
 
 #: ../finch/gntconn.c:113
 #, c-format
@@ -816,7 +819,7 @@
 msgstr "%s si è disconnesso."
 
 #: ../finch/gntconn.c:114
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -824,49 +827,53 @@
 msgstr ""
 "%s\n"
 "\n"
-"%s non proverà a riconnettere l'account finché l'errore non sarà corretto dall'utente e l'account riabilitato."
+"Finch non proverà a riconnettere l'account finché l'errore non sarà corretto dall'utente e l'account riabilitato."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:118
 msgid "No such command."
 msgstr "Comando inesistente."
 
-#: ../finch/gntconv.c:121
-#: ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:122
+#: ../pidgin/gtkconv.c:465
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Errore di sintassi: È stato digitato un numero sbagliato di argomenti per questo comando."
 
-#: ../finch/gntconv.c:126
-#: ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:127
+#: ../pidgin/gtkconv.c:471
 msgid "Your command failed for an unknown reason."
 msgstr "Il comando non ha funzionato per un motivo sconosciuto."
 
-#: ../finch/gntconv.c:131
-#: ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:132
+#: ../pidgin/gtkconv.c:478
 msgid "That command only works in chats, not IMs."
 msgstr "Il comando funziona solo per le chat, non per i MI."
 
-#: ../finch/gntconv.c:134
-#: ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:135
+#: ../pidgin/gtkconv.c:481
 msgid "That command only works in IMs, not chats."
 msgstr "Il comando funziona solo per i MI, non per le chat."
 
-#: ../finch/gntconv.c:138
-#: ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:139
+#: ../pidgin/gtkconv.c:486
 msgid "That command doesn't work on this protocol."
 msgstr "Il comando non funziona con questo protocollo."
 
-#: ../finch/gntconv.c:224
-#, fuzzy, c-format
+#: ../finch/gntconv.c:147
+msgid "Message was not sent, because you are not signed on."
+msgstr "Il messaggio non è stato inviato perché non sei connesso."
+
+#: ../finch/gntconv.c:230
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s su %s: (%s)"
+msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
-#, fuzzy, c-format
+#: ../finch/gntconv.c:253
+#, c-format
 msgid "%s [%s]"
-msgstr "%s su %s: (%s)"
+msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252
-#: ../finch/gntconv.c:647
+#: ../finch/gntconv.c:258
+#: ../finch/gntconv.c:677
 #, c-format
 msgid ""
 "\n"
@@ -875,52 +882,52 @@
 "\n"
 "%s sta scrivendo..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:277
 msgid "You have left this chat."
 msgstr "Hai lasciato questa chat."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:371
 msgid "Send To"
 msgstr "Invia a"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:415
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:421
 msgid "Clear Scrollback"
 msgstr "/Conversazione/Cancella lo storico"
 
-#: ../finch/gntconv.c:396
+#: ../finch/gntconv.c:425
 #: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Mostra i timestamp"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:441
 msgid "Add Buddy Pounce..."
 msgstr "Aggiungi un allarme..."
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:643
 msgid "<AUTO-REPLY> "
 msgstr "<RISPOSTA AUTOMATICA>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:765
 msgid "List of users:\n"
 msgstr "Elenco degli utenti:\n"
 
-#: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:335
+#: ../finch/gntconv.c:910
+#: ../pidgin/gtkconv.c:308
 msgid "Supported debug options are:  version"
 msgstr "Le opzioni di debug supportate sono: version"
 
-#: ../finch/gntconv.c:915
-#: ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:945
+#: ../pidgin/gtkconv.c:357
 msgid "No such command (in this context)."
 msgstr "Comando inesistente (in questo contesto)."
 
-#: ../finch/gntconv.c:918
-#: ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:948
+#: ../pidgin/gtkconv.c:360
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -928,61 +935,61 @@
 "Usa \"/help &lt;comando&gt;\" per ottenere aiuto su un comando specifico.\n"
 "I seguenti comandi sono disponibili in questo contesto:\n"
 
-#: ../finch/gntconv.c:976
-#: ../pidgin/gtkconv.c:7198
+#: ../finch/gntconv.c:1006
+#: ../pidgin/gtkconv.c:7320
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;message&gt;: Invia un messaggio normalmente, come se non stessi utilizzando un comando."
 
-#: ../finch/gntconv.c:979
-#: ../pidgin/gtkconv.c:7201
+#: ../finch/gntconv.c:1009
+#: ../pidgin/gtkconv.c:7323
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
 
-#: ../finch/gntconv.c:982
-#: ../pidgin/gtkconv.c:7204
+#: ../finch/gntconv.c:1012
+#: ../pidgin/gtkconv.c:7326
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;opzione&gt;: Invia diverse informazioni di debug alla conversazione corrente."
 
-#: ../finch/gntconv.c:985
-#: ../pidgin/gtkconv.c:7207
+#: ../finch/gntconv.c:1015
+#: ../pidgin/gtkconv.c:7329
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: cancella lo storico della conversazione."
 
-#: ../finch/gntconv.c:988
-#: ../pidgin/gtkconv.c:7213
+#: ../finch/gntconv.c:1018
+#: ../pidgin/gtkconv.c:7335
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;: Aiuto su un comando specifico."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1021
 msgid "users:  Show the list of users in the chat."
 msgstr "users: mostra la lista degli utenti della chat."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1026
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra la finestra dei plugin."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1029
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra la lista contatti."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1032
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra la finestra degli account."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1035
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra la finestra di debug."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1038
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra la finestra delle preferenze."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1041
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra la finestra dei messaggi di stato salvati."
 
 #: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:80
+#: ../finch/gntui.c:84
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Finestra di debug"
@@ -1014,41 +1021,41 @@
 #. Create the window.
 #: ../finch/gntft.c:122
 #: ../finch/gntft.c:195
-#: ../finch/gntui.c:81
+#: ../finch/gntui.c:85
 #: ../pidgin/gtkft.c:233
 #: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Trasferimento file"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nome file"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Velocità"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Rimanente"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198
-#: ../finch/gntstatus.c:543
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../finch/gntft.c:200
+#: ../finch/gntstatus.c:546
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:337
 #: ../libpurple/protocols/gg/gg.c:1034
 #: ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
@@ -1058,80 +1065,85 @@
 #: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2670
+#: ../libpurple/protocols/oscar/oscar.c:3750
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066
-#: ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083
-#: ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3222
+#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3099
 #: ../pidgin/gtksavedstatuses.c:998
 #: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Stato"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Chiudi questa finestra quando tutti i trasferimenti sono stati completati"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Pulisci i trasferimenti ultimati"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Stop"
 
 #. Close button
-#: ../finch/gntft.c:234
+#: ../finch/gntft.c:236
 #: ../finch/gntnotify.c:181
 #: ../finch/gntplugin.c:209
 #: ../finch/gntplugin.c:309
-#: ../finch/gntpounce.c:727
+#: ../finch/gntpounce.c:737
 #: ../finch/gntstatus.c:215
 #: ../libpurple/protocols/msn/msn.c:375
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkaccount.c:2470
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../finch/gntft.c:302
+#: ../finch/gntft.c:304
 #: ../pidgin/gtkft.c:168
 #: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-#: ../finch/gntft.c:369
+#: ../finch/gntft.c:371
 #: ../pidgin/gtkft.c:165
 #: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Annullato"
 
-#: ../finch/gntft.c:371
+#: ../finch/gntft.c:373
 #: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Fallito"
 
-#: ../finch/gntft.c:417
+#: ../finch/gntft.c:419
 #: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428
-#: ../finch/gntft.c:429
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Il file è stato salvato col nome %s."
+
+#: ../finch/gntft.c:431
+#: ../finch/gntft.c:432
 #: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Completato"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:436
 #: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Trasferimento in corso"
@@ -1146,12 +1158,12 @@
 msgstr "C'è posta per te!"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:489
+#: ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Mittente"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:496
+#: ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -1163,34 +1175,35 @@
 msgstr[1] "%s (%s) ha %d nuovi messaggi."
 
 #: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:335
+#: ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "C'è posta per te"
 
 #: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:916
+#: ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Informazioni per %s"
 
 #: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informazioni sul contatto"
 
 #: ../finch/gntnotify.c:376
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continua"
 
 #: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1627
+#: ../pidgin/gtkconv.c:1600
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
 #: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1588
+#: ../pidgin/gtkconv.c:1561
 msgid "IM"
 msgstr "Messaggio"
 
@@ -1246,9 +1259,8 @@
 msgstr "Nessuna opzione di configurazione per questo plugin."
 
 #: ../finch/gntplugin.c:259
-#, fuzzy
 msgid "You can (un)load plugins from the following list."
-msgstr "Stai attendendo autorizzazione dai seguenti contatti"
+msgstr "Puoi caricare/rimuovere i plugin della seguente lista."
 
 #: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
@@ -1262,9 +1274,9 @@
 #: ../finch/gntplugin.c:370
 #: ../finch/gntplugin.c:377
 #: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2060
+#: ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -1273,7 +1285,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci il nome di un utente."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327
 #: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
@@ -1290,7 +1301,7 @@
 
 #. Account:
 #: ../finch/gntpounce.c:335
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Account:"
 
@@ -1300,7 +1311,7 @@
 
 #. Create the "Pounce When Buddy..." frame.
 #: ../finch/gntpounce.c:373
-#: ../pidgin/gtkpounce.c:586
+#: ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Controlla se il contatto..."
 
@@ -1346,7 +1357,7 @@
 
 #. Create the "Action" frame.
 #: ../finch/gntpounce.c:413
-#: ../pidgin/gtkpounce.c:647
+#: ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Azione"
 
@@ -1375,84 +1386,96 @@
 msgstr "Genera allarmi solo quando il mio stato è \"non disponibile\""
 
 #: ../finch/gntpounce.c:449
-#: ../pidgin/gtkpounce.c:1295
+#: ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Ricorrente"
 
-#: ../finch/gntpounce.c:651
-#: ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Impossibile creare l'allarme"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Non hai nessun account."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Prima di poter creare un allarme, devi creare un account."
+
+#: ../finch/gntpounce.c:661
+#: ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Sei sicuro di voler eliminare l'allarme su %s per %s?"
 
-#: ../finch/gntpounce.c:685
-#: ../finch/gntui.c:79
-#: ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Allarmi"
 
-#: ../finch/gntpounce.c:799
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha iniziato a scriverti (%s)"
 
-#: ../finch/gntpounce.c:801
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s si è fermato mentre scriveva un messaggio per te (%s)"
 
-#: ../finch/gntpounce.c:803
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s si è connesso (%s)"
 
-#: ../finch/gntpounce.c:805
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815
+#: ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s è tornato attivo (%s)"
 
-#: ../finch/gntpounce.c:807
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s è di nuovo presente (%s)"
 
-#: ../finch/gntpounce.c:809
-#: ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha smesso di scriverti (%s)"
 
-#: ../finch/gntpounce.c:811
-#: ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s si è disconnesso (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s è diventato inattivo (%s)"
 
-#: ../finch/gntpounce.c:815
-#: ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s è andato via. (%s)"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ti ha inviato un messaggio. (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
@@ -1461,16 +1484,16 @@
 msgstr "Sulla base dell'utilizzo della tastiera"
 
 #: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "From last sent message"
 msgstr "Dall'ultimo messaggio inviato"
 
 #: ../finch/gntprefs.c:95
 #: ../pidgin/gtkprefs.c:897
 #: ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922
-#: ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1924
+#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Mai"
 
@@ -1521,14 +1544,14 @@
 #. Conversations
 #: ../finch/gntprefs.c:258
 #: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversazioni"
 
 #: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1462
-#: ../pidgin/gtkprefs.c:2037
+#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Log"
 
@@ -1537,17 +1560,197 @@
 msgstr "Non ancora implementato."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Salva il file..."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Apri il file..."
 
+#: ../finch/gntsound.c:94
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Il contatto è connesso"
+
+#: ../finch/gntsound.c:95
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Il contatto è disconnesso"
+
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Messaggio ricevuto"
+
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Il messaggio ricevuto inizia la conversazione"
+
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Messaggio inviato"
+
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Una persona entra in chat"
+
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Una persona abbandona la chat"
+
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Stai parlando in chat"
+
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Qualcun altro parla in chat"
+
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Qualcuno pronuncia il tuo nome in chat"
+
+#: ../finch/gntsound.c:357
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Errore di GStreamer"
+
+#: ../finch/gntsound.c:358
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "Impossibile inizializzare GStreamer."
+
+#: ../finch/gntsound.c:712
+#: ../finch/gntsound.c:798
+#: ../pidgin/gtkprefs.c:1584
+#: ../pidgin/gtkprefs.c:1673
+#: ../pidgin/gtkprefs.c:1867
+msgid "(default)"
+msgstr "(predefinito)"
+
+#: ../finch/gntsound.c:725
+msgid "Select Sound File ..."
+msgstr "Scegli un file audio..."
+
+#: ../finch/gntsound.c:900
+msgid "Sound Preferences"
+msgstr "Preferenze audio"
+
+#: ../finch/gntsound.c:911
+msgid "Profiles"
+msgstr "Profili"
+
+#: ../finch/gntsound.c:950
+#: ../pidgin/gtkprefs.c:1712
+msgid "Automatic"
+msgstr "Automatico"
+
+#: ../finch/gntsound.c:953
+msgid "Console Beep"
+msgstr "Bip di console"
+
+#: ../finch/gntsound.c:954
+#: ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr "Comando"
+
+#: ../finch/gntsound.c:955
+msgid "No Sound"
+msgstr "Nessun suono"
+
+#: ../finch/gntsound.c:957
+#: ../pidgin/gtkprefs.c:1707
+msgid "Sound Method"
+msgstr "Metodo del suono"
+
+#: ../finch/gntsound.c:962
+msgid "Method: "
+msgstr "Metodo:"
+
+#: ../finch/gntsound.c:969
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Comando audio\n"
+"(%s per il nome del file)"
+
+#. Sound options
+#: ../finch/gntsound.c:977
+#: ../pidgin/gtkprefs.c:1751
+msgid "Sound Options"
+msgstr "Opzioni suono"
+
+#: ../finch/gntsound.c:978
+msgid "Sounds when conversation has focus"
+msgstr "Riproduci i suoni quando la finestra di conversazione va in primo piano"
+
+#: ../finch/gntsound.c:986
+#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Sempre"
+
+#: ../finch/gntsound.c:987
+#: ../pidgin/gtkprefs.c:1756
+msgid "Only when available"
+msgstr "Solo quando sei disponibile"
+
+#: ../finch/gntsound.c:988
+#: ../pidgin/gtkprefs.c:1757
+msgid "Only when not available"
+msgstr "Solo quando non sei disponibile"
+
+#: ../finch/gntsound.c:995
+msgid "Volume(0-100):"
+msgstr "Volume (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1014
+#: ../pidgin/gtkprefs.c:1793
+msgid "Sound Events"
+msgstr "Eventi sonori"
+
+#: ../finch/gntsound.c:1016
+#: ../pidgin/gtkprefs.c:1852
+msgid "Event"
+msgstr "Evento"
+
+#: ../finch/gntsound.c:1016
+msgid "File"
+msgstr "File"
+
+#: ../finch/gntsound.c:1035
+#: ../pidgin/gtkprefs.c:1871
+msgid "Test"
+msgstr "Test"
+
+#: ../finch/gntsound.c:1038
+#: ../pidgin/gtkprefs.c:1875
+msgid "Reset"
+msgstr "Pulisci"
+
+#: ../finch/gntsound.c:1041
+#: ../pidgin/gtkprefs.c:1879
+msgid "Choose..."
+msgstr "Scegli..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1563,7 +1766,7 @@
 msgstr "Messaggi di stato salvati"
 
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1576,12 +1779,20 @@
 msgid "Type"
 msgstr "Tipo"
 
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:560
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:339
 #: ../libpurple/protocols/gg/gg.c:1072
 #: ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592
@@ -1596,16 +1807,17 @@
 #: ../libpurple/protocols/jabber/jabber.c:1274
 #: ../libpurple/protocols/jabber/jabber.c:1284
 #: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:269
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5504
+#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5736
+#: ../libpurple/protocols/oscar/oscar.c:5752
+#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:5766
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1613,8 +1825,8 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3725
+#: ../libpurple/protocols/yahoo/yahoo.c:3731
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525
 #: ../pidgin/gtksavedstatuses.c:1009
@@ -1623,7 +1835,7 @@
 
 #. Use
 #: ../finch/gntstatus.c:193
-#: ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Utilizza"
 
@@ -1635,41 +1847,46 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Inserisci un titolo non vuoto per lo stato."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Titolo già esistente"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Inserisci un titolo differente per lo stato."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sotto-stato"
 
-#: ../finch/gntstatus.c:460
+#: ../finch/gntstatus.c:463
 #: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Messaggio:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Modifica lo stato"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Utilizza uno stato differente per i seguenti account"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Salva e utilizza"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkprefs.c:2030
+msgid "Sounds"
+msgstr "Suoni"
+
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Messaggi di stato"
 
@@ -1737,7 +1954,7 @@
 
 #: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "Imposta lo stato URGENTE per la finestra del terminale."
 
 #: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
@@ -1835,7 +2052,7 @@
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../pidgin/gtkblist.c:4021
 msgid "Connection Error"
 msgstr "Errore di connessione"
 
@@ -1886,16 +2103,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:232
 #: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518
+#: ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530
 #: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310
+#: ../pidgin/gtkblist.c:5323
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
@@ -1942,8 +2159,8 @@
 msgstr "Il messaggio è troppo grande."
 
 #: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Impossibile inviare il messaggio."
 
@@ -2002,7 +2219,7 @@
 
 #: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "Il server D-BUS di Purple non è in esecuzione per il motivo indicato di seguito"
 
 #: ../libpurple/desktopitem.c:286
 #: ../libpurple/desktopitem.c:877
@@ -2085,7 +2302,7 @@
 
 #: ../libpurple/ft.c:251
 msgid "Directory is not writable."
-msgstr ""
+msgstr "La directory non è scrivibile."
 
 #: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
@@ -2190,103 +2407,103 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"aim\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"gg\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"icq\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"irc\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"msnim\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"sip\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"xmpp\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "Il comando utilizzato per gestire gli URL \"ymsgr\", se abilitati."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "Il gestore per gli URL \"aim\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"gg\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"icq\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"irc\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"msnim\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"sip\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"xmpp\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "gestore per gli URL \"ymsgr\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
 msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"aim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"gg\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"icq\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"irc\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"msnim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"sip\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"xmpp\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr ""
+msgstr "Vero, se il comando specificato nella chiave \"command\" deve gestire gli URL \"ymsgr\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid "True if the command used to handle this type of URL should be run in a terminal."
-msgstr ""
+msgstr "Vero. se il comando utilizzato per gestire questo tipo di URL deve essere eseguito in un terminale."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2336,36 +2553,36 @@
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Il log di questa conversazione non è riuscito."
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RISPOSTA AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RISPOSTA AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424
-#: ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425
+#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Impossibile trovare il percorso del file di log!</b></font>"
 
-#: ../libpurple/log.c:1436
-#: ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossibile leggere il file: %s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
@@ -2376,9 +2593,8 @@
 msgstr "Stai usando %s, ma questo plugin richiede %s."
 
 #: ../libpurple/plugin.c:380
-#, fuzzy
 msgid "This plugin has not defined an ID."
-msgstr "Questa funzione non è stata ancora implementata"
+msgstr "Questo plugin non ha definito alcun ID."
 
 #: ../libpurple/plugin.c:448
 #, c-format
@@ -2400,9 +2616,8 @@
 msgstr "Il plugin %s richiesto non è stato trovato. Installare questo plugin e provare di nuovo."
 
 #: ../libpurple/plugin.c:552
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Gaim non è in grado di caricare il tuo plugin."
+msgstr "Impossibile caricare il plugin"
 
 #: ../libpurple/plugin.c:574
 #, c-format
@@ -2410,9 +2625,8 @@
 msgstr "Impossibile caricare il plugin %s richiesto."
 
 #: ../libpurple/plugin.c:578
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "Gaim non è in grado di caricare il tuo plugin."
+msgstr "Impossibile caricare il tuo plugin."
 
 #: ../libpurple/plugin.c:677
 #, c-format
@@ -2420,7 +2634,6 @@
 msgstr "Impossibile caricare Il plugin dipendente %s."
 
 #: ../libpurple/plugin.c:681
-#, fuzzy
 msgid "There were errors unloading the plugin."
 msgstr "Si sono verificati degli errori nella rimozione del plugin."
 
@@ -2459,13 +2672,13 @@
 #: ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204
 #: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5891
+#: ../libpurple/protocols/oscar/oscar.c:6117
+#: ../libpurple/protocols/oscar/oscar.c:6187
 #: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2531,17 +2744,20 @@
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Note per il contatto"
 
 #. *< name
 #. *< version
 #: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Conserva delle note per un dato contatto."
 
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Aggiunge l'opzione di salvare delle note per i contatti nella tua lista."
 
@@ -2599,9 +2815,8 @@
 #. *  description
 #: ../libpurple/plugins/filectl.c:251
 #: ../libpurple/plugins/filectl.c:253
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr "Consente di controllare Gaim immettendo dei comandi in un file."
+msgstr "Consente di controllare il programma immettendo dei comandi in un file."
 
 #: ../libpurple/plugins/idle.c:158
 #: ../libpurple/plugins/idle.c:218
@@ -2736,109 +2951,108 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "L'utente non è in linea."
 
-#: ../libpurple/plugins/log_reader.c:1579
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
-msgstr "Riconnessione automatica"
+msgstr "Inviata la risposta automatica:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s si è disconnesso."
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Uno o più messaggi potrebbero non essere stati inviati."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Sei stato disconnesso dal server."
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Al momento non sei connesso. Non saranno ricevuti messaggi finché non sarai nuovamente in linea."
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Il messaggio non può essere inviato poiché è stata superata la lunghezza massima."
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Impossibile inviare il messaggio."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fuoco"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Configurazione generale per la lettura dei log"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Calcolo veloce della dimensione"
 
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Determina i nomi in maniera euristica"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Percorso dei log"
 
@@ -2848,19 +3062,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Visualizzatore log"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Consente di visualizzare i log di altri client MI."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
@@ -3014,9 +3228,8 @@
 msgstr "Mostra i messaggi di notifica nelle conversazioni"
 
 #: ../libpurple/plugins/psychic.c:105
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Nelle conversazioni nascoste"
+msgstr "Porta le conversazioni psichiche in primo piano"
 
 #. *< type
 #. *< ui_requirement
@@ -3024,7 +3237,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Test dei segnali"
 
@@ -3032,8 +3245,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Verifica se tutti i segnali stanno funzionando correttamente."
 
@@ -3184,41 +3397,54 @@
 
 #: ../libpurple/plugins/tcl/tcl.c:507
 msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
+msgstr "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin TCL, installa ActiveTCL da http://www.activestate.com\n"
 
 #. Send a message about the connection error
 #: ../libpurple/protocols/bonjour/bonjour.c:112
-#, fuzzy
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "Impossibile creare una nuova connessione."
+msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Impossibile stabilire una connessione con il server mDNS locale. È in funzione?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "Assente"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
+msgid "First name"
+msgstr "Nome"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
+msgid "Last name"
+msgstr "Cognome"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "Email"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
+msgid "AIM Account"
+msgstr "Account AIM"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
+msgid "XMPP Account"
+msgstr "Account XMPP"
 
 #. *< type
 #. *< ui_requirement
@@ -3230,39 +3456,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin per il protocollo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
-msgstr "Nuova persona"
+msgstr "Persona Purple"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome host"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Nome"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Cognome"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:620
 #: ../libpurple/protocols/gg/gg.c:472
 #: ../libpurple/protocols/jabber/jabber.c:818
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3272,43 +3484,34 @@
 msgid "E-mail"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "Account AIM"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-#, fuzzy
-msgid "XMPP Account"
-msgstr "Account AIM"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:383
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s ha chiuso la conversazione."
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:435
+#: ../libpurple/protocols/bonjour/jabber.c:658
+#: ../libpurple/protocols/bonjour/jabber.c:676
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:581
 msgid "Cannot open socket"
 msgstr "Impossibile aprire il socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Error setting socket options"
 msgstr "Errore nell'impostazione delle opzioni per il socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Could not bind socket to port"
 msgstr "Impossibile associare il socket alla porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:621
 msgid "Could not listen on socket"
 msgstr "Impossibile ascoltare sul socket"
 
@@ -3426,8 +3629,8 @@
 #: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Città"
@@ -3438,13 +3641,14 @@
 
 #: ../libpurple/protocols/gg/gg.c:645
 #: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/myspace/myspace.c:1953
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sesso"
 
@@ -3453,23 +3657,22 @@
 msgstr "Maschile o femminile"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Maschile"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3702
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Femminile"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#, fuzzy
 msgid "Only online"
-msgstr "Online"
+msgstr "Soltanto se online"
 
 #: ../libpurple/protocols/gg/gg.c:656
 #: ../libpurple/protocols/gg/gg.c:657
@@ -3477,9 +3680,8 @@
 msgstr "Cerca contatti"
 
 #: ../libpurple/protocols/gg/gg.c:658
-#, fuzzy
 msgid "Please, enter your search criteria below"
-msgstr "Inserisci la tua nuova password"
+msgstr "Inserisci i tuoi criteri di ricerca"
 
 #: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
@@ -3490,7 +3692,6 @@
 msgstr "La tua password attuale è diversa da quella specificata."
 
 #: ../libpurple/protocols/gg/gg.c:722
-#, fuzzy
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Impossibile modificare la password. Si è verificato un errore.\n"
 
@@ -3516,9 +3717,9 @@
 msgstr "Cambia la password per Gadu-Gadu"
 
 #: ../libpurple/protocols/gg/gg.c:871
-#, fuzzy, c-format
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Rimuovi la chat dalla lista dei contatti"
+msgstr "Scegli una chat per il contatto: %s"
 
 #: ../libpurple/protocols/gg/gg.c:874
 #: ../libpurple/protocols/gg/gg.c:875
@@ -3528,16 +3729,17 @@
 #: ../libpurple/protocols/gg/gg.c:1003
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5554
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3073
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3421
 #: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Non connesso"
 
@@ -3548,17 +3750,42 @@
 #: ../libpurple/protocols/msn/state.c:37
 #: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3075
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1055
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Presente"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:5582
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3627
+#: ../libpurple/protocols/yahoo/yahoo.c:3701
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442
+#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Assente"
+
 #: ../libpurple/protocols/gg/gg.c:1038
 #: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3669
 msgid "UIN"
 msgstr "UIN"
 
@@ -3566,7 +3793,7 @@
 #: ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3680
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3579,7 +3806,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1106
 #: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/oscar/oscar.c:3881
 msgid "Unable to display the search results."
 msgstr "Impossibile mostrare i risultati della ricerca."
 
@@ -3742,7 +3969,6 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:297
 #: ../libpurple/protocols/irc/dcc_send.c:338
-#, fuzzy
 msgid "Could not open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
@@ -3767,6 +3993,7 @@
 #: ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:614
 #: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/myspace/myspace.c:3490
 msgid "Server has disconnected"
 msgstr "Il server ti ha disconnesso"
 
@@ -3782,7 +4009,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:267
 #: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:526
+#: ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Password:"
 
@@ -3790,16 +4017,18 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
 #: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:637
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2918
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
 #: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
@@ -3811,14 +4040,18 @@
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:653
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Impossibile creare il socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/myspace/myspace.c:3603
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
@@ -3834,13 +4067,14 @@
 
 #: ../libpurple/protocols/irc/irc.c:611
 #: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Read error"
 msgstr "Errore di lettura"
 
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1402
 msgid "Users"
 msgstr "Utenti"
 
@@ -3850,7 +4084,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1411
 msgid "Topic"
 msgstr "Argomento"
 
@@ -3875,14 +4109,14 @@
 #: ../libpurple/protocols/irc/irc.c:942
 #: ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/oscar/oscar.c:6621
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
@@ -3890,8 +4124,8 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:945
 #: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
@@ -3963,7 +4197,7 @@
 msgstr " <i>(identificato)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3670
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4016,9 +4250,8 @@
 msgstr "Messaggio sconosciuto"
 
 #: ../libpurple/protocols/irc/msgs.c:449
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Gaim ha inviato un messaggio che il server IRC non comprende."
+msgstr "Il server IRC ha ricevuto un messaggio che non è in grado di comprendere."
 
 #: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
@@ -4087,7 +4320,6 @@
 msgstr "Nickname non valido"
 
 #: ../libpurple/protocols/irc/msgs.c:910
-#, fuzzy
 msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "Il nome per l'account selezionato è stato rifiutato dal server. Probabilmente contiene caratteri non validi."
 
@@ -4118,9 +4350,9 @@
 msgstr "Risposta PING -- Ritardo: %lu secondi"
 
 #: ../libpurple/protocols/irc/msgs.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Richiesta registrazione"
+msgstr "Impossibile entrare in %s: è richiesta la registrazione."
 
 #: ../libpurple/protocols/irc/msgs.c:1111
 #: ../libpurple/protocols/silc/ops.c:1093
@@ -4146,9 +4378,8 @@
 msgstr "away [messaggio]: Imposta un messaggio di assenza. Non immettere alcun messaggio per ritornare dall'assenza."
 
 #: ../libpurple/protocols/irc/parse.c:124
-#, fuzzy
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]: Invia un comando grezzo al server."
+msgstr "chanserv: Invia un comando al chanserv"
 
 #: ../libpurple/protocols/irc/parse.c:125
 msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
@@ -4183,9 +4414,8 @@
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
 
 #: ../libpurple/protocols/irc/parse.c:133
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]: Invia un comando grezzo al server."
+msgstr "memoserv: Invia un comando al memoserv"
 
 #: ../libpurple/protocols/irc/parse.c:134
 msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
@@ -4200,14 +4430,13 @@
 msgstr "names [canale]: Elenca gli utenti presenti nel canale."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname."
 
 #: ../libpurple/protocols/irc/parse.c:138
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]: Invia un comando grezzo al server."
+msgstr "nickserv: Invia un comando al nickserv"
 
 #: ../libpurple/protocols/irc/parse.c:139
 msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
@@ -4218,9 +4447,8 @@
 msgstr "operwall &lt;messaggio&gt;: Se non sai di cosa si tratta, probabilmente non sei in grado di usarlo."
 
 #: ../libpurple/protocols/irc/parse.c:141
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]: Invia un comando grezzo al server."
+msgstr "operserv: Invia un comando all'operserv"
 
 #: ../libpurple/protocols/irc/parse.c:142
 msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
@@ -4260,7 +4488,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [nick]: invia una richiesta CTCP VERSION ad un utente"
 
 #: ../libpurple/protocols/irc/parse.c:152
 msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
@@ -4275,9 +4503,8 @@
 msgstr "whois [server] &lt;nick&gt;: Ottiene informazioni su di un utente."
 
 #: ../libpurple/protocols/irc/parse.c:155
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [server] &lt;nick&gt;: Ottiene informazioni su di un utente."
+msgstr "whowas &lt;nick&gt;: Ottiene informazioni su di un utente che si è disconnesso."
 
 #: ../libpurple/protocols/irc/parse.c:465
 #, c-format
@@ -4311,9 +4538,9 @@
 
 #: ../libpurple/protocols/jabber/auth.c:294
 #: ../libpurple/protocols/jabber/auth.c:483
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Il server richiede l'autenticazione sotto forma di testo semplice su una connessione non criptata. Procedere con l'autenticazione?"
+msgstr "%s richiede l'autenticazione sotto forma di testo semplice su una connessione non criptata. Procedere con l'autenticazione?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
 #: ../libpurple/protocols/jabber/auth.c:297
@@ -4417,18 +4644,6 @@
 msgid "Telephone"
 msgstr "Telefono"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "Email"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
 #: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
@@ -4447,14 +4662,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/oscar/oscar.c:3719
 msgid "Birthday"
 msgstr "Compleanno"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3095
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descrizione"
@@ -4501,8 +4716,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4556,8 +4771,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
 #: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5758
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
@@ -4568,7 +4783,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3681
 msgid "Last Name"
 msgstr "Cognome"
 
@@ -4579,12 +4794,11 @@
 #. current comment from Jabber User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1732
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr ""
+msgstr "Cerca un contatto inserendo i criteri di ricerca nei seguenti campi. Nota: Ogni campo supporta il carattere jolly (%)"
 
 #: ../libpurple/protocols/jabber/buddy.c:1752
-#, fuzzy
 msgid "Directory Query Failed"
-msgstr "Connessione diretta non riuscita"
+msgstr "Interrogazione della directory fallita"
 
 #: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
@@ -4593,34 +4807,33 @@
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #: ../libpurple/protocols/jabber/buddy.c:1787
-#, fuzzy, c-format
+#, c-format
 msgid "Server Instructions: %s"
-msgstr "Informazioni sul server"
+msgstr "Istruzioni per il server: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
+msgstr "Riempi uno o più campi per cercare gli utenti XMPP corrispondenti."
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3684
+#: ../libpurple/protocols/oscar/oscar.c:3693
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:1823
 #: ../libpurple/protocols/jabber/buddy.c:1824
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "Cerca utente"
+msgstr "Cerca utenti XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4644,8 +4857,8 @@
 msgstr "Cerca directory"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5244
+#: ../libpurple/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr "_Stanza:"
 
@@ -4751,9 +4964,9 @@
 msgstr "Errore di lettura"
 
 #: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2537
+#: ../libpurple/protocols/yahoo/yahoo.c:2569
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4773,7 +4986,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
+msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
 #: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
@@ -4801,8 +5014,8 @@
 msgstr "Già registrato"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3760
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "State"
 msgstr "Stato"
 
@@ -4830,13 +5043,10 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:879
 #: ../libpurple/protocols/jabber/jabber.c:880
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "Registra un nuovo account Jabber"
+msgstr "Registra un nuovo account XMPP"
 
-#. Register button
 #: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Iscrizione"
 
@@ -4857,8 +5067,8 @@
 #: ../libpurple/protocols/jabber/jabber.c:1502
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5552
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
@@ -4919,7 +5129,7 @@
 msgstr "Inserisci la tua nuova password"
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6338
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -4927,7 +5137,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6349
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -4968,9 +5178,8 @@
 msgstr "Elemento non trovato"
 
 #: ../libpurple/protocols/jabber/jabber.c:1496
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Formato ID Jabber non valido"
+msgstr "Formato ID XMPP non valido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
@@ -5138,82 +5347,81 @@
 msgid "Stream Error"
 msgstr "Errore di stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossibile allontanare l'utente %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1706
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Comando sconosciuto: %s"
+msgstr "Affiliazione sconosciuta: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1711
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Impossibile invitare l'utente (%s)."
+msgstr "Impossibile affiliare l'utente %s come \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Comando sconosciuto: %s"
+msgstr "Ruolo sconosciuto: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1735
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Impossibile inviare il messaggio: %s"
+msgstr "Impossibile impostare il ruolo \"%s\" per l'utente: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossibile espellere l'utente %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configura una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr "register: Iscrizione ad una chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [stanza]: Allontana un utente dalla stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr ""
+msgstr "affiliate &lt;utente&gt; &lt;proprietario|admin|membro|escluso|nessuno&gt;: Imposta un'affiliazione per l'utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1864
 msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr ""
+msgstr "role &lt;utente&gt; &lt;moderatore|partecipante|visitatore|nessuno&gt;: Imposta un ruolo per l'utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;utente&gt; [stanza]: Invita un utente nella stanza."
+msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;stanza&gt; [server]: Entra in una chat su questo server."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utente&gt; [stanza]: Espelle un utente dalla stanza."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;utente&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un altro utente."
 
@@ -5229,13 +5437,12 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:169
 #: ../libpurple/protocols/jabber/libxmpp.c:171
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "Plugin per il protocollo MSN"
+msgstr "Plugin per il protocollo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 #: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../pidgin/gtkaccount.c:508
+#: ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Dominio"
 
@@ -5250,22 +5457,26 @@
 "su stream non criptati"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/myspace/myspace.c:4420
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Porta per la connessione"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:4417
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857
-#: ../pidgin/gtkaccount.c:837
+#: ../pidgin/gtkaccount.c:838
 msgid "Connect server"
 msgstr "Server di connessione"
 
 #: ../libpurple/protocols/jabber/message.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s ha chiuso la conversazione."
+msgstr "%s ha lasciato la conversazione."
 
 #: ../libpurple/protocols/jabber/message.c:153
 #, c-format
@@ -5288,9 +5499,8 @@
 msgstr "Invio del messaggio a %s fallito: %s"
 
 #: ../libpurple/protocols/jabber/message.c:270
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Errore messaggio Jabber"
+msgstr "Errore messaggio XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:359
 #, c-format
@@ -5301,33 +5511,33 @@
 msgid "XML Parse error"
 msgstr "Errore di parsing XML"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Errore sconosciuto nella presenza"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Crea una nuova stanza"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Stai per creare una nuova stanza. Vuoi configurarla oppure accettare le impostazioni predefinite?"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "_Configura la stanza"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Errore nella chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Errore nell'ingresso nella chat %s"
@@ -5344,14 +5554,14 @@
 msgstr "Invio file fallito"
 
 #: ../libpurple/protocols/jabber/si.c:832
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Impossibile inviare il messaggio a %s."
+msgstr "Impossibile inviare il file a %s. JID non valido"
 
 #: ../libpurple/protocols/jabber/si.c:834
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
+msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
 #: ../libpurple/protocols/jabber/si.c:836
 #, fuzzy, c-format
@@ -5361,12 +5571,11 @@
 #: ../libpurple/protocols/jabber/si.c:851
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
+msgstr "Scegli a quale risorsa di %s vuoi inviare un file"
 
 #: ../libpurple/protocols/jabber/si.c:867
-#, fuzzy
 msgid "Select a Resource"
-msgstr "Scegli un numero"
+msgstr "Scegli una risorsa"
 
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -5388,9 +5597,8 @@
 msgstr "Impossibile effettuare il parsing del messaggio."
 
 #: ../libpurple/protocols/msn/error.c:41
-#, fuzzy
 msgid "Syntax Error (probably a client bug)"
-msgstr "Errore di sintassi (probabilmente un bug di Gaim)"
+msgstr "Errore di sintassi (probabilmente un bug del client)"
 
 #: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
@@ -5401,9 +5609,8 @@
 msgstr "L'utente non esiste"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy
 msgid "Fully qualified domain name missing"
-msgstr "Manca un nome di dominio corretto"
+msgstr "Manca un nome di dominio pienamente qualificato"
 
 #: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
@@ -5414,7 +5621,6 @@
 msgstr "Nome utente non valido"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Alias non valido"
 
@@ -5464,7 +5670,6 @@
 msgstr "Impossibile rimuovere il gruppo zero"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Stai cercando di aggiungere un contatto ad un gruppo che non esiste"
 
@@ -5473,7 +5678,6 @@
 msgstr "Switchboard fallito"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Notifica trasferimento fallita"
 
@@ -5491,7 +5695,6 @@
 msgstr "Non connesso"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Servizio temporaneamente non disponibile"
 
@@ -5526,9 +5729,8 @@
 msgstr "Server non disponibile"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, fuzzy
 msgid "Peer notification server down"
-msgstr "Server di notifica non attivo"
+msgstr "Server di notifica non disponibile"
 
 #: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
@@ -5583,7 +5785,7 @@
 msgstr "Server occupato"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728
@@ -5683,8 +5885,8 @@
 
 #: ../libpurple/protocols/msn/msn.c:551
 #: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3735
 msgid "Be Right Back"
 msgstr "Torno subito"
 
@@ -5696,20 +5898,20 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3738
 msgid "Busy"
 msgstr "Occupato"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/yahoo/yahoo.c:3061
+#: ../libpurple/protocols/yahoo/yahoo.c:3750
 msgid "On the Phone"
 msgstr "Al telefono"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/yahoo/yahoo.c:3065
+#: ../libpurple/protocols/yahoo/yahoo.c:3756
 msgid "Out to Lunch"
 msgstr "A pranzo"
 
@@ -5751,9 +5953,8 @@
 msgstr "Inizia una _chat"
 
 #: ../libpurple/protocols/msn/msn.c:698
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata. Vai su http://gaim.sf.net/faq-ssl.php per maggiori informazioni."
+msgstr "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
 #: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
@@ -5761,7 +5962,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:1479
 #: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
@@ -5772,22 +5973,24 @@
 msgstr "Generale"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/myspace/myspace.c:1948
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Età"
 
 #: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupazione"
 
 #: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/myspace/myspace.c:1957
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
@@ -5811,10 +6014,10 @@
 
 #: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
-msgstr ""
+msgstr "Sociale"
 
 #: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Stato civile"
 
@@ -5823,9 +6026,8 @@
 msgstr "Interessi"
 
 #: ../libpurple/protocols/msn/msn.c:1592
-#, fuzzy
 msgid "Pets"
-msgstr "Porte"
+msgstr "Animali domestici"
 
 #: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
@@ -5837,11 +6039,11 @@
 
 #: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
-msgstr ""
+msgstr "Moda"
 
 #: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
-msgstr ""
+msgstr "Humor"
 
 #: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
@@ -5850,7 +6052,7 @@
 #: ../libpurple/protocols/msn/msn.c:1598
 #: ../libpurple/protocols/msn/msn.c:1779
 #: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citazione preferita"
 
@@ -5864,7 +6066,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
-msgstr ""
+msgstr "Altro"
 
 #: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
@@ -5875,7 +6077,7 @@
 msgstr "Telefono di casa 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Home Address"
 msgstr "Indirizzo di casa"
 
@@ -5911,7 +6113,7 @@
 msgstr "Impiego"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Company"
 msgstr "Compagnia"
 
@@ -5933,7 +6135,7 @@
 msgstr "Telefono dell'ufficio 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3776
 msgid "Work Address"
 msgstr "Indirizzo di lavoro"
 
@@ -5958,9 +6160,8 @@
 msgstr "MI al lavoro"
 
 #: ../libpurple/protocols/msn/msn.c:1658
-#, fuzzy
 msgid "Start Date"
-msgstr "Stato"
+msgstr "Data di inizio"
 
 #: ../libpurple/protocols/msn/msn.c:1728
 #: ../libpurple/protocols/msn/msn.c:1734
@@ -5993,7 +6194,7 @@
 msgstr "Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente l'utente non esiste."
 
 #: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL del profilo"
 
@@ -6039,8 +6240,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1321
+#: ../libpurple/protocols/yahoo/yahoochat.c:1347
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
@@ -6142,8 +6343,8 @@
 msgstr "Errore di parsing HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Sei connesso da un'altra postazione."
 
@@ -6219,7 +6420,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
+msgstr "Il messaggio non è stato inviato perché non è possibile stabilire una sessione con il server. Si tratta probabilmente di un problema del server. Riprova tra qualche minuto:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
 msgid "Message could not be sent because an error with the switchboard occurred:"
@@ -6234,80 +6435,459 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s ti ha inviato un Nudge!"
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s ti ha aggiunto alla sua lista contatti."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s ti ha rimosso dalla sua lista contatti."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Impossibile aggiungere \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Il nome utente specificato non è valido"
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
-msgid "Required parameters not passed in"
-msgstr "Dei parametri richiesti non sono stati passati"
+#: ../libpurple/protocols/myspace/myspace.c:232
+msgid "Missing Cipher"
+msgstr "Cifra mancante"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
-msgid "Unable to write to network"
-msgstr "Impossibile scriver sulla rete"
+#: ../libpurple/protocols/myspace/myspace.c:233
+msgid "The RC4 cipher could not be found"
+msgstr "Impossibile trovare la cifra RC4"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
-msgid "Unable to read from network"
-msgstr "Impossibile leggere dalla rete"
+#: ../libpurple/protocols/myspace/myspace.c:234
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Aggiorna libpurple ad una versione che supporta RC4 (>= 2.0.1). Il plugin MySpaceIM non sarà caricato."
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
-msgid "Error communicating with server"
-msgstr "Errore di comunicazione con il server"
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/myspace.c:303
+msgid "zap"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
-msgid "Conference not found"
-msgstr "Conferenza non trovata"
+#: ../libpurple/protocols/myspace/myspace.c:303
+#: ../libpurple/protocols/myspace/myspace.c:1696
+msgid "zapped"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
-msgid "Conference does not exist"
-msgstr "La conferenza non esiste"
+#: ../libpurple/protocols/myspace/myspace.c:303
+#, fuzzy
+msgid "Zapping"
+msgstr "Numero del pager"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
-msgid "A folder with that name already exists"
-msgstr "Esiste già una cartella con quel nome."
+#: ../libpurple/protocols/myspace/myspace.c:304
+msgid "whack"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
-msgid "Not supported"
-msgstr "Non supportato"
+#: ../libpurple/protocols/myspace/myspace.c:304
+#: ../libpurple/protocols/myspace/myspace.c:1697
+msgid "whacked"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
-msgid "Password has expired"
-msgstr "La password è scaduta"
+#: ../libpurple/protocols/myspace/myspace.c:304
+#, fuzzy
+msgid "Whacking"
+msgstr "Avviso"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
-msgid "Incorrect password"
-msgstr "Password non corretta"
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "torch"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
-msgid "User not found"
-msgstr "Utente non trovato"
+#: ../libpurple/protocols/myspace/myspace.c:305
+#: ../libpurple/protocols/myspace/myspace.c:1698
+#, fuzzy
+msgid "torched"
+msgstr "Distaccato"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
-msgid "Account has been disabled"
-msgstr "L'account è stato disabilitato"
+#: ../libpurple/protocols/myspace/myspace.c:305
+msgid "Torching"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
-msgid "The server could not access the directory"
-msgstr "Il server non è riuscito ad accedere alla directory"
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "smooch"
+msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
-msgid "Your system administrator has disabled this operation"
-msgstr "Il tuo amministartore di sistema ha disabilitato questa operazione"
+#: ../libpurple/protocols/myspace/myspace.c:306
+#: ../libpurple/protocols/myspace/myspace.c:1699
+msgid "smooched"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:306
+msgid "Smooching"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+msgid "hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+#: ../libpurple/protocols/myspace/myspace.c:1700
+msgid "hugged"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:307
+#, fuzzy
+msgid "Hugging"
+msgstr "Log"
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "bslap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+#: ../libpurple/protocols/myspace/myspace.c:1701
+msgid "bslapped"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:308
+msgid "Bslapping"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+#, fuzzy
+msgid "goose"
+msgstr "Gallo"
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+#: ../libpurple/protocols/myspace/myspace.c:1702
+#, fuzzy
+msgid "goosed"
+msgstr "Gallo"
+
+#: ../libpurple/protocols/myspace/myspace.c:309
+msgid "Goosing"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "hi-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+#: ../libpurple/protocols/myspace/myspace.c:1703
+msgid "hi-fived"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:310
+msgid "Hi-fiving"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+msgid "punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+#: ../libpurple/protocols/myspace/myspace.c:1704
+msgid "punk'd"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:311
+#, fuzzy
+msgid "Punking"
+msgstr "Ping"
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+msgid "raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+#: ../libpurple/protocols/myspace/myspace.c:1705
+#, fuzzy
+msgid "raspberried"
+msgstr "Trasferimento in corso"
+
+#: ../libpurple/protocols/myspace/myspace.c:312
+#, fuzzy
+msgid "Raspberry'ing"
+msgstr "Trasferimento in corso"
+
+#: ../libpurple/protocols/myspace/myspace.c:469
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:622
+#, c-format
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+msgstr "Spiacente, le password lunghe più di %d caratteri (la tua è lunga %d) non sono supportate da MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:628
+#: ../libpurple/protocols/myspace/myspace.c:2953
+msgid "MySpaceIM Error"
+msgstr "Errore MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:684
+#, fuzzy
+msgid "Reading challenge"
+msgstr "Errore in lettura"
+
+#: ../libpurple/protocols/myspace/myspace.c:690
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "Challenge non valido dal server"
+
+#: ../libpurple/protocols/myspace/myspace.c:694
+msgid "Logging in"
+msgstr "Login in corso"
+
+#: ../libpurple/protocols/myspace/myspace.c:1725
+#, c-format
+msgid "*** You have been %s! ***"
+msgstr "*** Sei stato %s! ***"
+
+#: ../libpurple/protocols/myspace/myspace.c:1933
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Utente"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/myspace.c:1940
+#: ../libpurple/protocols/oscar/oscar.c:2934
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1962
+#, fuzzy
+msgid "Headline"
+msgstr "_Handle:"
+
+#: ../libpurple/protocols/myspace/myspace.c:1967
+msgid "Song"
+msgstr "Canzone"
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+msgid "Total Friends"
+msgstr "Numero di amici"
+
+#: ../libpurple/protocols/myspace/myspace.c:1983
+#: ../libpurple/protocols/myspace/myspace.c:1986
+#: ../libpurple/protocols/myspace/myspace.c:1989
+msgid "Client Version"
+msgstr "Versione del client"
+
+#: ../libpurple/protocols/myspace/myspace.c:2353
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Connessione al server persa (nessun dato ricevuto in %d secondi)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:2411
+msgid "New mail messages"
+msgstr "Nuovi messaggi di posta"
+
+#: ../libpurple/protocols/myspace/myspace.c:2412
+msgid "New blog comments"
+msgstr "Nuovi commenti sul blog"
+
+#: ../libpurple/protocols/myspace/myspace.c:2413
+msgid "New profile comments"
+msgstr "Nuovi commenti sul profilo"
+
+#: ../libpurple/protocols/myspace/myspace.c:2414
+msgid "New friend requests!"
+msgstr "Nuova richiesta di amicizia!"
+
+#: ../libpurple/protocols/myspace/myspace.c:2415
+msgid "New picture comments"
+msgstr "Nuovi commenti sulle foto"
+
+#: ../libpurple/protocols/myspace/myspace.c:2445
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:2537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Connesso"
+
+#: ../libpurple/protocols/myspace/myspace.c:2945
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Errore di protocollo. Codice %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:3105
+#: ../libpurple/protocols/myspace/myspace.c:3139
+msgid "Failed to add buddy"
+msgstr "Impossibile aggiungere il contatto"
+
+#: ../libpurple/protocols/myspace/myspace.c:3105
+msgid "'addbuddy' command failed."
+msgstr "Comando 'addbuddy' fallito."
+
+#: ../libpurple/protocols/myspace/myspace.c:3139
+#: ../libpurple/protocols/myspace/myspace.c:3381
+#, fuzzy
+msgid "persist command failed"
+msgstr "Switchboard fallito"
+
+#: ../libpurple/protocols/myspace/myspace.c:3249
+#, c-format
+msgid "No such user: %s"
+msgstr "Utente inesistente: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:3250
+msgid "User lookup"
+msgstr "Ricerca utente"
+
+#: ../libpurple/protocols/myspace/myspace.c:3362
+#: ../libpurple/protocols/myspace/myspace.c:3381
+#: ../libpurple/protocols/myspace/myspace.c:3403
+msgid "Failed to remove buddy"
+msgstr "Impossibile rimuovere il contatto"
+
+#: ../libpurple/protocols/myspace/myspace.c:3362
+msgid "'delbuddy' command failed"
+msgstr "Comando 'delbuddy' fallito"
+
+#: ../libpurple/protocols/myspace/myspace.c:3403
+msgid "blocklist command failed"
+msgstr "Comando blocklist fallito"
+
+#: ../libpurple/protocols/myspace/myspace.c:3449
+msgid "Invalid input condition"
+msgstr "Condizione di input non valida"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:3467
+#: ../libpurple/protocols/myspace/myspace.c:3498
+msgid "Read buffer full"
+msgstr "Buffer di lettura pieno"
+
+#: ../libpurple/protocols/myspace/myspace.c:3536
+msgid "Unparseable message"
+msgstr "Messaggio indecifrabile"
+
+#: ../libpurple/protocols/myspace/myspace.c:3605
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Impossibile connettersi all'host: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3948
+msgid "IM Friends"
+msgstr "Amici MI"
+
+#: ../libpurple/protocols/myspace/myspace.c:4045
+#, c-format
+msgid "%d buddies were added or updated"
+msgstr "%d contatti sono stati aggiunti o aggiornati"
+
+#: ../libpurple/protocols/myspace/myspace.c:4047
+msgid "Add contacts from server"
+msgstr "Aggiungi contatti dal server"
+
+#: ../libpurple/protocols/myspace/myspace.c:4072
+#: ../libpurple/protocols/myspace/myspace.c:4147
+msgid "Add friends from MySpace.com"
+msgstr "Aggiungi amici da MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:4073
+msgid "Importing friends failed"
+msgstr "Importazione degli amici fallita"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:4139
+msgid "Find people..."
+msgstr "Cerca persone..."
+
+#: ../libpurple/protocols/myspace/myspace.c:4142
+msgid "Change IM name..."
+msgstr "Cambia il nome MI..."
+
+#: ../libpurple/protocols/myspace/myspace.c:4424
+msgid "Show display name in status text"
+msgstr "Mostra il nome utente nel messaggio di stato"
+
+#: ../libpurple/protocols/myspace/myspace.c:4427
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:4432
+msgid "Send emoticons"
+msgstr "Invia emoticon"
+
+#: ../libpurple/protocols/myspace/myspace.c:4437
+msgid "Screen resolution (dots per inch)"
+msgstr "Risoluzione dello schermo (punti per pollice)"
+
+#: ../libpurple/protocols/myspace/myspace.c:4440
+msgid "Base font size (points)"
+msgstr "Dimensione del font di base (punti)"
+
+#. cmd
+#. args - accept a single word
+#. priority
+#. flags
+#. prpl_id
+#. func
+#: ../libpurple/protocols/myspace/myspace.c:4456
+#, fuzzy
+msgid "zap: zap a user to get their attention"
+msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
+msgid "Required parameters not passed in"
+msgstr "Dei parametri richiesti non sono stati passati"
+
+#: ../libpurple/protocols/novell/nmuser.c:1867
+msgid "Unable to write to network"
+msgstr "Impossibile scriver sulla rete"
+
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "Impossibile leggere dalla rete"
+
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "Errore di comunicazione con il server"
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "Conferenza non trovata"
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "La conferenza non esiste"
+
+#: ../libpurple/protocols/novell/nmuser.c:1884
+msgid "A folder with that name already exists"
+msgstr "Esiste già una cartella con quel nome."
+
+#: ../libpurple/protocols/novell/nmuser.c:1887
+msgid "Not supported"
+msgstr "Non supportato"
+
+#: ../libpurple/protocols/novell/nmuser.c:1891
+msgid "Password has expired"
+msgstr "La password è scaduta"
+
+#: ../libpurple/protocols/novell/nmuser.c:1894
+msgid "Incorrect password"
+msgstr "Password non corretta"
+
+#: ../libpurple/protocols/novell/nmuser.c:1897
+msgid "User not found"
+msgstr "Utente non trovato"
+
+#: ../libpurple/protocols/novell/nmuser.c:1900
+msgid "Account has been disabled"
+msgstr "L'account è stato disabilitato"
+
+#: ../libpurple/protocols/novell/nmuser.c:1903
+msgid "The server could not access the directory"
+msgstr "Il server non è riuscito ad accedere alla directory"
+
+#: ../libpurple/protocols/novell/nmuser.c:1906
+msgid "Your system administrator has disabled this operation"
+msgstr "Il tuo amministartore di sistema ha disabilitato questa operazione"
 
 #: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
@@ -6584,9 +7164,9 @@
 msgid "Server port"
 msgstr "Porta del server"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2448
+#: ../libpurple/protocols/yahoo/yahoo.c:2615
 #: ../libpurple/protocols/yahoo/ycht.c:481
 #: ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099
@@ -6596,9 +7176,9 @@
 msgid "Server closed the connection."
 msgstr "Il server ha chiuso la connessione."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2442
+#: ../libpurple/protocols/yahoo/yahoo.c:2609
 #: ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111
 #: ../libpurple/proxy.c:1220
@@ -6612,7 +7192,7 @@
 "Connessione persa col server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128
 #: ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332
@@ -6652,7 +7232,7 @@
 msgstr "Plugin per il protocollo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4353
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codifica"
@@ -6685,7 +7265,7 @@
 #: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgstr "Il file %s è di %s. La massima dimensione possibile è di %s."
 
 #: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
@@ -6783,32 +7363,32 @@
 msgid "Not while on AOL"
 msgstr "Non è possibile se connessi ad AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr ""
+msgstr "(C'è stato un errore nella ricezione del messaggio. L'utente con il quale stai parlando sta probabilmente usando una codifica diversa da quella attesa. Se conosci la codifica che sta usando, puoi specificarla nelle opzioni avanzate del tuo account AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
 msgstr "(C'è stato un errore nella ricezione questo messaggio. E' possibile che tu e %s stiate usando delle codifiche differenti, oppure si tratta di un bug nel client di %s.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639
-#: ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icona per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Voce"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "Messaggio istantaneo diretto AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6816,128 +7396,129 @@
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Get File"
 msgstr "Ricevi file"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Giochi"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Add-in"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Invia la lista contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Connessione diretta ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "Utente AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "Server relay ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Vecchio ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Crittazione di trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Sicurezza abilitata"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Video live"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Fotocamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5765
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5751
 msgid "Occupied"
 msgstr "Occupato"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Rendi visibile il tuo stato sul web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/oscar/oscar.c:736
 #: ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3069
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697
-#: ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3677
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Livello di richiamo"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6946,7 +7527,7 @@
 "Impossibile connettersi al server di autenticazione:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6955,140 +7536,140 @@
 "Impossibile connettersi al server BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Nome utente inviato"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Connessione stabilita, cookie inviato"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Finalizzazione della connessione"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Impossibile connettersi. Impossibile effettuare il login come %s poiché il nome utente non è valido. I nomi utente devono iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure devono contenere solo numeri."
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2084
 msgid "Invalid screen name."
 msgstr "Nome utente non valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Il tuo account è attualmente sospeso."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Impossibile connettersi"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Autorizzazione ricevuta"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "La chiave SecurID immessa non è valida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:6116
 #: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è risolto il problema. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossibile ottenere un hash di login valido per AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Impossibile ottenere un hash di login valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Password inviata"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Impossibile inizializzare la connessione"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Messaggio di richiesta di autorizzazione:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Mi autorizzi, per favore?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5213
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -7097,17 +7678,17 @@
 "L'utente %u ha rifiutato di essere aggiunto alla tua lista contatti per il seguente motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "Autorizzazione ICQ rifiutata."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "L'utente %u ha accolto la tua richiesta di aggiungerlo alla tua lista contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7120,7 +7701,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7133,7 +7714,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7146,60 +7727,60 @@
 "Il messaggio è:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utente ICQ %u ti ha inviato un contatto: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vuoi aggiungere questo contatto alla tua lista?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libpurple/protocols/oscar/oscar.c:2481
 #: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poiché non era valido."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché non erano validi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poiché era troppo grande."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché erano troppo grandi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2584
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poiché è stato spedito troppo velocemente."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché sono stati spedito troppo velocemente."
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poiché l'utente è troppo \"cattivo\"."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché l'utente è troppo \"cattivo\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:2608
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poiché sei troppo \"cattivo\"."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poiché sei troppo \"cattivo\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:2617
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7207,283 +7788,274 @@
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Motivo sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossibile inviare il messaggio %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informazioni sull'utente non disponibili: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Online da"
 
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro da"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
 msgstr "Capacità"
 
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr "Messaggio di disponibilità"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
-msgid "Profile"
-msgstr "Profilo"
-
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3202
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Impossibile mostrare un messaggio da questo utente poiché contiene caratteri non validi.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3366
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "L'ultima operazione non è stata eseguita poiché sei al di sopra del rate consentito. Attendi 10 secondi e riprova."
 
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "Sei stato disconnesso per un motivo sconosciuto."
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3699
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3729
 msgid "Personal Web Page"
 msgstr "Pagina web personale"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3753
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Zip Code"
 msgstr "Codice postale"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3785
 msgid "Division"
 msgstr "Divisione"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Position"
 msgstr "Posizione"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Work Information"
 msgstr "Informazioni sul lavoro"
 
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Pop-Up Message"
 msgstr "Messaggio pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3887
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Il seguente nome utente è associato con %s"
 msgstr[1] "I seguenti nomi utente sono associati con %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Screen name"
 msgstr "Nome utente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3918
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nessun risultato trovato per l'indirizzo e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3939
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Dovresti ricevere un'e-mail con la richiesta di conferma per %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:3941
 msgid "Account Confirmation Requested"
 msgstr "Conferma per l'account richiesta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3972
 msgid "Error Changing Account Info"
 msgstr "Errore nella modifica delle informazioni sull'account"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3975
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente richiesto differisce dall'originale."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché non è valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Errore 0x%04x: Impossibile formattare il nome utente poiché il nome utente richiesto è troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:3984
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché c'è già una richiesta in corso per questo nome utente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché l'indirizzo fornito ha troppi nomi utente associati."
 
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: ../libpurple/protocols/oscar/oscar.c:3990
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poiché l'indirizzo fornito non è valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:3993
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Errore 0x%04x: Errore sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4003
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'indirizzo e-mail di %s è %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4005
 msgid "Account Info"
 msgstr "Informazioni sull'account"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4177
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "La tua immagine MI non è stata inviata. Devi essere in connessione diretta per inviare immagini MI."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4448
 msgid "Unable to set AIM profile."
 msgstr "Impossibile impostare il profilo AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4449
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Probabilmente hai richiesto di impostare il tuo profilo prima che la procedura di login fosse completata. Il tuo profilo rimane non impostato; prova ad impostarlo di nuovo quando sei connesso correttamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4463
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "La lunghezza massima del profilo di %d byte è stata superata. E' stato pertanto automaticamente troncato."
 msgstr[1] "La lunghezza massima del profilo di %d byte è stata superata. E' stato pertanto automaticamente troncato."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4468
 msgid "Profile too long."
 msgstr "Profilo troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4513
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "La lunghezza massima del messaggio di assenza di %d byte è stata superata. E' stato pertanto automaticamente troncato."
 msgstr[1] "La lunghezza massima del messaggio di assenza di %d byte è stata superata. E' stato pertanto automaticamente troncato."
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4518
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4587
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I nomi utente devono essere indirizzi email validi oppure iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure devono contenere solo numeri."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4589
+#: ../libpurple/protocols/oscar/oscar.c:5022
+#: ../libpurple/protocols/oscar/oscar.c:5037
 msgid "Unable To Add"
 msgstr "Impossibile aggiungere"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4698
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4733
+#: ../libpurple/protocols/oscar/oscar.c:4699
 msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "I server AIM non sono momentaneamente in grado di inviare la tua lista dei contatti. In ogni caso, la lista non è persa e sarà probabilmente disponibile tra poche ore."
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:4881
+#: ../libpurple/protocols/oscar/oscar.c:4883
+#: ../libpurple/protocols/oscar/oscar.c:5091
+#: ../libpurple/protocols/oscar/oscar.c:5092
+#: ../libpurple/protocols/oscar/oscar.c:5097
 msgid "Orphans"
 msgstr "Orfani"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5020
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Impossibile aggiungere il contatto %s poiché hai troppi contatti nella tua lista. Rimuovine uno e prova nuovamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5034
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5128
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "L'utente %s ti ha dato il permesso di aggiungerti alla sua lista contatti. Vuoi aggiungerlo alla tua?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5136
 msgid "Authorization Given"
 msgstr "Autorizzazione concessa"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5209
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "L'utente %s ha accolto la tua richiesta di aggiungerlo nella tua lista contatti."
 
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: ../libpurple/protocols/oscar/oscar.c:5210
 msgid "Authorization Granted"
 msgstr "Autorizzazione concessa"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5213
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7492,188 +8064,182 @@
 "L'utente %s ha rifiutato la tua richiesta di aggiungerlo alla tua lista contatti per il seguente motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5214
 msgid "Authorization Denied"
 msgstr "Autorizzazione rifiutata"
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5250
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Scambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5290
 msgid "Invalid chat name specified."
 msgstr "Il nome della chat specificato non è valido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5359
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "La tua immagine MI non è stata inviata. Non puoi inviare immagini MI nelle chat AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "Away Message"
 msgstr "Messaggio di assenza"
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:5524
 msgid "<i>(retrieving)</i>"
-msgstr " <i>(identificato)</i>"
+msgstr " <i>(scaricamento)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5724
 msgid "iTunes Music Store Link"
 msgstr "Link all'iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5832
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commento per il contatto %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5833
 msgid "Buddy Comment:"
 msgstr "Commento per il contatto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5880
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Hai scelto di aprire una connessione IM diretta con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Poiché questo rivela il tuo indirizzo IP, deve essere considerato un rischio per la sicurezza. Vuoi continuare?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:5890
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "C_onnetti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get AIM Info"
 msgstr "Ottieni info AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5931
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Get Status Msg"
 msgstr "Ottieni messaggio di stato"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5952
 msgid "Direct IM"
 msgstr "Messaggio istantaneo diretto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:5974
 msgid "Re-request Authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6033
 msgid "Require authorization"
 msgstr "Richiedi autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "Segnala sul web la tua presenza (questa opzione ti farà ricevere molto SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6041
 msgid "ICQ Privacy Options"
 msgstr "Opzioni per la privacy di ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "The new formatting is invalid."
 msgstr "La nuova formattazione non è valida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6061
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "La formattazione del nome utente può modificare solo le maiuscole/minuscole e gli spazi bianchi."
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6114
 msgid "Change Address To:"
 msgstr "Cambia l'indirizzo in:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6163
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Stai attendendo autorizzazione dai seguenti contatti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6181
 msgid "Find Buddy by E-Mail"
 msgstr "Cerca un contatto per e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6182
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6183
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Inserisci l'indirizzo e-mail del contatto che stai cercando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Set User Info (URL)..."
 msgstr "Imposta le informazioni utente (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6355
 msgid "Change Password (URL)"
 msgstr "Cambia password (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6359
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura l'inoltro dei messaggi immediati (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6369
 msgid "Set Privacy Options..."
 msgstr "Imposta le opzioni per la privacy..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6376
 msgid "Confirm Account"
 msgstr "Conferma account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6380
 msgid "Display Currently Registered E-Mail Address"
-msgstr "Mostra l'attuale indirizzo registrato"
+msgstr "Mostra gli attuali indirizzi email registrati"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Currently Registered E-Mail Address..."
-msgstr "Modifica l'attuale indirizzo registrato..."
+msgstr "Mostra gli attuali indirizzi email registrati..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6391
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra i contatti dai quali attendi autorizzazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6397
 msgid "Search for Buddy by E-Mail Address..."
-msgstr "Cerca un contatto per e-mail..."
+msgstr "Cerca un contatto per email..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6402
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6470
 msgid "Use recent buddies group"
-msgstr "L'utente non è nel gruppo"
+msgstr "Utilizza il gruppo di contatti recente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Show how long you have been idle"
-msgstr "Consente di configurare manualmente per quanto tempo sei stato inattivo."
+msgstr "Mostra per quanto tempo sei stato inattivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6628
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7687,14 +8253,13 @@
 msgstr "È in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI diretti."
 
 #: ../libpurple/protocols/oscar/peer.c:759
-#, fuzzy, c-format
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
+msgstr "Tentativo di connessione con %s: %hu."
 
 #: ../libpurple/protocols/oscar/peer.c:833
-#, fuzzy
 msgid "Attempting to connect via proxy server."
-msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
+msgstr "Tentativo di connessione attraverso un server proxy."
 
 #: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
@@ -7706,24 +8271,20 @@
 msgstr "Questo richiede una connessione diretta tra i due computer ed è necessario per le Immagini IM. Poiché verrà rivelato il tuo indirizzo IP, devi considerare la cosa come un potenziale rischio per la tua privacy."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
-#, fuzzy
 msgid "Primary Information"
-msgstr "Informazioni sul profilo"
+msgstr "Informazioni primarie"
 
 #: ../libpurple/protocols/qq/buddy_info.c:41
-#, fuzzy
 msgid "Personal Introduction"
-msgstr "Informazioni personali"
+msgstr "Presentazione personale"
 
 #: ../libpurple/protocols/qq/buddy_info.c:42
-#, fuzzy
 msgid "QQ Number"
-msgstr "Numero di telefono"
+msgstr "Numero QQ"
 
 #: ../libpurple/protocols/qq/buddy_info.c:47
-#, fuzzy
 msgid "Country/Region"
-msgstr "Paese"
+msgstr "Paese/Regione"
 
 #: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
@@ -7742,9 +8303,8 @@
 msgstr "Gruppo sanguigno"
 
 #: ../libpurple/protocols/qq/buddy_info.c:54
-#, fuzzy
 msgid "College"
-msgstr "_Minimizza"
+msgstr "Scuola superiore"
 
 #: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
@@ -7879,13 +8439,12 @@
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid "Setting custom faces is not currently supported. Please choose an image from %s."
-msgstr ""
+msgstr "I volti personalizzati non sono attualmente supportati. Scegli un'immagine da %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
 #: ../libpurple/protocols/qq/buddy_info.c:590
-#, fuzzy
 msgid "Invalid QQ Face"
-msgstr "Authzid non valido"
+msgstr "Volto QQ non valido"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:136
@@ -7894,9 +8453,8 @@
 msgstr "Hai rifiutato la richiesta di %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
-msgstr ""
+msgstr "Inserisci la tua motivazione:"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
@@ -7911,73 +8469,70 @@
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Rifiuta"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
-msgid "Add buddy with auth request fails"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
+msgid "Add buddy with auth request failed"
+msgstr "Impossibile aggiungere il contatto attraverso la richiesta di autorizzazione"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Contatto rimosso con successo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Hai rimosso con successo te stesso da un contatto"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Hai rimosso con successo te stesso dalla lista del tuo amico"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "L'utente %d necessita di autenticazione"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
-msgstr ""
+msgstr "Inserisci la tua richiesta qui"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "Vuoi sovrascriverlo?"
+msgstr "Vuoi essere mio amico?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Invia"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
+msgid "You have added %d to buddy list"
 msgstr "Hai aggiunto %d alla lista contatti"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
-#, fuzzy
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
-msgstr "Errore di lettura"
+msgstr "Errore QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
-#, fuzzy
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
-msgstr "Authzid non valido"
+msgstr "QQid non valido"
 
 #: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID:"
 
 #: ../libpurple/protocols/qq/group.c:98
-#, fuzzy
 msgid "Group ID"
-msgstr "Gruppo:"
+msgstr "ID del gruppo"
 
 #: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
@@ -7988,30 +8543,29 @@
 msgstr "Descrizione del gruppo"
 
 #: ../libpurple/protocols/qq/group.c:109
-#, fuzzy
 msgid "Auth"
-msgstr "Autorizza"
+msgstr "Autorizzazione"
 
 #: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
-msgstr ""
+msgstr "Qun QQ"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
-msgstr ""
+msgid "Please enter external group ID"
+msgstr "Inserisci un ID per il gruppo esterno"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
-msgstr ""
+msgstr "Puoi solamente cercare i gruppi QQ permanenti\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
-msgid "User %d applied to join group %d"
-msgstr "L'utente non è nel gruppo"
+#, c-format
+msgid "User %d requested to join group %d"
+msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Motivo: %s"
@@ -8026,44 +8580,42 @@
 #: ../libpurple/protocols/qq/group_opt.c:235
 #: ../libpurple/protocols/qq/group_opt.c:305
 #: ../libpurple/protocols/qq/group_opt.c:391
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Opzioni suono"
+msgstr "Operatore Qun QQ"
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Approva"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "La tua richiesta di entrare nel gruppo %d è stata rifiutata dall'amministratore %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr "La tua richiesta di entrare nel gruppo %d è stata approvata dall'amministratore %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "Tu [%d] hai lasciato il gruppo \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
+msgid "You [%d] have been added to group \"%d\""
 msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
-#, fuzzy
 msgid "This group has been added to your buddy list"
-msgstr "L'utente %s vuole aggiungere %s alla sua lista dei contatti."
+msgstr "Questo gruppo è stato aggiunto alla tua lista dei contatti."
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "Non sono un membro"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8079,17 +8631,15 @@
 msgstr "Sono l'amministratore"
 
 #: ../libpurple/protocols/qq/group_internal.c:53
-#, fuzzy
 msgid "Unknown status"
-msgstr "Motivo sconosciuto"
+msgstr "Stato sconosciuto"
 
 #: ../libpurple/protocols/qq/group_join.c:82
-#, fuzzy
 msgid "This group does not allow others to join"
-msgstr "Questa versione di prova non consente a più di dieci utenti di collegarsi allo stesso tempo"
+msgstr "Questo gruppo non consente ad altri di entrare"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
 msgstr "Hai abbandonato il gruppo con successo"
 
 #: ../libpurple/protocols/qq/group_join.c:257
@@ -8097,27 +8647,24 @@
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr ""
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "La tua richiesta di autorizzazione è stata accettata dal server QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
-msgstr ""
+msgid "You entered a group ID outside the acceptable range"
+msgstr "Hai inserito un ID di gruppo al di fuori dell'intervallo accettabile"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
-msgid "Are you sure to exit this Qun?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Sei sicuro di voler abbandonare questo Qun?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Vai avanti"
+"Nota, se sei il creatore, \n"
+"questa operazione rimuoverà questo Qun."
 
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
@@ -8125,32 +8672,34 @@
 msgstr "Codice [0x%02X]: %s"
 
 #: ../libpurple/protocols/qq/group_network.c:93
-#, fuzzy
 msgid "Group Operation Error"
-msgstr "Operazione illegale sul file"
+msgstr "Errore di operazione sul gruppo"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "Vuoi approvare la richiesta?"
 
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Inserisci la tua motivazione:"
+
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
-msgstr ""
+msgid "You have successfully modified Qun member"
+msgstr "Membro Qun modificato con successo"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
-msgstr ""
+msgid "You have successfully modified Qun information"
+msgstr "Informazione Qun modificata con successo"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "Qun creato con successo"
 
 #: ../libpurple/protocols/qq/group_opt.c:394
-#, fuzzy
 msgid "Would you like to set up the Qun details now?"
-msgstr "Vuoi utilizzarla come icona per questo contatto?"
+msgstr "Vuoi impostare i dettagli Qun adesso?"
 
 #: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
@@ -8161,20 +8710,18 @@
 msgstr "Messaggio di sistema"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "Server ACK"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Impossibile inviare il messaggio immediato"
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr ""
+#, fuzzy
+msgid "Keep alive error"
+msgstr "Errore in lettura"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr ""
+#, fuzzy
+msgid "Error requesting login token"
+msgstr "Errore nella creazione della connessione"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8190,106 +8737,88 @@
 msgstr "Impossibile connettersi."
 
 #: ../libpurple/protocols/qq/qq.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown-%d"
-msgstr "Sconosciuto"
+msgstr "Sconosciuto-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, fuzzy, c-format
-msgid "%s Address"
-msgstr "Indirizzo"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "Indirizzo TCP"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "Indirizzo UDP"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Livello"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Disponibile"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Assente"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Invisibile"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Non connesso"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#: ../libpurple/protocols/qq/qq.c:437
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:439
+#, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>Attualmente online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:440
+#, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:444
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Inattivo per:</b> %s<br>"
+msgstr "<b>Modalità di connessione</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:445
+#, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>IP del server</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:446
+#, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<b>Alias:</b> %s<br>"
+msgstr "<b>Il mio IP pubblico</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:451
+#, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>Orario di login</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:452
+#, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>Ultimo IP di login</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:453
+#, c-format
 msgid "<b>Last Login Time</b>: %s\n"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
+msgstr "<b>Ultimo orario di login</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
-msgstr "Informazioni di debug"
+msgstr "Informazioni sul login"
 
-#: ../libpurple/protocols/qq/qq.c:531
-#, fuzzy
-msgid "Modify My Information"
-msgstr "Informazioni sul contatto"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Imposta le mie informazioni"
 
-#: ../libpurple/protocols/qq/qq.c:534
+#: ../libpurple/protocols/qq/qq.c:536
 #: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: ../libpurple/protocols/qq/qq.c:537
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
-msgstr "Informazioni di debug"
+msgstr "Mostra le informazioni sul login"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr ""
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Abbandona questo Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Blocca questo utente"
 
@@ -8303,28 +8832,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723
 #: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "Plugin per il protocollo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:750
-#, fuzzy
-msgid "Login in TCP"
-msgstr "Entra nella chat"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Nascondi al login"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-#, fuzzy
-msgid "Socket send error"
-msgstr "Errore di token"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Connessione rifiutata"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Connetti utilizzando TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8358,65 +8873,60 @@
 msgid "Login failed, no reply"
 msgstr "Login non riuscito. Nessuna risposta."
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
 msgstr "Vuoi aggiungere questo contatto?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sei stato aggiunto da %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Vuoi aggiungerlo?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s ti ha aggiunto [%s]"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s ti [%s] ha aggiunto alla sua lista contatti"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "L'utente %s ha rifiutato la tua richiesta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
+msgid "User %s approved your request"
 msgstr "L'utente %s ha accettato la tua richiesta"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s vuole aggiungerti [%s] come amico"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Messaggio: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s non è nella tua lista contatti"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "Vuoi aggiungerlo?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
-#, fuzzy
 msgid "Connection closed (writing)"
-msgstr "Connessione chiusa"
+msgstr "Connessione chiusa (scrittura in corso)"
 
 #: ../libpurple/protocols/sametime/sametime.c:1290
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Utente:</b> %s<br>"
+msgstr "<b>Titolo del gruppo:</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1291
 #, fuzzy, c-format
@@ -8434,9 +8944,8 @@
 msgstr "Informazioni sul lavoro"
 
 #: ../libpurple/protocols/sametime/sametime.c:1327
-#, fuzzy
 msgid "Invite Group to Conference..."
-msgstr "Inizia una conferenza"
+msgstr "Invita il gruppo in conferenza..."
 
 #: ../libpurple/protocols/sametime/sametime.c:1337
 #, fuzzy
@@ -8448,17 +8957,16 @@
 msgstr "Invio handshake in corso"
 
 #: ../libpurple/protocols/sametime/sametime.c:1509
-#, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "In attesa dell'inizio del trasferimento"
+msgstr "In attesa del riconoscimento dell'handshake"
 
 #: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Handshake riconosciuto. Invio del login in corso"
 
 #: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "In attesa del riconoscimento del login"
 
 #: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
@@ -8470,24 +8978,20 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "Login riconosciuto"
 
 #: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Avvio servizi in corso"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Connesso"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
+msgstr "Un amministratore Sametime ha diffuso il seguente annuncio sul server %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Annuncio dell'amministratore Sametime"
 
 #: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
@@ -8507,7 +9011,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "Annuncio da %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
@@ -8519,7 +9023,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
-msgstr ""
+msgstr "Luogo chiuso"
 
 #: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
@@ -8539,27 +9043,22 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
-#, fuzzy
 msgid "Supports"
-msgstr "supporto"
+msgstr "Supporta"
 
 #: ../libpurple/protocols/sametime/sametime.c:3274
 #: ../libpurple/protocols/sametime/sametime.c:4119
-#, fuzzy
 msgid "External User"
-msgstr ""
-"\n"
-"<b>Richiamato:</b>"
+msgstr "Utente esterno"
 
 #: ../libpurple/protocols/sametime/sametime.c:3380
-#, fuzzy
 msgid "Create conference with user"
-msgstr "Scegli un server per le conferenze al quale connettersi"
+msgstr "Crea una conferenza con l'utente"
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
-msgstr ""
+msgstr "Inserisci l'argomento per la nuova conferenza, insieme ad un messaggio di invito da inviare a %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
@@ -8584,7 +9083,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr ""
+msgstr "Scegli una conferenza dalla seguente lista per la quale inviare un invito all'utente %s. Scegli \"Crea nuova conferenza\" se preferisci creare una nuova conferenza alla quale invitare l'utente."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -8596,34 +9095,32 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "Invia annuncio TEST"
 
 #: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4274
+#: ../pidgin/gtkconv.c:4299
 msgid "Topic:"
 msgstr "Argomento:"
 
 #: ../libpurple/protocols/sametime/sametime.c:3614
-#, fuzzy
 msgid "No Sametime Community Server specified"
-msgstr "Connessione al server SILC in corso"
+msgstr "Nessun server community Sametime specificato"
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
-msgstr ""
+msgstr "Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile %s. Per poter proseguire con il login, devi specificarne uno qui sotto."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
-msgstr ""
+msgstr "Impostazione della connessione Meanwhile"
 
 #: ../libpurple/protocols/sametime/sametime.c:3642
-#, fuzzy
 msgid "No Sametime Community Server Specified"
-msgstr "Connessione al server SILC in corso"
+msgstr "Nessun server community Sametime specificato"
 
 #: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4026
 msgid "Connect"
 msgstr "Connetti"
 
@@ -8633,11 +9130,8 @@
 msgstr "Sconosciuto (0x%04x)<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:4137
-#, fuzzy
 msgid "Last Known Client"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
+msgstr "Ultimo client conosciuto"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
 #: ../libpurple/protocols/sametime/sametime.c:5506
@@ -8647,16 +9141,16 @@
 #: ../libpurple/protocols/sametime/sametime.c:4304
 #: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
-msgstr ""
+msgstr "ID Sametime"
 
 #: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "E' stato immesso uno user ID ambiguo"
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
-#, fuzzy, c-format
+#, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "È stato trovato più di un utente con lo stesso nome. Scegliere dalla lista l'utente corretto da aggiungere alla lista contatti."
+msgstr "L'identificativo '%s' potrebbe riferirsi ad uno dei seguenti utenti. Seleziona dall'elenco qui sotto l'utente corretto da aggiungere alla tua lista contatti."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -8669,7 +9163,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
-msgstr ""
+msgstr "L'identificativo '%s' non corrisponde a nessun utente nella tua comunità Sametime. Questa voce è stata pertanto rimossa dalla tua lista contatti."
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
@@ -8685,43 +9179,38 @@
 "%s\n"
 
 #: ../libpurple/protocols/sametime/sametime.c:5146
-#, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "Invia la lista contatti"
+msgstr "Lista contatti archiviata in remoto"
 
 #: ../libpurple/protocols/sametime/sametime.c:5151
-#, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "Ordinamento della lista contatti"
+msgstr "Modalità di archiviazione della lista contatti"
 
 #: ../libpurple/protocols/sametime/sametime.c:5154
-#, fuzzy
 msgid "Local Buddy List Only"
-msgstr "Lista contatti _agganciabile"
+msgstr "Soltanto lista contatti locale"
 
 #: ../libpurple/protocols/sametime/sametime.c:5156
-#, fuzzy
 msgid "Merge List from Server"
-msgstr "Elimina la lista contatti dal server"
+msgstr "Unisci la lista dal server"
 
 #: ../libpurple/protocols/sametime/sametime.c:5158
-#, fuzzy
 msgid "Merge and Save List to Server"
-msgstr "È stato inviato al server un valore CHL sbagliato"
+msgstr "Unisci e salva la lista sul server "
 
 #: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "Sincronizza la lista con il server"
 
 #: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "Importa la lista Sametime per l'account %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
+msgstr "Esporta la lista Sametime per l'account %s"
 
 #: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
@@ -8730,7 +9219,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
+msgstr "Un gruppo dal nome '%s' esiste già nella tua lista contatti."
 
 #: ../libpurple/protocols/sametime/sametime.c:5313
 #: ../libpurple/protocols/sametime/sametime.c:5443
@@ -8781,11 +9270,10 @@
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr ""
+msgstr "L'identificativo '%s' può corrispondere ad uno dei seguenti utenti. Puoi aggiungere questi utenti alla tua lista contatti o inviare loro dei messaggi tramite i pulsanti qui sotto."
 
-#. Create the window
 #: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtknotify.c:719
+#: ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 
@@ -8796,7 +9284,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
+msgstr "L'identificativo '%s' non corrisponde ad alcun utente nella tua comunità Sametime."
 
 #: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
@@ -8808,7 +9296,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr ""
+msgstr "Inserisci un nome o un ID parziale nel campo sottostante per cercare tra gli utenti nella tua comunità Sametime."
 
 #: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
@@ -8816,11 +9304,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "Importa la lista Sametime..."
 
 #: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
-msgstr ""
+msgstr "Esporta la lista Sametime..."
 
 #: ../libpurple/protocols/sametime/sametime.c:5630
 #, fuzzy
@@ -8833,7 +9321,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "Forza il login (ignora le redirezioni del server)"
 
 #. pretend to be Sametime Connect
 #: ../libpurple/protocols/sametime/sametime.c:5750
@@ -9280,7 +9768,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1677
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "Scrivi sulla lavagna"
 
 #: ../libpurple/protocols/silc/chat.c:39
 #: ../libpurple/protocols/silc10/chat.c:39
@@ -9594,14 +10082,12 @@
 msgstr "Scambio delle chiavi fallito"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
 msgstr "Connessione scaduta"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "Connessione fallita"
+msgstr "Creazione della connessione fallita"
 
 #: ../libpurple/protocols/silc/ft.c:122
 #: ../libpurple/protocols/silc10/ft.c:102
@@ -9634,9 +10120,8 @@
 msgstr "Impossibile inviare il file"
 
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "Errore"
+msgstr "Si è verificato un errore"
 
 #: ../libpurple/protocols/silc/ops.c:533
 #: ../libpurple/protocols/silc/ops.c:542
@@ -9756,8 +10241,7 @@
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Vero nome"
 
@@ -9818,9 +10302,8 @@
 msgstr "Impossibile recuperare la lista delle stanze"
 
 #: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
 msgid "Network is empty"
-msgstr "Statistiche sulla rete"
+msgstr "Il network è vuoto"
 
 #: ../libpurple/protocols/silc/ops.c:1512
 #: ../libpurple/protocols/silc10/ops.c:1507
@@ -10027,9 +10510,8 @@
 msgstr "Connessione al server SILC in corso"
 
 #: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy
 msgid "Could not load SILC key pair"
-msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
+msgstr "Impossibile caricare la coppia di chiavi SILC"
 
 #: ../libpurple/protocols/silc/silc.c:366
 #: ../libpurple/protocols/silc10/silc.c:355
@@ -10047,9 +10529,8 @@
 msgstr "Impossibile inizializzare il protocollo SILC"
 
 #: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "Creazione della coppia di chiavi SILC in corso..."
+msgstr "Errore nel caricamento della coppia di chiavi SILC"
 
 #: ../libpurple/protocols/silc/silc.c:739
 #: ../libpurple/protocols/silc10/silc.c:650
@@ -10058,7 +10539,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normale"
 
@@ -10121,9 +10602,8 @@
 msgstr "Il tuo file VCard"
 
 #: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Fuso orario"
+msgstr "Fuso orario (UTC)"
 
 #: ../libpurple/protocols/silc/silc.c:816
 #: ../libpurple/protocols/silc/silc.c:817
@@ -10176,9 +10656,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:957
 #: ../libpurple/protocols/silc10/silc.c:868
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "Scambio delle chiavi fallito"
+msgstr "Generazione della coppia di chiavi fallita"
 
 #: ../libpurple/protocols/silc/silc.c:996
 #: ../libpurple/protocols/silc10/silc.c:907
@@ -10202,9 +10681,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:1030
 #: ../libpurple/protocols/silc10/silc.c:941
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "File per la chiave privata"
+msgstr "Genera una coppia di chiavi"
 
 #: ../libpurple/protocols/silc/silc.c:1073
 #: ../libpurple/protocols/silc10/silc.c:984
@@ -10263,9 +10741,9 @@
 
 #: ../libpurple/protocols/silc/silc.c:1590
 #: ../libpurple/protocols/silc10/silc.c:1519
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Comando sconosciuto: %s, (potrebbe essere un bug di Gaim)"
+msgstr "Comando sconosciuto: %s, (potrebbe essere un bug del client)"
 
 #: ../libpurple/protocols/silc/silc.c:1653
 #: ../libpurple/protocols/silc10/silc.c:1582
@@ -10430,7 +10908,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Rete"
 
@@ -10447,7 +10925,7 @@
 #: ../libpurple/protocols/silc/silc.c:1935
 #: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
-msgstr ""
+msgstr "Cifra"
 
 #: ../libpurple/protocols/silc/silc.c:1945
 #: ../libpurple/protocols/silc10/silc.c:1888
@@ -10471,13 +10949,12 @@
 #: ../libpurple/protocols/silc/silc.c:1958
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "Blocca i messaggi per la lavagna"
 
 #: ../libpurple/protocols/silc/silc.c:1961
 #: ../libpurple/protocols/silc10/silc.c:1900
-#, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "_Massimizza automaticamente le liste dei contatti"
+msgstr "Apri automaticamente la lavagna"
 
 #: ../libpurple/protocols/silc/silc.c:1964
 #: ../libpurple/protocols/silc10/silc.c:1903
@@ -10493,9 +10970,8 @@
 
 #: ../libpurple/protocols/silc/util.c:215
 #: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
 msgid "Cannot create SILC key pair\n"
-msgstr "Creazione della coppia di chiavi SILC in corso..."
+msgstr "Impossibile creare la coppia di chiavi SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10549,9 +11025,9 @@
 msgstr "Lunghezza della chiave: \t%d bit\n"
 
 #: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Motivo: %s"
+msgstr "Versione: \t%s\n"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:369
@@ -10611,18 +11087,18 @@
 #: ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s ha inviato un messaggio sulla lavagna. Vuoi aprire la lavagna?"
 
 #: ../libpurple/protocols/silc/wb.c:288
 #: ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "%s ha inviato un messaggio sulla lavagna del canale %s. Vuoi aprire la lavagna?"
 
 #: ../libpurple/protocols/silc/wb.c:302
 #: ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
-msgstr ""
+msgstr "Lavagna"
 
 #: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
@@ -10678,9 +11154,8 @@
 msgstr "Nessun nome"
 
 #: ../libpurple/protocols/silc10/silc.c:320
-#, fuzzy
 msgid "Cannot find/access ~/.silc directory"
-msgstr "Impossibile inviare una directory."
+msgstr "Impossibile trovare/accedere alla cartella ~/.silc"
 
 #: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
@@ -10693,29 +11168,28 @@
 msgstr "Impossibile scrivere"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Impossibile connettersi"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Impossibile creare il socket in ascolto"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Impossibile risolvere l'host"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Impossibile risolvere il nome dell'host"
 
-#: ../libpurple/protocols/simple/simple.c:1649
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "I nick IRC non devono contenere spazi bianchi"
+msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 
 #. *< type
 #. *< ui_requirement
@@ -10725,40 +11199,38 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin per il protocollo SILC"
+msgstr "Plugin per il protocollo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin per il protocollo SILC"
+msgstr "Il plugin per il protocollo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 "Rendi pubblico il tuo stato\n"
 "(nota: chiunque potrebbe vederti)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Utilizza UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Utilizza proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Utente Auth"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Dominio Auth"
 
@@ -10868,9 +11340,8 @@
 msgstr "Errore sconosciuto: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy
 msgid "Incorrect screen name or password."
-msgstr "Password o nickname non corretti."
+msgstr "Password o nome utente non corretti."
 
 #: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
@@ -10915,8 +11386,8 @@
 msgstr "Password modificata con successo"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../pidgin/gtkblist.c:5532
+#: ../pidgin/gtkblist.c:5885
 msgid "_Group:"
 msgstr "_Gruppo:"
 
@@ -10979,218 +11450,221 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin per il protocollo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:778
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è ancora supportata."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:834
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non è stato inviato."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
+#: ../libpurple/protocols/yahoo/yahoo.c:906
 #, fuzzy, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s vuole inviarti un file"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Messaggio di sistema Yahoo! per %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:1025
 msgid "Authorization denied message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua lista contatti."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1043
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua lista contatti per il seguente motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1046
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua lista contatti."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "Il server di Yahoo ha richiesto l'uso di un metodo di autenticazione non riconosciuto. Questa versione di Gaim probabilmente non sarà in grado di connettersi con successo a Yahoo. Controlla %s per aggiornamenti."
+msgstr "Il server di Yahoo ha richiesto l'uso di un metodo di autenticazione non riconosciuto. Probabilmente non sarai in grado di connetterti con successo a Yahoo. Controlla %s per aggiornamenti."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1976
 msgid "Failed Yahoo! Authentication"
 msgstr "Autenticazione Yahoo! fallita"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2042
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "Hai cercato di ignorare %s, ma l'utente è nella tua lista contatti. Facendo clic su \"Sì\" il contatto verrà rimosso ed ignorato."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2045
 msgid "Ignore buddy?"
 msgstr "Ignora il contatto?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Il tuo account è bloccato. Per piacere, effettua il login sul sito web di Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2111
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto effettuando il login sul sito web di Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2165
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per l'account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2168
 msgid "Could not add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2287
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2630
 msgid "Received unexpected HTTP response from server."
 msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2654
+#: ../libpurple/protocols/yahoo/yahoo.c:2840
+#: ../libpurple/protocols/yahoo/yahoo.c:2943
+#: ../libpurple/protocols/yahoo/yahoo.c:2953
+#: ../libpurple/protocols/yahoo/yahoochat.c:1419
+#: ../libpurple/protocols/yahoo/yahoochat.c:1489
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema di connessione"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2680
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"Connessione persa col server:\n"
+"Connessione persa con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2705
+#, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
+"Impossibile stabilire una connessione con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3741
 msgid "Not at Home"
 msgstr "Non a casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3057
+#: ../libpurple/protocols/yahoo/yahoo.c:3744
 msgid "Not at Desk"
 msgstr "Non alla scrivania"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3747
 msgid "Not in Office"
 msgstr "Non in ufficio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3063
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
 msgid "On Vacation"
 msgstr "In vacanza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3067
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 msgid "Stepped Out"
 msgstr "A fare 2 passi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3160
+#: ../libpurple/protocols/yahoo/yahoo.c:3190
 msgid "Not on server list"
 msgstr "Non è nella lista del server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3207
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Appear Online"
-msgstr "Sembra in linea"
+msgstr "Appai come in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3210
+#: ../libpurple/protocols/yahoo/yahoo.c:3286
 msgid "Appear Permanently Offline"
-msgstr "Sembra permanentemente non in linea"
+msgstr "Appai permanentemente come non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Presence"
 msgstr "Presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3271
 msgid "Appear Offline"
 msgstr "Sembra non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3280
 msgid "Don't Appear Permanently Offline"
-msgstr "Sembra non in linea"
+msgstr "Non apparire permanentemente come non in linea"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Join in Chat"
 msgstr "Entra nella chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Initiate Conference"
 msgstr "Inizia una conferenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Presence Settings"
-msgstr "Utilizza le opzioni globali"
+msgstr "Impostazioni di presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3368
 msgid "Start Doodling"
 msgstr ""
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3469
+msgid "Activate which ID?"
 msgstr "Quale ID vuoi attivare?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3480
 msgid "Join who in chat?"
 msgstr "A chi vuoi unirti nella chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate ID..."
 msgstr "Attiva l'ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Join User in Chat..."
 msgstr "Unisciti ad un utente in chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
+msgid "Open Inbox"
+msgstr "Apri posta in arrivo"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4021
 msgid "You have just sent a Buzz!"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Elenca le stanze presenti sul network Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -11204,124 +11678,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4301
+#: ../libpurple/protocols/yahoo/yahoo.c:4303
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin per il protocollo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4326
 msgid "Yahoo Japan"
 msgstr "Yahoo Giappone"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4329
 msgid "Pager server"
 msgstr "Sever pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4332
 msgid "Japan Pager server"
 msgstr "Server pager (Giappone)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4335
 msgid "Pager port"
 msgstr "Porta Yahoo Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4338
 msgid "File transfer server"
 msgstr "Server per il trasferimento file"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4341
 msgid "Japan file transfer server"
 msgstr "Server per il trasferimento file (Giappone)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4344
 msgid "File transfer port"
 msgstr "Porta trasferimento file"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4347
 msgid "Chat room locale"
 msgstr "Lingua della chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4350
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignora gli inviti a conferenze e a chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
 msgid "Chat room list URL"
-msgstr "Url della lista delle chat room"
+msgstr "URL della lista delle chat room"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4361
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4364
 msgid "Yahoo Chat port"
 msgstr "Porta Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il seguente motivo \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:207
 msgid "Invitation Rejected"
 msgstr "Invito rifiutato"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:363
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:366
 msgid "Unknown room"
 msgstr "Stanza sconosciuta"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:369
 msgid "Maybe the room is full"
 msgstr "Forse la stanza è piena"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:372
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:376
 msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare cinque minuti prima di poter entrare nuovamente nella chat room"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:454
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Stai ora conversando in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Failed to join buddy in chat"
 msgstr "Impossibile unirsi al contatto in chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:630
 msgid "Maybe they're not in a chat?"
 msgstr "Forse non sono in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1321
+#: ../libpurple/protocols/yahoo/yahoochat.c:1347
 msgid "Fetching the room list failed."
 msgstr "Recupero della lista delle stanze fallito."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1405
 msgid "Voices"
 msgstr "Voci"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1408
 msgid "Webcams"
 msgstr "Webcam"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1419
+#: ../libpurple/protocols/yahoo/yahoochat.c:1489
 msgid "Unable to fetch room list."
 msgstr "Impossibile recuperare la lista delle stanze."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1482
 msgid "User Rooms"
 msgstr "Stanze utente"
 
@@ -11339,80 +11812,79 @@
 msgstr "Impossibile creare un descrittore di file."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Errore di scrittura"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profilo Yahoo! Giappone"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profilo Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "Spiacente, i profili contrassegnati come contenenti contenuti per soli adulti non sono attualmente supportati."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Se vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser"
+msgstr "Se vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Ultime notizie"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Link preferito 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Link preferito 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Link preferito 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informazioni sull'utente %s non disponibili"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "Spiacente, questo profilo sembra essere in un linguaggio non supportato al momento."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
 msgstr "Impossibile ricevere il profilo dell'utente. Molto probabilmente si tratta di un problema temporaneo sul server. Riprova più tardi."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
 msgstr "Impossibile ricevere il profilo dell'utente. Questo molto probabilmente vuol dire che l'utente non esiste. In ogni caso, Yahoo! a volte non riesce a trovare un profilo utente. Se sei certo che l'utente esista, riprova più tardi."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Il profilo dell'utente è vuoto."
 
@@ -11438,16 +11910,10 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossibile invare alla chat %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Utente"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>Nascosto o non connesso"
+msgstr "Nascosto o non connesso"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
 #: ../libpurple/protocols/zephyr/zephyr.c:1212
@@ -11669,12 +12135,11 @@
 msgstr "Accetti l'invito alla chat?"
 
 #: ../libpurple/status.c:152
-#, fuzzy
 msgid "Unset"
-msgstr "Unità"
+msgstr "Rimuovi"
 
 #: ../libpurple/status.c:155
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
@@ -11726,93 +12191,93 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2691
+#: ../libpurple/util.c:2702
 #, c-format
 msgid "Error Reading %s"
 msgstr "Errore nella lettura di %s"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2703
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati e il vecchio file è stato rinominato in %s~."
 
-#: ../libpurple/util.c:3192
+#: ../libpurple/util.c:3203
 msgid "Calculating..."
 msgstr "Calcolo in corso..."
 
-#: ../libpurple/util.c:3195
+#: ../libpurple/util.c:3206
 msgid "Unknown."
 msgstr "Sconosciuto."
 
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3232
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondo"
 msgstr[1] "%d secondi"
 
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3244
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
-#: ../libpurple/util.c:3241
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ora"
 msgstr[1] "%s, %d ore"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3258
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3266
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minuti"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: ../libpurple/util.c:3521
+#: ../libpurple/util.c:3532
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "Impossibile aprire %s: redirezionato troppe volte"
 
-#: ../libpurple/util.c:3558
-#: ../libpurple/util.c:3853
+#: ../libpurple/util.c:3569
+#: ../libpurple/util.c:3864
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#: ../libpurple/util.c:3681
+#: ../libpurple/util.c:3692
 #, c-format
 msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr ""
+msgstr "Impossibile allocare memoria sufficiente per i contenuti di %s. E' possibile che il server web stia tentando qualcosa di sospetto."
 
-#: ../libpurple/util.c:3716
+#: ../libpurple/util.c:3727
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Errore di lettura da %s: %s"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3758
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Errore di scrittura su %s: %s"
 
-#: ../libpurple/util.c:3772
+#: ../libpurple/util.c:3783
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossibile connettersi a %s: %s"
@@ -11838,72 +12303,72 @@
 msgstr "L'orientazione del vassoio."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opzioni di login"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tocollo:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "_Nome utente:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "Alias _locale:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "Ricorda la pass_word"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opzioni utente"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Notifica i nuovi messaggi di _posta"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizza per questo account la seguente _icona:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:732
 #, c-format
 msgid "%s Options"
 msgstr "Opzioni %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:937
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizza le opzioni del proxy di GNOME"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:938
 msgid "Use Global Proxy Settings"
 msgstr "Utilizza le opzioni globali del proxy"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:944
 msgid "No Proxy"
 msgstr "Nessun proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:950
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:956
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:962
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967
-#: ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:968
+#: ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Utilizza le opzioni globali"
 
@@ -11912,65 +12377,69 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1007
 msgid "If you look real closely"
 msgstr "Se guardi da vicino"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1010
 msgid "you can see the butterflies mating"
 msgstr "puoi vedere le farfalle accoppiarsi"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1031
 msgid "Proxy Options"
 msgstr "Opzioni del proxy"
 
-#: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1045
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "_Tipo di proxy:"
 
-#: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1054
+#: ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1058
+#: ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1066
 msgid "_Username:"
 msgstr "Nome _utente:"
 
-#: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1073
+#: ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1468
 msgid "Add Account"
 msgstr "Aggiungi un account"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1487
 msgid "_Basic"
 msgstr "Di _base"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1494
+msgid "Create this new account on the server"
+msgstr "Crea questo nuovo account sul server"
+
+#: ../pidgin/gtkaccount.c:1510
 msgid "_Advanced"
 msgstr "_Avanzate"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1968
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:1996
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2196
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11985,84 +12454,84 @@
 "\n"
 "Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un account, attraverso <b>Account->Aggiungi/Modifica</b> nella finestra della Lista contatti."
 
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr "Entra in chat"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:781
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795
-#: ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834
-#: ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:792
+#: ../pidgin/gtkblist.c:5480
+#: ../pidgin/gtkblist.c:5846
+#: ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1081
 #: ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr "_Sblocca"
 
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1138
+#: ../pidgin/gtkblist.c:1135
 #: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1141
 msgid "_Send File"
 msgstr "_Invia file"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
 msgstr "Aggiungi un _allarme"
 
-#: ../pidgin/gtkblist.c:1155
-#: ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1153
+#: ../pidgin/gtkblist.c:1157
 #: ../pidgin/gtkblist.c:1262
 #: ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-#: ../pidgin/gtkblist.c:1171
-#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1170
+#: ../pidgin/gtkblist.c:1179
 #: ../pidgin/gtkblist.c:1270
 #: ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1174
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1173
+#: ../pidgin/gtkblist.c:1181
 #: ../pidgin/gtkblist.c:1272
 #: ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "_Aggiungi un contatto"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "Aggiungi una c_hat"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr "_Elimina il gruppo"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Rinomina"
 
@@ -12079,150 +12548,150 @@
 msgstr "Entra automaticamente"
 
 #: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Minimizza"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr "M_assimizza"
 
-#: ../pidgin/gtkblist.c:1571
-#: ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561
-#: ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1572
+#: ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4574
+#: ../pidgin/gtkblist.c:4584
 msgid "/Tools/Mute Sounds"
 msgstr "/Strumenti/Nessun suono"
 
-#: ../pidgin/gtkblist.c:2043
-#: ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2044
+#: ../pidgin/gtkconv.c:4701
 #: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Non sei attualmente connesso a nessun protocollo che consenta di aggiungere un contatto."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2852
 msgid "/_Buddies"
 msgstr "/_Contatti"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contatti/Entra in _chat..."
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contatti/_Informazioni sul contatto..."
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/View User _Log..."
 msgstr "/Contatti/Mostra il log dell'utente..."
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contatti/Mostra i contatti non in linea"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contatti/Mostra i gruppi _vuoti"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Contatti/Mostra _dettagli sui contatti"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2861
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Contatti/Mostra _tempi di inattività"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contatti/_Ordina contatti"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contatti/_Aggiungi contatto..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2865
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contatti/Aggiungi c_hat..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/Add _Group..."
 msgstr "/Contatti/Aggiungi _gruppo..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/_Quit"
 msgstr "/Contatti/_Esci"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2871
 msgid "/_Accounts"
 msgstr "/_Account"
 
-#: ../pidgin/gtkblist.c:2858
-#: ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:6544
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Account/Aggiungi\\/Modifica"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2875
 msgid "/_Tools"
 msgstr "/_Strumenti"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Strumenti/A_llarmi"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Plu_gins"
 msgstr "/Strumenti/Plu_gin"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/Pr_eferences"
 msgstr "/Strumenti/Pr_eferenze"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2882
 msgid "/Tools/R_oom List"
 msgstr "/Strumenti/Lista delle _stanze"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/System _Log"
 msgstr "/Strumenti/_Log di sistema"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2885
 msgid "/Tools/Mute _Sounds"
 msgstr "/Strumenti/Nessun _suono"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Help"
 msgstr "/_Aiuto"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2888
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Aiuto online"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2889
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _debug"
 
-#: ../pidgin/gtkblist.c:2877
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2893
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2922
 #, c-format
 msgid ""
 "\n"
@@ -12231,80 +12700,80 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3000
 msgid "Buddy Alias"
 msgstr "Alias per il contatto"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3029
 msgid "Logged In"
 msgstr "Connesso"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3075
 msgid "Last Seen"
 msgstr "Visto l'ultima volta"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3095
 msgid "Spooky"
-msgstr ""
+msgstr "Spaventoso"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3097
 msgid "Awesome"
 msgstr "Magnifico"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3099
 msgid "Rockin'"
-msgstr ""
+msgstr "Ganzo"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inattivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inattivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3442
 #, c-format
 msgid "Idle %dm"
 msgstr "Inattivo %dm"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contatti/Nuovo messaggio immediato..."
 
-#: ../pidgin/gtkblist.c:3578
-#: ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3621
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contatti/Entra in chat..."
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3589
 msgid "/Buddies/Get User Info..."
 msgstr "/Contatti/Informazioni sul contatto..."
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contatti/Aggiungi contatto..."
 
-#: ../pidgin/gtkblist.c:3581
-#: ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3624
 msgid "/Buddies/Add Chat..."
 msgstr "/Contatti/Aggiungi chat..."
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3592
 msgid "/Buddies/Add Group..."
 msgstr "/Contatti/Aggiungi gruppo..."
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3627
 msgid "/Tools/Privacy"
 msgstr "/Strumenti/Privacy"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3630
 msgid "/Tools/Room List"
 msgstr "/Strumenti/Lista delle stanze"
 
-#: ../pidgin/gtkblist.c:3717
+#: ../pidgin/gtkblist.c:3727
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12312,55 +12781,55 @@
 msgstr[0] "%d messaggio non letto da %s\n"
 msgstr[1] "%d messaggi non letti da %s\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3807
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3809
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3810
 msgid "By status"
 msgstr "Per stato"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3811
 msgid "By log size"
 msgstr "Per dimensione del log"
 
-#: ../pidgin/gtkblist.c:4005
+#: ../pidgin/gtkblist.c:4016
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s si è disconnesso"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4026
 msgid "Re-enable Account"
 msgstr "Riabilita l'account"
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4052
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s disconnesso: %s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4204
 msgid "<b>Username:</b>"
 msgstr "<b>Nome utente:</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4211
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4222
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4305
 msgid "/Accounts"
 msgstr "/Account"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4319
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12374,82 +12843,82 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
+#: ../pidgin/gtkblist.c:4568
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contatti/Mostra i contatti non in linea"
 
-#: ../pidgin/gtkblist.c:4558
+#: ../pidgin/gtkblist.c:4571
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contatti/Mostra i gruppi vuoti"
 
-#: ../pidgin/gtkblist.c:4564
+#: ../pidgin/gtkblist.c:4577
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Contatti/Mostra dettagli sui contatti"
 
-#: ../pidgin/gtkblist.c:4567
+#: ../pidgin/gtkblist.c:4580
 msgid "/Buddies/Show Idle Times"
 msgstr "/Contatti/Mostra tempi di inattività"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:5457
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Inserisci il nome utente della persona che vuoi aggiungere alla tua lista contatti. Puoi aggiungere opzionalmente un alias, o nickname, per il contatto. Gli alias verranno mostrati al posto del nome utente, laddove è possibile.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5492
 msgid "_Screen name:"
 msgstr "Nome _utente:"
 
-#: ../pidgin/gtkblist.c:5501
-#: ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5514
+#: ../pidgin/gtkblist.c:5867
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5779
 msgid "This protocol does not support chat rooms."
 msgstr "Questo protocollo non supporta le chat room."
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5795
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Non sei attualmente connesso a nessun protocollo che consenta una chat."
 
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5836
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Inserisci un alias e le informazioni appropriate per la chat che vuoi aggiungere alla tua lista contatti.\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5924
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
 
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6564
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Account/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6588
 msgid "_Edit Account"
 msgstr "_Modifica account"
 
-#: ../pidgin/gtkblist.c:6589
-#: ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6601
+#: ../pidgin/gtkconv.c:3007
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
 
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6609
 msgid "_Disable"
 msgstr "_Disabilita"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6621
 msgid "Enable Account"
 msgstr "Abilita account"
 
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6627
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Account/Abilita account"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6676
 msgid "/Tools"
 msgstr "/Strumenti"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6746
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contatti/Ordina contatti"
 
@@ -12464,226 +12933,225 @@
 "\n"
 "%s non proverà a riconnettere l'account finché l'errore non sarà corretto dall'utente e l'account riabilitato."
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:458
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: ../pidgin/gtkconv.c:757
-#: ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:730
+#: ../pidgin/gtkconv.c:756
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Il contatto appartiene a un protocollo diverso da quello di questa chat"
 
-#: ../pidgin/gtkconv.c:777
+#: ../pidgin/gtkconv.c:750
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Non sei attualmente connesso a nessun protocollo che consenta di invitare il contatto."
 
-#: ../pidgin/gtkconv.c:830
+#: ../pidgin/gtkconv.c:803
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invita un contatto nella chat room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:833
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di invito (opzionale)."
 
-#: ../pidgin/gtkconv.c:881
+#: ../pidgin/gtkconv.c:854
 msgid "_Buddy:"
 msgstr "_Contatto:"
 
-#: ../pidgin/gtkconv.c:901
+#: ../pidgin/gtkconv.c:874
 #: ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Messaggio:"
 
-#: ../pidgin/gtkconv.c:958
-#: ../pidgin/gtkconv.c:2506
+#: ../pidgin/gtkconv.c:931
+#: ../pidgin/gtkconv.c:2514
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossibile aprire il file."
 
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:937
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversazioni con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:973
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: ../pidgin/gtkconv.c:1149
+#: ../pidgin/gtkconv.c:1122
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Trova"
 
-#: ../pidgin/gtkconv.c:1175
+#: ../pidgin/gtkconv.c:1148
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../pidgin/gtkconv.c:1331
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Log avviato. Sarà effettuato il log dei nuovi messaggi di questa conversazione."
 
-#: ../pidgin/gtkconv.c:1366
+#: ../pidgin/gtkconv.c:1339
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Log fermato. Non sarà effettuato il log dei nuovi messaggi di questa conversazione."
 
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1587
 msgid "Un-Ignore"
 msgstr "Annulla ignora"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1590
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../pidgin/gtkconv.c:1637
-#, fuzzy
+#: ../pidgin/gtkconv.c:1610
 msgid "Get Away Message"
-msgstr "Nuovo messaggio di assenza"
+msgstr "Ottieni messaggio di assenza"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1633
 #, fuzzy
 msgid "Last said"
 msgstr "Cognome:"
 
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2522
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2573
 msgid "Save Icon"
 msgstr "Salva l'icona"
 
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2625
 msgid "Animate"
 msgstr "Anima"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2630
 msgid "Hide Icon"
 msgstr "Nascondi l'icona"
 
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2633
 msgid "Save Icon As..."
 msgstr "Salva l'icona con nome..."
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2637
 msgid "Set Custom Icon..."
 msgstr "Imposta un'icona personalizzata..."
 
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2650
 msgid "Remove Custom Icon"
 msgstr "Rimuovi l'icona personalizzata"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2792
 msgid "/_Conversation"
 msgstr "/_Conversazione"
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2799
 msgid "/Conversation/_Find..."
 msgstr "/Conversazione/_Trova..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/View _Log"
 msgstr "/Conversazione/Mostra il _log"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2802
 msgid "/Conversation/_Save As..."
 msgstr "/Conversazione/_Salva con nome..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Rimuovi lo _storico"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _allarme..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/_Get Info"
 msgstr "/Conversazione/_Info"
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/In_vite..."
 msgstr "/Conversazione/In_vita..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/M_ore"
 msgstr "/Conversazione/_Altro"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversazione/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/_Block..."
 msgstr "/Conversazione/_Blocca..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversazione/_Sblocca..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/_Add..."
 msgstr "/Conversazione/_Aggiungi..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Remove..."
 msgstr "/Conversazione/_Rimuovi..."
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversazione/Inserisci un _collegamento..."
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2834
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversazione/Inserisci un'imma_gine..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2840
 msgid "/Conversation/_Close"
 msgstr "/Conversazione/_Chiudi"
 
 #. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2844
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2845
 msgid "/Options/Enable _Logging"
 msgstr "/Opzioni/Abilita il _log"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2846
 msgid "/Options/Enable _Sounds"
 msgstr "/Opzioni/Abilita i _suoni"
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2847
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opzioni/Mostra l'_icona del contatto"
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2849
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opzioni/Mostra la _barra di formattazione"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2850
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opzioni/Mostra i ti_mestamp"
 
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:2995
 msgid "/Conversation/More"
 msgstr "/Conversazione/Altro"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3051
 msgid "/Options"
 msgstr "/Opzioni"
 
@@ -12692,183 +13160,184 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3061
-#: ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3086
+#: ../pidgin/gtkconv.c:3118
 msgid "/Conversation"
 msgstr "/Conversazione"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3126
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3132
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3136
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un allarme..."
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3142
 msgid "/Conversation/Get Info"
 msgstr "/Conversazione/Info"
 
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3146
 msgid "/Conversation/Invite..."
 msgstr "/Conversazione/Invita..."
 
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3152
 msgid "/Conversation/Alias..."
 msgstr "/Conversazione/Alias..."
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3156
 msgid "/Conversation/Block..."
 msgstr "/Conversazione/Blocca..."
 
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3160
 msgid "/Conversation/Unblock..."
 msgstr "/Conversazione/Sblocca..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation/Add..."
 msgstr "/Conversazione/Aggiungi..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3168
 msgid "/Conversation/Remove..."
 msgstr "/Conversazione/Rimuovi..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3174
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversazione/Inserisci un link..."
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversazione/Inserisci un'immagine..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3184
 msgid "/Options/Enable Logging"
 msgstr "/Opzioni/Abilita il log"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options/Enable Sounds"
 msgstr "/Opzioni/Abilita i suoni"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3200
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opzioni/Mostra la barra di formattazione"
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3203
 msgid "/Options/Show Timestamps"
 msgstr "/Opzioni/Mostra i timestamp"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3206
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opzioni/Mostra l'icona del contatto"
 
-#: ../pidgin/gtkconv.c:3265
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3290
+#: ../pidgin/gtkconv.c:3332
 msgid "User is typing..."
 msgstr "L'utente sta scrivendo..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3335
 msgid "User has typed something and stopped"
 msgstr "L'utente ha scritto qualcosa ed ora è in pausa"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3518
+#: ../pidgin/gtkconv.c:7782
 msgid "_Send To"
 msgstr "_Invia a"
 
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4231
 msgid "_Send"
 msgstr "_Invia"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4335
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
-#: ../pidgin/gtkconv.c:5496
-#: ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5603
+#: ../pidgin/gtkconv.c:5724
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona nella stanza"
 msgstr[1] "%d persone nella stanza"
 
-#: ../pidgin/gtkconv.c:6216
+#: ../pidgin/gtkconv.c:6327
 #: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Sta scrivendo"
 
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6331
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6334
 #, fuzzy
 msgid "Nick Said"
 msgstr "Nickname"
 
-#: ../pidgin/gtkconv.c:6232
+#: ../pidgin/gtkconv.c:6337
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6340
 msgid "New Event"
 msgstr "Nuovo evento"
 
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7332
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: rimuove lo storico di tutte le conversazioni."
 
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7496
 msgid "Confirm close"
 msgstr "Conferma chiusura"
 
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7528
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Hai dei messaggi non letti. Sei sicuro di voler chiudere la finestra?"
 
-#: ../pidgin/gtkconv.c:7978
+#: ../pidgin/gtkconv.c:8114
 msgid "Close other tabs"
 msgstr "Chiudi le altre schede"
 
-#: ../pidgin/gtkconv.c:7984
+#: ../pidgin/gtkconv.c:8120
 msgid "Close all tabs"
 msgstr "Chiudi tutte le schede"
 
-#: ../pidgin/gtkconv.c:7992
+#: ../pidgin/gtkconv.c:8128
 msgid "Detach this tab"
 msgstr "Stacca questa scheda"
 
-#: ../pidgin/gtkconv.c:7998
+#: ../pidgin/gtkconv.c:8134
 msgid "Close this tab"
 msgstr "Chiudi questa scheda"
 
-#: ../pidgin/gtkconv.c:8444
+#: ../pidgin/gtkconv.c:8632
 msgid "Close conversation"
 msgstr "Chiudi la conversazione"
 
-#: ../pidgin/gtkconv.c:8968
+#: ../pidgin/gtkconv.c:9232
 msgid "Last created window"
 msgstr "Ultima finestra creata"
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:9234
 msgid "Separate IM and Chat windows"
 msgstr "Separa le finestre dei MI e delle chat"
 
-#: ../pidgin/gtkconv.c:8972
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9236
+#: ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Nuova finestra"
 
-#: ../pidgin/gtkconv.c:8974
+#: ../pidgin/gtkconv.c:9238
 msgid "By group"
 msgstr "Per gruppo"
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:9240
 msgid "By account"
 msgstr "Per account"
 
@@ -12934,7 +13403,7 @@
 msgstr "Errore fatale"
 
 #: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr "sviluppatore principale"
 
@@ -12943,6 +13412,7 @@
 #: ../pidgin/gtkdialogs.c:74
 #: ../pidgin/gtkdialogs.c:75
 #: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
 #: ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79
 #: ../pidgin/gtkdialogs.c:80
@@ -12952,529 +13422,522 @@
 #: ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85
 #: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
 #: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "sviluppatore"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "sviluppatore e webmaster"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "supporto"
 
 #: ../pidgin/gtkdialogs.c:87
-#, fuzzy
 msgid "support/QA"
-msgstr "supporto"
+msgstr "supporto/QA"
+
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:108
+msgid "developer & webmaster"
+msgstr "sviluppatore e webmaster"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr "port su win32"
 
-#: ../pidgin/gtkdialogs.c:110
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:105
+#: ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
 msgstr "Maintainer della libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e autista designato [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:111
 msgid "XMPP developer"
-msgstr "sviluppatore"
+msgstr "sviluppatore XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr "autore originale"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr "Arabo"
 
-#: ../pidgin/gtkdialogs.c:125
-#: ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../pidgin/gtkdialogs.c:127
-#: ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129
-#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr "Bosniaco"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr "Catalano"
 
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalano"
 
-#: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr "Danese"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
 msgid "German"
 msgstr "Tedesco"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
-msgstr ""
+msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr "Greco"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
 msgstr "Inglese Australiano"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
 msgstr "Inglese Canadese"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:152
 msgid "British English"
 msgstr "Inglese Britannico"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
+msgid "Estonian"
+msgstr "Estone"
+
+#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Euskera(Basque)"
-msgstr ""
+msgstr "Euskera (Basco)"
 
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Persian"
 msgstr "Persiano"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: ../pidgin/gtkdialogs.c:156
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "French"
 msgstr "Francese"
 
-#: ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:158
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:233
 msgid "Galician"
-msgstr "Italiano"
+msgstr "Galiziano"
 
-#: ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Team per la lingua Gujarati"
 
-#: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:234
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:168
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:169
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:170
 msgid "Indonesian"
 msgstr "Indonesiano"
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:235
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:239
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: ../pidgin/gtkdialogs.c:167
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:173
 msgid "Ubuntu Georgian Translators"
-msgstr "Traduttori attuali"
+msgstr "Traduttori georgiani di Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:168
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada"
-msgstr "Cacciato"
+msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:174
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Team dei traduttori Kannada"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:244
 msgid "Macedonian"
 msgstr "Macedone"
 
-#: ../pidgin/gtkdialogs.c:176
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:245
 msgid "Bokmål Norwegian"
-msgstr "Norvegese"
+msgstr "Norvegese Bokmål"
 
-#: ../pidgin/gtkdialogs.c:177
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:183
 msgid "Nepali"
-msgstr "Bengali"
+msgstr "Nepalese"
 
-#: ../pidgin/gtkdialogs.c:178
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:184
 msgid "Dutch, Flemish"
-msgstr "Olandese; Fiammingo"
-
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "Norvegese"
+msgstr "Olandese, Fiammingo"
 
-#: ../pidgin/gtkdialogs.c:180
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:185
 msgid "Norwegian Nynorsk"
-msgstr "Norvegese"
+msgstr "Norvegese Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:246
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
 msgstr "Portoghese-Brasile"
 
-#: ../pidgin/gtkdialogs.c:186
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
-msgstr "Foto"
+msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
 msgstr "Rumeno"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:252
 msgid "Slovenian"
 msgstr "Sloveno"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:197
 msgid "Albanian"
 msgstr "Albanese"
 
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../pidgin/gtkdialogs.c:196
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:201
 msgid "Tamil"
-msgstr "Terminale"
+msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:202
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:198
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:203
 msgid "Thai"
-msgstr "Terminale"
+msgstr "Thailandese"
 
-#: ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:255
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:205
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:205
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e il Team Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:256
 msgid "Simplified Chinese"
 msgstr "Cinese semplificato"
 
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
 msgid "Hong Kong Chinese"
 msgstr "Cinese di Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:257
 msgid "Traditional Chinese"
 msgstr "Cinese tradizionale"
 
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
 msgstr "Amarico"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:342
 #, c-format
 msgid "About %s"
 msgstr "Informazioni su %s"
 
-#: ../pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:380
 #, c-format
 msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "%s è un client grafico modulare di messaggistica in grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu e QQ. È scritto utilizzando GTK+.<BR><BR>È possibile modificare e ridistribuire il programma nei termini della licenza GPL (versione 2 o successiva).  Una copia della GPL è contenuta nel file 'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il programma è fornito senza nessuna garanzia.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:395
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim su irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:400
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
 
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:415
 msgid "Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:430
 msgid "Retired Developers"
 msgstr "Sviluppatori ritirati"
 
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:445
+msgid "Retired Crazy Patch Writers"
+msgstr "I pazzi scrittori di patch in pensione"
+
+#: ../pidgin/gtkdialogs.c:460
 msgid "Artists"
 msgstr "Artisti"
 
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:475
 msgid "Current Translators"
 msgstr "Traduttori attuali"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:495
 msgid "Past Translators"
 msgstr "Traduttori precedenti"
 
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:513
 msgid "Debugging Information"
 msgstr "Informazioni di debug"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:882
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:884
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Inserisci il nome utente o l'alias della persona della quale vuoi informazioni."
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:974
 msgid "View User Log"
 msgstr "Mostra il log dell'utente"
 
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:976
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Inserisci il nome utente o l'alias della persona della quale vuoi vedere il log."
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Contact"
 msgstr "Imposta un alias per la lista"
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:997
 msgid "Enter an alias for this contact."
 msgstr "Inserisci un alias per questa lista."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1019
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Inserisci un alias per %s."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Alias Buddy"
 msgstr "Imposta un alias per il contatto"
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1042
 msgid "Alias Chat"
 msgstr "Imposta un alias per la chat"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1043
 msgid "Enter an alias for this chat."
 msgstr "Inserisci un alias per questa chat."
 
-#: ../pidgin/gtkdialogs.c:1059
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:1082
+#, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
 msgstr[0] "Stai per rimuovere la lista contenente %s e %d altro contatto dalla tua lista contatti. Vuoi continuare?"
 msgstr[1] "Stai per rimuovere la lista contenente %s e altri %d contatti dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1090
 msgid "Remove Contact"
 msgstr "Rimuovi lista"
 
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1093
 msgid "_Remove Contact"
 msgstr "_Rimuovi contatto"
 
-#: ../pidgin/gtkdialogs.c:1101
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:1124
+#, c-format
 msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista contatti. Vuoi continuare?"
+msgstr "Stai per unire il gruppo chiamato %s con il gruppo chiamato %s. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1108
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:1131
 msgid "Merge Groups"
-msgstr "Rinomina il gruppo"
+msgstr "Unisci gruppi"
 
-#: ../pidgin/gtkdialogs.c:1111
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:1134
 msgid "_Merge Groups"
-msgstr "_Rimuovi gruppo"
+msgstr "_Unisci gruppi"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1184
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1187
 msgid "Remove Group"
 msgstr "Rimuovi il gruppo"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1190
 msgid "_Remove Group"
 msgstr "_Rimuovi gruppo"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1223
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere %s dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1226
 msgid "Remove Buddy"
 msgstr "Rimuovi il contatto"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1229
 msgid "_Remove Buddy"
 msgstr "_Rimuovi il contatto"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1250
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1253
 msgid "Remove Chat"
 msgstr "Rimuovi la chat"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1256
 msgid "_Remove Chat"
 msgstr "_Rimuovi chat"
 
@@ -13593,45 +14056,45 @@
 msgid "_Resume"
 msgstr "_Riprendi"
 
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo semplice"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr "_Rimuovi la formattazione"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Colore dei collegamenti"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Colore per disegnare i collegamenti."
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
 #, fuzzy
 msgid "Hyperlink prelight color"
 msgstr "Colore dei collegamenti"
 
-#: ../pidgin/gtkimhtml.c:1354
-#, fuzzy
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Colore per disegnare i collegamenti."
+msgstr "Colore per i collegamenti al passaggio del mouse."
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'indirizzo e-mail"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13641,7 +14104,7 @@
 "\n"
 "Verrà utilizzato il formato predefinito PNG."
 
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13651,7 +14114,7 @@
 "\n"
 "Verrà utilizzato il formato predefinito PNG."
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13662,7 +14125,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13673,12 +14136,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454
-#: ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Salva l'immagine..."
 
@@ -13715,7 +14178,7 @@
 msgstr "Inserisci un collegamento"
 
 #: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
 msgstr "_Inserisci"
 
@@ -13738,76 +14201,76 @@
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "_Grassetto"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "_Corsivo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "_Sottolineato"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "Più _grande"
+#: ../pidgin/gtkimhtmltoolbar.c:820
+#: ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "_Font"
+msgstr "_Carattere"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1124
+msgid "<b>_Bold</b>"
+msgstr "<b>_Grassetto</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1125
+msgid "<i>_Italic</i>"
+msgstr "<i>_Corsivo</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1126
+msgid "<u>_Underline</u>"
+msgstr "<u>_Sottolineato</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1127
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Più grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
 msgstr "_Normale"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "Più _piccolo"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1131
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>Più _piccolo</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Font face"
 msgstr "_Tipo di carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
+#: ../pidgin/gtkimhtmltoolbar.c:1136
+msgid "Foreground _color"
 msgstr "_Colore del carattere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1137
+msgid "Bac_kground color"
 msgstr "Colore dello _sfondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
-msgstr "_Carattere"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "_Rimuovi la formattazione"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
 msgstr "_Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
 msgstr "_Immagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
 msgstr "_Link"
 
 #: ../pidgin/gtklog.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgstr "Sei sicuro di voler eliminare permanentemente il log della conversazione con %s iniziata il %s?"
 
 #: ../pidgin/gtklog.c:303
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgstr "Sei sicuro di voler eliminare permanentemente il log della conversazione in %s iniziata il %s?"
 
 #: ../pidgin/gtklog.c:308
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to permanently delete the system log which started at %s?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgstr "Sei sicuro di voler eliminare permanentemente il log iniziato il %s?"
 
 #: ../pidgin/gtklog.c:452
 #, c-format
@@ -13863,12 +14326,12 @@
 msgid "System Log"
 msgstr "Log di sistema"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13894,7 +14357,7 @@
 "                      specifica gli account da usare, separati da virgole)\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13934,52 +14397,52 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697
+#: ../pidgin/gtkmain.c:699
 #: ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Apri tutti i messaggi"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ha %d nuovo messaggio"
 msgstr[1] "%s ha %d nuovi messaggi"
 
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Hai %d nuovo messaggio di posta.</b>"
 msgstr[1] "<b>Hai %d nuovi messaggi di posta.</b>"
 
-#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Il comando per il browser \"%s\" non è valido."
 
-#: ../pidgin/gtknotify.c:967
-#: ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992
-#: ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:959
+#: ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984
+#: ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Impossibile aprire l'URL"
 
-#: ../pidgin/gtknotify.c:977
-#: ../pidgin/gtknotify.c:990
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Errore nell'esecuzione di \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "È stato scelto di impostare il browser manualmente, ma non è stato immesso nessun comando."
 
@@ -13992,9 +14455,8 @@
 msgstr "Saranno rimossi diversi plugin."
 
 #: ../pidgin/gtkplugin.c:287
-#, fuzzy
 msgid "Unload Plugins"
-msgstr "Plugin"
+msgstr "Rimuovi Plugin"
 
 #: ../pidgin/gtkplugin.c:399
 #, c-format
@@ -14014,6 +14476,9 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Errore: %s\n"
+"Verifica il sito web del plugin per un aggiornamento.</span>"
 
 #: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
@@ -14028,100 +14493,100 @@
 msgstr "Scegli un file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Contatto da controllare"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "Nome del _contatto:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Si _connette"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Si _disconnette"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "È _assente"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_Ritorna dall'assenza"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Diventa _inattivo"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Ritorna _attivo"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Inizia a _scrivere"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "In_terrompe la scrittura"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "_Smette di scrivere"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Invia un _messaggio"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "_Apri una finestra di conversazione"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Notifica con un popup"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Invia un _messaggio"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "_Esegui un comando"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "_Riproduci un suono"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Sfoglia..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Sfoglia..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "_Anteprima"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Genera _allarmi solo quando il mio stato è \"non disponibile\""
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Ricorrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Contatto da controllare"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Predefinito"
 
@@ -14149,15 +14614,6 @@
 msgid "_Show system tray icon:"
 msgstr "_Mostra l'icona di notifica:"
 
-#: ../pidgin/gtkprefs.c:896
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Sempre"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
@@ -14171,7 +14627,7 @@
 msgstr "_Nascondi le nuove conversazioni:"
 
 #: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "Se assente"
 
@@ -14225,8 +14681,8 @@
 msgstr "Mostra la _formattazione per i messaggi in entrata"
 
 #: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "Mostra le _icone dei contatti"
+msgid "Show _detailed information"
+msgstr "Mostra informazioni _dettagliate"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14272,123 +14728,123 @@
 msgid "Default Formatting"
 msgstr "Formattazione predefinita"
 
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1059
 msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
 msgstr "Così appariranno i tuoi messaggi in uscita quando usi un protocollo che supporta la formattazione."
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "Rileva _automaticamente l'indirizzo IP"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Porte"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
 msgstr "Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
 msgstr "_Prima porta:"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
 msgstr "_Ultima porta:"
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Nessun proxy"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "_Utente:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1326
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "GNOME Default"
 msgstr "Predefinito di Gnome"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Manuale"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Scelta del browser"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "_Apertura dei collegamenti:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Impostazione predefinita del browser"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Finestra esistente"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Nuova scheda"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14397,81 +14853,63 @@
 "Scelta _manuale:\n"
 "(%s per inserire un URL)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "_Formato del log:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
 msgstr "Esegui il _log di tutti i messaggi immediati"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all c_hats"
 msgstr "Esegui il log di tutte le c_hat"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all _status changes to system log"
 msgstr "Registra nel log di sistema tutti i cambiamenti di _stato"
 
-#: ../pidgin/gtkprefs.c:1582
-#: ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(predefinito)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr "Scegli un suono"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "Bassissimo"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Più basso"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Basso"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Louder"
 msgstr "Più alto"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "Altissimo"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Metodo del suono"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr "Bip di console"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Automatico"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Comando"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Nessun suono"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14480,117 +14918,81 @@
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Opzioni suono"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Enable sounds:"
 msgstr "Abilita i suoni:"
 
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Solo quando sei disponibile"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Solo quando non sei disponibile"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Eventi sonori"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Evento"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Test"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Pulisci"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Scegli..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "Mostra i _tempi di inattività:"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Sulla base dell'utilizzo della tastiera o del mouse"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "Risposta _automatica:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "Se assente e inattivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Assente automatico"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
 msgstr "Modifica lo stato quando sei _inattivo"
 
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
-msgstr "_Minuti prima di modificare lo stato:"
+#: ../pidgin/gtkprefs.c:1952
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuti prima di diventare inattivo:"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Cambia lo _stato in:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "Stato all'avvio"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
 msgstr "Utilizza lo stato impostato l'ultima volta"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Stato da _utilizzare all'avvio:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Temi degli smiley"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Suoni"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Stato / Inattività"
 
@@ -14682,24 +15084,24 @@
 msgid "Apply"
 msgstr "Applica"
 
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Il file esiste già."
 
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Vuoi sovrascriverlo?"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Scegli un nuovo nome"
 
-#: ../pidgin/gtkrequest.c:1621
-#: ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1647
+#: ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Scegli cartella..."
 
@@ -14719,9 +15121,8 @@
 msgstr "_Aggiungi una chat"
 
 #: ../pidgin/gtksavedstatuses.c:336
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgstr "Sei sicuro di voler eliminare gli stati salvati selezionati?"
 
 #. Use button
 #: ../pidgin/gtksavedstatuses.c:619
@@ -14742,7 +15143,7 @@
 msgstr "_Titolo:"
 
 #: ../pidgin/gtksavedstatuses.c:1177
-#: ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Stato:"
 
@@ -14756,123 +15157,74 @@
 msgid "Sa_ve & Use"
 msgstr "Sa_lva e utilizza"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Stato per %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Il contatto è connesso"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Il contatto è disconnesso"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Messaggio ricevuto"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Il messaggio ricevuto inizia la conversazione"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Messaggio inviato"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Una persona entra in chat"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Una persona abbandona la chat"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Stai parlando in chat"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Qualcun altro parla in chat"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Qualcuno pronuncia il tuo nome in chat"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "Errore di GStreamer"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "Impossibile inizializzare GStreamer."
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "In attesa della connessione di rete"
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384
-#: ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398
+#: ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Si è verificato il seguente errore nel caricamento di %s: %s"
 
-#: ../pidgin/gtkutils.c:1387
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossibile inviare la cartella %s."
 
-#: ../pidgin/gtkutils.c:1484
-#, fuzzy, c-format
+#: ../pidgin/gtkutils.c:1498
+#, c-format
 msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr "Gaim non può trasferire una cartella. Devi inviare individualmente i file contenuti"
+msgstr "%s non può trasferire una cartella. Devi inviare individualmente i file contenuti."
 
-#: ../pidgin/gtkutils.c:1516
-#: ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Hai trascinato un'immagine"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "Puoi inviare questa immagine come file, inserirla nel messaggio o utilizzarla come icona per questo contatto."
 
-#: ../pidgin/gtkutils.c:1523
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Imposta come icona per il contatto"
 
-#: ../pidgin/gtkutils.c:1524
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538
+#: ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Invia il file dell'immagine"
 
-#: ../pidgin/gtkutils.c:1525
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Inserisci nel messaggio"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vuoi utilizzarla come icona per questo contatto?"
 
-#: ../pidgin/gtkutils.c:1536
-#, fuzzy
+#: ../pidgin/gtkutils.c:1550
 msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
-msgstr "Puoi inviare questa immagine come file, inserirla nel messaggio o utilizzarla come icona per questo contatto."
+msgstr "Puoi inviare questa immagine come file, o utilizzarla come icona per questo contatto."
 
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "Puoi inserire questa immagine nel messaggio o utilizzarla come icona per questo contatto."
 
@@ -14881,15 +15233,15 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Hai trascinato un'icona di avvio. Molto probabilmente vuoi inviare ciò cui l'icona si riferisce piuttosto che l'icona stessa."
 
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14900,25 +15252,25 @@
 "<b>Dimensione del file:</b> %s\n"
 "<b>Dimensione dell'immagine:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Il file '%s' è troppo grande per %s. Riprova con un'immagine più piccola.\n"
 
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Errore icona"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Impossibile impostare l'icona"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Impossibile aprire il file '%s': %s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "Impossibile caricare l'immagine '%s' per un motivo sconosciuto. Probabilmente il file dell'immagine è danneggiato."
@@ -14956,7 +15308,7 @@
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Smiley di Pidgin"
 
@@ -14972,40 +15324,40 @@
 msgid "none"
 msgstr "nessuno"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Mostra le statistiche"
 
-#: ../pidgin/plugins/cap/cap.c:461
-#: ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462
+#: ../pidgin/plugins/cap/cap.c:465
 #, fuzzy
 msgid "Response Probability:"
 msgstr "Risposte perse"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 #, fuzzy
 msgid "Statistics Configuration"
 msgstr "Configurazione dei gesti del mouse"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
-msgstr ""
+msgstr "Timeout massimo per la risposta:"
 
-#: ../pidgin/plugins/cap/cap.c:816
-#: ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:817
+#: ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831
 #: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuti"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "Differenza massima per \"visto l'ultima volta\":"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Soglia:"
 
@@ -15015,20 +15367,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Predizione della disponibilità del contatto"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Plugin per la predizione della disponibilità del contatto."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
-msgstr ""
+msgstr "Il plugin per la predizione della disponibilità del contatto (cap) è utilizzato per mostrare delle informazioni statistiche sui contatti presenti nella lista dell'utente."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -15285,34 +15637,34 @@
 msgid "_Associate Buddy"
 msgstr "_Associa il contatto"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "Impossibile inviare l'email"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "L'eseguibile di evolution non è stato trovato nel PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Non è stato trovato nessun indirizzo email per questo contatto."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Aggiungi alla rubrica"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Invia email"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Configurazione dell'integrazione con Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Seleziona tutti gli account ai quali i contatti dovrebbero essere aggiunti automaticamente."
 
@@ -15322,7 +15674,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrazione con Evolution"
 
@@ -15330,8 +15682,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Fornisce l'integrazione con Evolution."
 
@@ -15364,6 +15716,15 @@
 msgid "E-mail:"
 msgstr "Email:"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Note per il contatto</b>: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15449,32 +15810,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Sessione di messaggi musicali confermata."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Messaggi musicali"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Si è verificato un conflitto nell'esecuzione del comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Errore nell'esecuzione dell'editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Si è verificato il seguente errore:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Configurazione dei messaggi musicali"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Percorso dell'editor di partiture"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Applica"
 
@@ -15486,12 +15847,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Messaggi musicali, per la composizione collaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
 msgstr "Il plugin per i messaggi musicali consente ad un gruppo di utenti di lavorare simultaneamente su di un brano musicale modificando in tempo reale una partitura comune."
 
@@ -15740,9 +16101,9 @@
 msgstr "Permette di inviare input raw ai protocolli text-based (XMPP, MSN, IRC, TOC). Premi 'Invio' nella casella di immissione per inviare il testo. Controlla la finestra di debug."
 
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
-msgstr "Stai utilizzando Gaim, versione %s. La versione corrente è la %s.<hr>"
+msgstr "Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi scaricarla da <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
@@ -15943,43 +16304,43 @@
 msgstr "Questo plugin consente di personalizzare i formati dei timestamp per i messaggi nelle conversazioni e nei log."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Opacità:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Finestre dei messaggi istantanei"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_Rendi trasparente la finestra"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra di scorrimento nella finestra "
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "Rimuovi la trasparenza della finestra dei MI quando va in primo piano"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Sempre in primo piano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Finestra della lista contatti"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "Rendi _trasparente la finestra della lista contatti"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Rimuovi la trasparenza della lista contatti quando va in primo piano"
 
@@ -15989,19 +16350,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Trasparenza"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Trasparenza variabile per la lista contatti e le finestre di conversazione."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
@@ -16011,53 +16372,53 @@
 "\n"
 "* Nota: Questo plugin richiede Windows 2000 o maggiore."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Versione di GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Avvio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Lancia %s all'avvio di Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Lista contatti _agganciabile"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Mantieni la finestra della lista contatti in _primo piano:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Illumina la finestra quando arriva un messaggio di chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Opzioni di Pidgin per Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Fornisce opzioni specifiche per Pidgin per Windows, come la lista contatti agganciabile."
 
 #: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Disconnesso.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -16077,20 +16438,19 @@
 
 #: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>Non connesso a XMPP</font>"
 
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
-msgstr ""
+msgstr "Inserisci una stanza <iq/>."
 
 #: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
-msgstr ""
+msgstr "Inserisci una stanza <presence/>."
 
 #: ../pidgin/plugins/xmppconsole.c:808
-#, fuzzy
 msgid "Insert a <message/> stanza."
-msgstr "Inserisci nel messaggio"
+msgstr "Inserisci una stanza <message/>"
 
 #. *< name
 #. *< version
@@ -16102,4 +16462,4 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
diff -ru pidgin-2.1.1/po/ja.po pidgin-2.2.0/po/ja.po
--- pidgin-2.1.1/po/ja.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/ja.po	2007-09-14 00:45:43.000000000 -0400
@@ -11162,7 +11162,7 @@
 msgstr "どの ID を有効化しますか？"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "どのチャットへ参加しますか？"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3268
diff -ru pidgin-2.1.1/po/ka.po pidgin-2.2.0/po/ka.po
--- pidgin-2.1.1/po/ka.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/ka.po	2007-09-14 00:45:43.000000000 -0400
@@ -11603,7 +11603,7 @@
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3017
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3027
diff -ru pidgin-2.1.1/po/kn.po pidgin-2.2.0/po/kn.po
--- pidgin-2.1.1/po/kn.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/kn.po	2007-09-14 00:45:43.000000000 -0400
@@ -13709,7 +13709,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3174
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಯಾರೊಡನೆ ಸೇರಬೇಕು?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3184
diff -ru pidgin-2.1.1/po/ko.po pidgin-2.2.0/po/ko.po
--- pidgin-2.1.1/po/ko.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/ko.po	2007-09-14 00:45:43.000000000 -0400
@@ -14341,7 +14341,7 @@
 msgstr "어느 ID 를 활성화 하시겠습니까?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "어느 대화에 참가하시겠습니까?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/ku.po pidgin-2.2.0/po/ku.po
--- pidgin-2.1.1/po/ku.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/ku.po	2007-09-14 00:45:43.000000000 -0400
@@ -11671,7 +11671,7 @@
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3070
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3080
diff -ru pidgin-2.1.1/po/lt.po pidgin-2.2.0/po/lt.po
--- pidgin-2.1.1/po/lt.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/lt.po	2007-09-14 00:45:43.000000000 -0400
@@ -11555,7 +11555,7 @@
 msgstr "Kurį ID aktyvuoti?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Prisijungti prie ko į pokalbį?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/Makefile.in.in pidgin-2.2.0/po/Makefile.in.in
--- pidgin-2.1.1/po/Makefile.in.in	2007-08-20 14:13:20.000000000 -0400
+++ pidgin-2.2.0/po/Makefile.in.in	2007-08-27 22:39:11.000000000 -0400
@@ -133,7 +133,7 @@
 dvi info tags TAGS ID:
 
 # Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
 
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
diff -ru pidgin-2.1.1/po/mk.po pidgin-2.2.0/po/mk.po
--- pidgin-2.1.1/po/mk.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/mk.po	2007-09-14 00:45:43.000000000 -0400
@@ -1,4 +1,4 @@
-# translation of mk1.po to Macedonian
+# translation of mk.po to Macedonian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
@@ -8,10 +8,10 @@
 # Arangel Angov <arangel@linux.net.mk>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: mk1\n"
+"Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-08-13 03:22-0400\n"
-"PO-Revision-Date: 2007-08-13 10:26+0200\n"
+"PO-Revision-Date: 2007-09-09 21:21+0200\n"
 "Last-Translator: Arangel Angov <arangel@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
 "MIME-Version: 1.0\n"
@@ -434,7 +434,7 @@
 
 #: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
-msgstr "Добивам..."
+msgstr "Земам..."
 
 #: ../finch/gntblist.c:903 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
@@ -1717,7 +1717,7 @@
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Кога се отвора нов разговор, овој приклучок ќе го вметни последниот во "
+"Кога се отвора нов разговор, овој приклучок ќе го вметнe последниот во "
 "тековниот разговор."
 
 #: ../finch/plugins/lastlog.c:69
@@ -7076,7 +7076,7 @@
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Се поврзувате и исклучувате пречесто. Почекајте десет минути и обидете се "
-"повторно. Ако продолжите со обидите, ќе треба да чекате уште повеќе."
+"повторно. Ако продолжите со обидeте, ќе треба да чекате уште повеќе."
 
 #: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
@@ -11054,7 +11054,7 @@
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 "Се поврзувавте и се исклучувавте пречесто.  Почекајте десет минути и "
-"пробајте повторно.  Ако продолжете со обидите сега, ќе треба да чекате уште "
+"пробајте повторно.  Ако продолжете со обидeте сега, ќе треба да чекате уште "
 "подолго."
 
 #: ../libpurple/protocols/toc/toc.c:560
@@ -12221,7 +12221,7 @@
 "повторно за да ги конфигурирате сите.\n"
 "\n"
 "Можете да се вратите на овој прозорец за да додавете, уредувате или пак да "
-"отстранувате сметки преку избирање на<b>Смети->Додај/Уреди</b> од прозорецот "
+"отстранувате сметки преку избирање на <b>Сметки->Додај/Уреди</b> од прозорецот "
 "со листата на пријатели."
 
 #: ../pidgin/gtkblist.c:760
@@ -12593,7 +12593,7 @@
 msgstr ""
 "<span weight='bold' size='larger'>Добредојдовте во %s!</span>\n"
 "\n"
-"Немате вклучено сметки. Вклучете ги Вашите сметки преку прозорецот<b>Сметки</"
+"Немате вклучено сметки. Вклучете ги Вашите сметки преку прозорецот <b>Сметки</"
 "b> кој што се отвора преку <b>Сметки ->Додај/Уреди</b>. Откако ќе ги "
 "вклучите сметките ќе можете да се најавите, да го менувате Вашиот статус и "
 "да разговарате со Вашите пријатели."
diff -ru pidgin-2.1.1/po/my_MM.po pidgin-2.2.0/po/my_MM.po
--- pidgin-2.1.1/po/my_MM.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/my_MM.po	2007-09-14 00:45:43.000000000 -0400
@@ -10730,8 +10730,8 @@
 msgstr "Active which ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
-msgstr "Join who in chat?"
+msgid "Join whom in chat?"
+msgstr "Join whom in chat?"
 
 #: src/protocols/yahoo/yahoo.c:2982
 msgid "Activate ID..."
diff -ru pidgin-2.1.1/po/nb.po pidgin-2.2.0/po/nb.po
--- pidgin-2.1.1/po/nb.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/nb.po	2007-09-14 00:45:43.000000000 -0400
@@ -10857,7 +10857,7 @@
 msgstr "Aktiver hvilken ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/ne.po pidgin-2.2.0/po/ne.po
--- pidgin-2.1.1/po/ne.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/ne.po	2007-09-14 00:45:43.000000000 -0400
@@ -10498,7 +10498,7 @@
 msgstr "कुन ID सक्रिय गर्ने?"
 
 #: src/protocols/yahoo/yahoo.c:3028
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "जडान गर्नुहोस् को कुराकानीमा छ?"
 
 #: src/protocols/yahoo/yahoo.c:3038
diff -ru pidgin-2.1.1/po/nl.po pidgin-2.2.0/po/nl.po
--- pidgin-2.1.1/po/nl.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/nl.po	2007-09-14 00:45:43.000000000 -0400
@@ -13683,7 +13683,7 @@
 msgstr "Welk ID activeren?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3158
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3168
diff -ru pidgin-2.1.1/po/nn.po pidgin-2.2.0/po/nn.po
--- pidgin-2.1.1/po/nn.po	2007-08-20 14:13:04.000000000 -0400
+++ pidgin-2.2.0/po/nn.po	2007-09-14 00:45:43.000000000 -0400
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-08-14 00:28+0100\n"
+"PO-Revision-Date: 2007-09-06 23:00+0100\n"
 "Last-Translator: Y S Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@
 #: ../finch/finch.c:64
 #: ../finch/finch.c:300
 #: ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -52,18 +52,21 @@
 msgstr "%s opplevde feil under migreringa av innstillingane dine frå %s til %s. Undersøk nærare og sluttfør migreringa for hand. Rapporter denne feilen til http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:123
-#: ../finch/gntaccount.c:478
+#: ../finch/gntaccount.c:483
 #: ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432
 #: ../finch/gntblist.c:445
 #: ../finch/gntplugin.c:185
 #: ../finch/gntplugin.c:233
 #: ../finch/gntstatus.c:300
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576
 #: ../libpurple/protocols/silc/ops.c:57
@@ -80,74 +83,74 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Brukarnamnet til ein konto kan ikkje vera tomt."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Hugs passordet"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Ingen protokolltillegg er installerte."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du har truleg gløymt å kjøra 'make install')"
 
-#: ../finch/gntaccount.c:490
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495
+#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Endra konto"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Ny konto"
 
-#: ../finch/gntaccount.c:515
+#: ../finch/gntaccount.c:520
 #: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Brukarnamn:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569
-#: ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878
+#: ../finch/gntaccount.c:574
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883
 #: ../finch/gntblist.c:343
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntblist.c:802
 #: ../finch/gntblist.c:1004
 #: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:2209
+#: ../finch/gntblist.c:2221
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:458
-#: ../finch/gntpounce.c:656
+#: ../finch/gntpounce.c:666
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045
+#: ../finch/gntsound.c:1057
 #: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606
+#: ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609
 #: ../libpurple/account.c:984
 #: ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173
+#: ../libpurple/conversation.c:1219
 #: ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661
@@ -157,16 +160,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259
-#: ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293
-#: ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
+#: ../libpurple/protocols/msn/msn.c:296
+#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6095
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -179,12 +182,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -201,46 +204,46 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
-#: ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511
-#: ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747
-#: ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091
-#: ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188
-#: ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:985
+#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1196
+#: ../pidgin/gtkdialogs.c:1235
+#: ../pidgin/gtkdialogs.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434
 #: ../pidgin/gtklog.c:327
 #: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562
 #: ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
 #: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573
+#: ../finch/gntaccount.c:578
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:464
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1042
-#: ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594
+#: ../finch/gntsound.c:1054
+#: ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597
 #: ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587
@@ -249,111 +252,111 @@
 msgid "Save"
 msgstr "Lagra"
 
-#: ../finch/gntaccount.c:626
-#: ../pidgin/gtkaccount.c:1909
+#: ../finch/gntaccount.c:631
+#: ../pidgin/gtkaccount.c:1900
 #: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1566
+#: ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Slett konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:631
-#: ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655
-#: ../finch/gntpounce.c:718
+#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665
+#: ../finch/gntpounce.c:728
 #: ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:1907
 #: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114
+#: ../pidgin/gtkpounce.c:1099
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1571
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Slett"
 
-#: ../finch/gntaccount.c:663
-#: ../finch/gntblist.c:2115
-#: ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334
+#: ../finch/gntaccount.c:668
+#: ../finch/gntblist.c:2118
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Du kan ta i bruk/slå av kontoar frå lista."
 
 #. Add button
-#: ../finch/gntaccount.c:692
-#: ../finch/gntaccount.c:877
+#: ../finch/gntaccount.c:697
+#: ../finch/gntaccount.c:882
 #: ../finch/gntblist.c:342
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702
+#: ../finch/gntpounce.c:712
 #: ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878
 #: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970
+#: ../pidgin/gtkconv.c:1639
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Legg til"
 
 #. Modify button
-#: ../finch/gntaccount.c:697
-#: ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702
+#: ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Endre"
 
-#: ../finch/gntaccount.c:800
-#: ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805
+#: ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s har gjort %s til sin venn%s%s"
 
-#: ../finch/gntaccount.c:873
-#: ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878
+#: ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Legg til venn i lista?"
 
-#: ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938
+#: ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s ønskjer å leggja %s til vennelista si %s%s"
 
-#: ../finch/gntaccount.c:958
-#: ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988
-#: ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Godkjenna venn?"
 
-#: ../finch/gntaccount.c:965
-#: ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591
-#: ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592
-#: ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Avslå"
 
@@ -378,8 +381,8 @@
 msgstr "Klarte ikkje å leggja til venn"
 
 #: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990
+#: ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1981
 #: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Brukarnamn"
@@ -387,15 +390,15 @@
 #: ../finch/gntblist.c:327
 #: ../finch/gntblist.c:409
 #: ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
 #: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1028
+#: ../pidgin/gtkdialogs.c:1050
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -407,14 +410,14 @@
 
 #: ../finch/gntblist.c:334
 #: ../finch/gntblist.c:400
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173
-#: ../finch/gntstatus.c:572
+#: ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986
-#: ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282
+#: ../pidgin/gtkblist.c:3005
+#: ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267
 #: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
@@ -429,8 +432,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182
-#: ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Legg til venn"
@@ -446,10 +449,10 @@
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:406
-#: ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44
 #: ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
@@ -465,7 +468,7 @@
 
 #: ../finch/gntblist.c:418
 #: ../finch/gntblist.c:853
-#: ../pidgin/gtkblist.c:5814
+#: ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Legg til praterom"
 
@@ -488,9 +491,9 @@
 
 #: ../finch/gntblist.c:453
 #: ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485
-#: ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
@@ -526,7 +529,7 @@
 msgstr "Hentar…"
 
 #: ../finch/gntblist.c:903
-#: ../finch/gntconv.c:407
+#: ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -538,11 +541,11 @@
 
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../finch/gntblist.c:914
-#: ../finch/gntconv.c:419
+#: ../finch/gntconv.c:496
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:653
 #: ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1587
 msgid "Send File"
 msgstr "Send fil"
 
@@ -588,8 +591,8 @@
 
 #: ../finch/gntblist.c:1099
 #: ../finch/gntblist.c:1251
-#: ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650
+#: ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1636
 #: ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
@@ -597,11 +600,12 @@
 
 #. Buddy List
 #: ../finch/gntblist.c:1225
-#: ../finch/gntblist.c:2294
+#: ../finch/gntblist.c:2306
 #: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2685
+#: ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Venneliste"
 
@@ -614,7 +618,7 @@
 msgstr "Slå merke av/på"
 
 #. General
-#: ../finch/gntblist.c:1296
+#: ../finch/gntblist.c:1297
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045
 #: ../libpurple/protocols/gg/gg.c:1118
@@ -623,9 +627,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409
+#: ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -636,33 +640,33 @@
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3010
+#: ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316
+#: ../finch/gntblist.c:1319
 #: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/msn.c:553
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkprefs.c:1922
 msgid "Idle"
 msgstr "Uverksam"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "På mobil"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -671,12 +675,12 @@
 "Tilkopla: %d\n"
 "Totalt: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -685,64 +689,64 @@
 "\n"
 "Sist sett: %s ago"
 
-#: ../finch/gntblist.c:1698
+#: ../finch/gntblist.c:1701
 #: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Ny…"
 
-#: ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:1708
 #: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Lagra…"
 
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2086
 #: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:86
+#: ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Tilleggsprogram"
 
-#: ../finch/gntblist.c:2190
-#: ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866
-#: ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202
+#: ../pidgin/gtkdialogs.c:735
+#: ../pidgin/gtkdialogs.c:874
+#: ../pidgin/gtkdialogs.c:955
 msgid "_Name"
 msgstr "_Namn"
 
-#: ../finch/gntblist.c:2195
-#: ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207
+#: ../pidgin/gtkdialogs.c:740
+#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:960
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2203
-#: ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215
+#: ../pidgin/gtkdialogs.c:748
 msgid "New Instant Message"
 msgstr "Ny lynmelding"
 
-#: ../finch/gntblist.c:2205
-#: ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217
+#: ../pidgin/gtkdialogs.c:750
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Skriv inn brukarnamnet eller kallenamnet til brukaren du ønskjer å prata med."
 
-#: ../finch/gntblist.c:2208
+#: ../finch/gntblist.c:2220
 #: ../finch/gntnotify.c:79
 #: ../libpurple/account.c:983
 #: ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258
-#: ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292
-#: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -759,45 +763,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347
-#: ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746
-#: ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:984
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228
+#: ../finch/gntblist.c:2240
 #: ../finch/gntpounce.c:446
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Val"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Send lynmelding…"
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Vis tomme grupper"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Vis fråkopla vennar"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Sorter etter tilstand"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Sorter alfabetisk "
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Sorter etter loggstorleiken"
 
@@ -822,47 +826,51 @@
 "\n"
 "Finch vil ikkje prøva å kople til kontoen på nytt før feilen er retta og kontoen er teken i bruk att."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Kommandoen finst ikkje."
 
-#: ../finch/gntconv.c:121
-#: ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123
+#: ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Syntaksfeil:  du skreiv ikkje rett tal argument til kommandoen"
 
-#: ../finch/gntconv.c:126
-#: ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128
+#: ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Kommandoen din feila av ukjend årsak."
 
-#: ../finch/gntconv.c:131
-#: ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133
+#: ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Den kommandoen verkar berre i praterom, ikkje i lynmeldingar."
 
-#: ../finch/gntconv.c:134
-#: ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136
+#: ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Den kommandoen verkar berre i lynmeldingar, ikkje i praterom."
 
-#: ../finch/gntconv.c:138
-#: ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140
+#: ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommandoen verkar ikkje i denne protokollen."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Meldinga blei ikkje sendt sia du ikkje er pålogga."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252
-#: ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259
+#: ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -871,52 +879,70 @@
 "\n"
 "%s skriv…"
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Du har forlate dette praterommet."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367
+#: ../pidgin/gtkconv.c:1346
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
+
+#: ../finch/gntconv.c:373
+#: ../pidgin/gtkconv.c:1354
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Send til"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Prat"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Tøm skjerm"
 
-#: ../finch/gntconv.c:396
+#: ../finch/gntconv.c:473
 #: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Bruk logging"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Bruk lydar"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Brukarliste:\n"
 
-#: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997
+#: ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
 
-#: ../finch/gntconv.c:915
-#: ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033
+#: ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
 
-#: ../finch/gntconv.c:918
-#: ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036
+#: ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -924,61 +950,61 @@
 "Bruk \"/help &lt;kommando&gt;\" for å få hjelp med ein kommando.\n"
 "Dei følgjande kommandoane er tilgjengelege i denne samanhengen:\n"
 
-#: ../finch/gntconv.c:976
-#: ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094
+#: ../pidgin/gtkconv.c:7535
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;message&gt;: Sender ei melding på normal måte, som om du ikkje nytta ein kommando."
 
-#: ../finch/gntconv.c:979
-#: ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097
+#: ../pidgin/gtkconv.c:7538
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;: Sender ei IRC-type-hending til ein venn eller eit praterom."
 
-#: ../finch/gntconv.c:982
-#: ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100
+#: ../pidgin/gtkconv.c:7541
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;option&gt;: Send forskjellig feilsøkingsinformasjon til samtala du er i."
 
-#: ../finch/gntconv.c:985
-#: ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103
+#: ../pidgin/gtkconv.c:7544
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tømmer skjermen."
 
-#: ../finch/gntconv.c:988
-#: ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106
+#: ../pidgin/gtkconv.c:7550
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;: Hjelp til ein spesifikk kommando."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: viser lista over brukarar i praterommet."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: viser programtilleggsvindauget."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: viser vennelista."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: viser kontovindauget."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: viser feilsøkingsvindauget."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: viser innstillingsvindauget."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: viser lagra status-vindauget."
 
 #: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:86
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Feilsøkingsvindauge"
@@ -1010,124 +1036,129 @@
 #. Create the window.
 #: ../finch/gntft.c:122
 #: ../finch/gntft.c:195
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233
 #: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Filoverføringar"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Framdrift"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Storleik"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Fart"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Attverande"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198
-#: ../finch/gntstatus.c:543
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../finch/gntft.c:200
+#: ../finch/gntstatus.c:546
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034
 #: ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095
-#: ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998
 #: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Lukk dette vindauget når alle overføringane er ferdige"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Tøm ferdige overføringar"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Stopp"
 
 #. Close button
-#: ../finch/gntft.c:234
+#: ../finch/gntft.c:236
 #: ../finch/gntnotify.c:181
 #: ../finch/gntplugin.c:209
 #: ../finch/gntplugin.c:309
-#: ../finch/gntpounce.c:727
+#: ../finch/gntpounce.c:737
 #: ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/msn/msn.c:412
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Lukk"
 
-#: ../finch/gntft.c:302
+#: ../finch/gntft.c:304
 #: ../pidgin/gtkft.c:168
 #: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-#: ../finch/gntft.c:369
+#: ../finch/gntft.c:371
 #: ../pidgin/gtkft.c:165
 #: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Avbroten"
 
-#: ../finch/gntft.c:371
+#: ../finch/gntft.c:373
 #: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Feila"
 
-#: ../finch/gntft.c:417
+#: ../finch/gntft.c:419
 #: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428
-#: ../finch/gntft.c:429
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Fila blei lagra som %s."
+
+#: ../finch/gntft.c:431
+#: ../finch/gntft.c:432
 #: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:436
 #: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Overfører"
@@ -1142,12 +1173,12 @@
 msgstr "Du har fått e-post."
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:490
+#: ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Sendar"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:497
+#: ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Emne"
 
@@ -1159,19 +1190,19 @@
 msgstr[1] "%s (%s) har %d nye meldingar."
 
 #: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:336
+#: ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Ny e-postmelding"
 
 #: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:918
+#: ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Info om %s"
 
 #: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Venneinformasjon"
 
@@ -1181,13 +1212,13 @@
 msgstr "Hald fram"
 
 #: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1629
+#: ../pidgin/gtkconv.c:1615
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Informasjon"
 
 #: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1590
+#: ../pidgin/gtkconv.c:1576
 msgid "IM"
 msgstr "Lynmeldingar"
 
@@ -1196,7 +1227,7 @@
 msgstr "Bli med"
 
 #: ../finch/gntnotify.c:391
-#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
@@ -1258,9 +1289,9 @@
 #: ../finch/gntplugin.c:370
 #: ../finch/gntplugin.c:377
 #: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88
+#: ../finch/gntui.c:90
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2062
+#: ../pidgin/gtkprefs.c:2064
 msgid "Preferences"
 msgstr "Innstillingar "
 
@@ -1269,7 +1300,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Skriv inn ein venn å varsla om."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327
 #: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
@@ -1286,7 +1316,7 @@
 
 #. Account:
 #: ../finch/gntpounce.c:335
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1296,7 +1326,7 @@
 
 #. Create the "Pounce When Buddy..." frame.
 #: ../finch/gntpounce.c:373
-#: ../pidgin/gtkpounce.c:586
+#: ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Varsla når venn…"
 
@@ -1342,7 +1372,7 @@
 
 #. Create the "Action" frame.
 #: ../finch/gntpounce.c:413
-#: ../pidgin/gtkpounce.c:647
+#: ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Handling"
 
@@ -1371,84 +1401,96 @@
 msgstr "Vennevarsling berre når tilstanden min ikkje er tilgjengeleg"
 
 #: ../finch/gntpounce.c:449
-#: ../pidgin/gtkpounce.c:1295
+#: ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Gjentakande"
 
-#: ../finch/gntpounce.c:651
-#: ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Klarer ikkje å oppretta vennevarsel"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Du har ingen konto."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Du må først oppretta ein konto før du kan laga eit vennevarsel."
+
+#: ../finch/gntpounce.c:661
+#: ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Er du sikker på at du ønskjer å sletta varselet i %s  for %s??"
 
-#: ../finch/gntpounce.c:685
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
 
-#: ../finch/gntpounce.c:799
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har begynt å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:801
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:803
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har logga på (%s)"
 
-#: ../finch/gntpounce.c:805
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815
+#: ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s er ikkje uverksam lenger (%s)"
 
-#: ../finch/gntpounce.c:807
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s er ikkje lenger vekke (%s)"
 
-#: ../finch/gntpounce.c:809
-#: ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:811
-#: ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har logga av (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s er blitt uverksam (%s)"
 
-#: ../finch/gntpounce.c:815
-#: ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s har gått vekk . (%s)"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg ei melding. (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapportér feilen."
 
@@ -1457,16 +1499,16 @@
 msgstr "Basert på tastaturbruk"
 
 #: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "From last sent message"
 msgstr "Frå sist sendte melding"
 
 #: ../finch/gntprefs.c:95
 #: ../pidgin/gtkprefs.c:897
 #: ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924
-#: ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldri"
 
@@ -1517,14 +1559,14 @@
 #. Conversations
 #: ../finch/gntprefs.c:258
 #: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../pidgin/gtkprefs.c:2030
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Samtaler"
 
 #: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1464
-#: ../pidgin/gtkprefs.c:2039
+#: ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkprefs.c:2041
 msgid "Logging"
 msgstr "Loggføring"
 
@@ -1533,125 +1575,125 @@
 msgstr "Enno ikkje teken i bruk."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Lagra fil…"
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Opna fil…"
 
-#: ../finch/gntsound.c:94
+#: ../finch/gntsound.c:96
 #: ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Venn loggar inn"
 
-#: ../finch/gntsound.c:95
+#: ../finch/gntsound.c:97
 #: ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Venn loggar ut"
 
-#: ../finch/gntsound.c:96
+#: ../finch/gntsound.c:98
 #: ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Melding motteken"
 
-#: ../finch/gntsound.c:97
+#: ../finch/gntsound.c:99
 #: ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Motteken melding startar samtala"
 
-#: ../finch/gntsound.c:98
+#: ../finch/gntsound.c:100
 #: ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../finch/gntsound.c:99
+#: ../finch/gntsound.c:101
 #: ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person kjem inn i rommet"
 
-#: ../finch/gntsound.c:100
+#: ../finch/gntsound.c:102
 #: ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person forlèt rommet"
 
-#: ../finch/gntsound.c:101
+#: ../finch/gntsound.c:103
 #: ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Du pratar i rommet"
 
-#: ../finch/gntsound.c:102
+#: ../finch/gntsound.c:104
 #: ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Andre pratar i rommet"
 
-#: ../finch/gntsound.c:104
+#: ../finch/gntsound.c:106
 #: ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Nokon seier brukarnamnet ditt i praterommet"
 
-#: ../finch/gntsound.c:357
+#: ../finch/gntsound.c:360
 #: ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer-svikt"
 
-#: ../finch/gntsound.c:358
+#: ../finch/gntsound.c:361
 #: ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer klarte ikkje å starta."
 
-#: ../finch/gntsound.c:706
-#: ../finch/gntsound.c:791
-#: ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673
-#: ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715
+#: ../finch/gntsound.c:801
+#: ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675
+#: ../pidgin/gtkprefs.c:1869
 msgid "(default)"
 msgstr "(standard)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Vel lydfil…"
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Lydinnstillingar "
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profilar"
 
-#: ../finch/gntsound.c:943
-#: ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953
+#: ../pidgin/gtkprefs.c:1714
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsollyd"
 
-#: ../finch/gntsound.c:947
-#: ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957
+#: ../pidgin/gtkprefs.c:1718
 msgid "Command"
 msgstr "Kommando"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Ingen lyd"
 
-#: ../finch/gntsound.c:950
-#: ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960
+#: ../pidgin/gtkprefs.c:1709
 msgid "Sound Method"
 msgstr "Lydmetode"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Metode:"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1661,66 +1703,66 @@
 "(%s for filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:970
-#: ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980
+#: ../pidgin/gtkprefs.c:1753
 msgid "Sound Options"
 msgstr "Lydinnstillingar"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Lydar når samtalevindauget har fokus"
 
-#: ../finch/gntsound.c:979
+#: ../finch/gntsound.c:989
 #: ../pidgin/gtkprefs.c:896
 #: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:980
-#: ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:1758
 msgid "Only when available"
 msgstr "Berre når tilgjengeleg"
 
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1759
 msgid "Only when not available"
 msgstr "Berre når ikkje tilgjengeleg"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005
-#: ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017
+#: ../pidgin/gtkprefs.c:1795
 msgid "Sound Events"
 msgstr "Lydhendingar"
 
-#: ../finch/gntsound.c:1007
-#: ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019
+#: ../pidgin/gtkprefs.c:1854
 msgid "Event"
 msgstr "Hending"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1026
-#: ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038
+#: ../pidgin/gtkprefs.c:1873
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1029
-#: ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041
+#: ../pidgin/gtkprefs.c:1877
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../finch/gntsound.c:1032
-#: ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044
+#: ../pidgin/gtkprefs.c:1881
 msgid "Choose..."
 msgstr "Vel…"
 
@@ -1739,7 +1781,7 @@
 msgstr "Lagra tilstandar"
 
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1752,12 +1794,20 @@
 msgid "Type"
 msgstr "Type"
 
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:560
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072
 #: ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592
@@ -1766,31 +1816,32 @@
 #: ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622
 #: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/oscar/oscar.c:5773
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5810
+#: ../libpurple/protocols/oscar/oscar.c:5817
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525
 #: ../pidgin/gtksavedstatuses.c:1009
@@ -1799,7 +1850,7 @@
 
 #. Use
 #: ../finch/gntstatus.c:193
-#: ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Bruk"
 
@@ -1811,58 +1862,80 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Skriv inn ein tittel for tilstanden."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Duplisert tittel"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Skriv inn ein annan tittel for tilstanden."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:460
+#: ../finch/gntstatus.c:463
 #: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Melding:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Endra tilstand"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Bruk forskjellig status for følgjande kontoar"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Lagra og bruk"
 
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Sertifikat"
+
+#: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2032
 msgid "Sounds"
 msgstr "Lydar"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Tilstandar"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Det oppstod feil under innlasting av programtillegget."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Klarte ikkje å finna X-skjermen"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Klarte ikkje å finna vindauget"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Programtillegget kan ikkje lastast inn sia det ikkje blei laga med støtte for X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Utklippstavleprogramtillegg"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "Når innhaldet på gnt-utklippstavla endrar seg, vil det bli tilgjengeleg for X (om mogleg)."
 
@@ -2012,13 +2085,13 @@
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Tilkoplingsfeil"
 
 #: ../libpurple/account.c:1170
 #: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Dei nye passorda samsvarer ikkje."
 
@@ -2057,7 +2130,7 @@
 msgid "Set User Info"
 msgstr "Skriv inn brukarinformasjon"
 
-#: ../libpurple/account.c:1744
+#: ../libpurple/account.c:1735
 #: ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
@@ -2069,10 +2142,11 @@
 msgstr "Ukjend"
 
 #: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518
-#: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325
+#: ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243
+#: ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
@@ -2104,60 +2178,60 @@
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "Klarte ikkje å senda meldinga: ho er for stor."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Klarte ikkje å senda melding til %s."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Meldinga er for stor."
 
-#: ../libpurple/conversation.c:183
+#: ../libpurple/conversation.c:184
 #: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Klarte ikkje å senda meldinga."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Send melding"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Send melding"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er komen inn i rommet."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] er komen inn i rommet."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "No heiter du %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har endra namn til %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s har gått ut av rommet."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s har gått ut av rommet (%s)."
@@ -2635,10 +2709,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:6168
+#: ../libpurple/protocols/oscar/oscar.c:6238
 #: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2682,8 +2756,8 @@
 "(berre når det ikkje foregår ei samtale med sendaren)"
 
 #: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Notat"
 
@@ -3090,23 +3164,23 @@
 msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
 msgstr "Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta varselet frå vennevarsel-vindauget."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
 msgstr "\"%s\" er for tida fråkopla. Vil du lagra resten av meldingane som eit varsel og automatisk senda det når \"%s\" loggar på att?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Fråkopla melding"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Du kan endra/sletta varselet frå vennevarsel-vindauget"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113
@@ -3118,10 +3192,10 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114
@@ -3133,11 +3207,11 @@
 msgid "No"
 msgstr "Nei"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Lagra fråkopla meldingar som eit varsel"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Spør ikkje. Lagra alltid som eit varsel."
 
@@ -3248,13 +3322,19 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr felles grensesnitt mot SSL støttebiblioteka."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:633
+msgid "X.509 Certificates"
+msgstr "X.509-sertifikat"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3262,8 +3342,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -3273,7 +3353,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:718
 msgid "NSS"
 msgstr "NSS"
 
@@ -3281,8 +3361,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:721
+#: ../libpurple/plugins/ssl/ssl-nss.c:723
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tilbyr SSL-støtte gjennom Mozilla NSS."
 
@@ -3369,21 +3449,21 @@
 msgstr "Klarer ikkje å kopla til den lokale mDNS-tenaren. Kjører han?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/jabber/jabber.c:819
 msgid "First name"
 msgstr "Fornamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "Last name"
 msgstr "Etternamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:940
 #: ../libpurple/protocols/jabber/buddy.c:948
@@ -3396,13 +3476,13 @@
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP-konto"
 
@@ -3416,27 +3496,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolktillegg"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple-person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Vertsnamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3448,30 +3526,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har lukka samtala."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 
-#: ../libpurple/protocols/bonjour/jabber.c:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Klarte ikkje å opna endepunkt"
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Klarte ikkje å lagra endepunktsval"
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Klarte ikkje å lytta til endepunktet"
 
@@ -3554,8 +3632,8 @@
 
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Passord"
 
@@ -3586,9 +3664,9 @@
 #: ../libpurple/protocols/gg/gg.c:637
 #: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "By"
@@ -3598,8 +3676,8 @@
 msgstr "Fødselsår"
 
 #: ../libpurple/protocols/gg/gg.c:645
-#: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226
 #: ../libpurple/protocols/qq/qq.c:229
@@ -3614,14 +3692,14 @@
 msgstr "Mann eller kvinne"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mann"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3687,16 +3765,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5605
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3423
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3433
 #: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -3708,10 +3786,10 @@
 #: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1055
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Tilgjengeleg"
 
@@ -3719,30 +3797,30 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5633
 #: ../libpurple/protocols/qq/qq.c:180
 #: ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
 #: ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Vekke"
 
 #: ../libpurple/protocols/gg/gg.c:1038
 #: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
@@ -3750,7 +3828,7 @@
 #: ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3763,7 +3841,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1106
 #: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Klarer ikkje å visa søkjeresultata."
 
@@ -3810,7 +3888,7 @@
 msgstr "Tilkoplinga feila."
 
 #: ../libpurple/protocols/gg/gg.c:1616
-#: ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Blokkert"
 
@@ -3948,8 +4026,9 @@
 
 #: ../libpurple/protocols/irc/irc.c:127
 #: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614
-#: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612
+#: ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Tenaren har kopla frå"
 
@@ -3965,7 +4044,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:267
 #: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:526
+#: ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -3973,67 +4052,64 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kallenamn kan ikkje innehalda mellomrom"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
 #: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Koplar til"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "SSL-støtte er ikkje tilgjengeleg"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
 #: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Klarte ikkje å kopla til verten"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Tilkoplinga feila"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL-utvekslinga feila"
-
-#: ../libpurple/protocols/irc/irc.c:611
-#: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609
+#: ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Emne"
 
@@ -4045,22 +4121,22 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegget som syg mindre"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942
+#: ../libpurple/protocols/irc/irc.c:940
 #: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
@@ -4071,24 +4147,24 @@
 msgstr "Tenar"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945
-#: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943
+#: ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6675
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Teiknkodingar"
 
-#: ../libpurple/protocols/irc/irc.c:951
+#: ../libpurple/protocols/irc/irc.c:949
 #: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4104,7 +4180,7 @@
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/irc/irc.c:954
+#: ../libpurple/protocols/irc/irc.c:952
 #: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
@@ -4115,7 +4191,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Bruk SSL"
 
@@ -4146,7 +4222,7 @@
 msgstr " <i>(identifisert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4379,7 +4455,7 @@
 msgstr "names [kanal]:  listar brukarane i kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt."
 
@@ -4532,7 +4608,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4551,7 +4627,7 @@
 msgstr "Førenamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "Nettadresse"
 
@@ -4610,15 +4686,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Skildring"
@@ -4649,11 +4725,11 @@
 msgstr "Ressurs"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4664,9 +4740,9 @@
 msgstr "Mellomnamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4710,7 +4786,7 @@
 msgstr "Avbryt tinging"
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
@@ -4719,10 +4795,10 @@
 msgstr "Utvida vekke"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -4732,7 +4808,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Etternamn"
 
@@ -4766,8 +4842,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -4783,7 +4859,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4806,8 +4882,8 @@
 msgstr "Søk katalog"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Rom:"
 
@@ -4914,8 +4990,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4924,55 +5000,55 @@
 "Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ulovleg XMPP-id. Domenet må vera skrive inn."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringa av %s@%s blei gjennomført"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
 msgid "Registration Successful"
 msgstr "Registreringa blei gjennomført"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
 msgid "Unknown Error"
 msgstr "Ukjend feil"
 
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Failed"
 msgstr "Registreringa feila"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Allereie registrert"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Fylke/Region/Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4982,397 +5058,395 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Dato"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll ut informasjonen under for å registrera den nye kontoen din."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Registrer ein ny XMPP-konto"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Registrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Begynner datastraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "Tek opp att datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5603
 msgid "Not Authorized"
 msgstr "Ikkje autorisert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Begge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr "Frå (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Frå"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr "Til"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr "Ingen (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Passordet er endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Passordet ditt er blitt endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Feil under  endringa av passordet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Passord (om att)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "Endra XMPP-passord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Skriv inn det nye passordet ditt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6389
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Skriv inn brukarinfo…"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6400
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Endra passord…"
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Søk etter brukarar…"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Ugyldig førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr "Funksjonen er ikkje teken i bruk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Forbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr "Vekke"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Intern tenarfeil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Elementet blei ikkje funne"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Misforma XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr "Avvist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Ikkje tillate"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr "Betaling påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr "Mottakaren er ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr "Registrering påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Fann ikkje fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Tidsavbrot på fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Tenaren er overlasta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Tenesten er utilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr "Abonnement påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
 msgstr "Uventa førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
 msgstr "Autoriseringa blei avbroten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr "Feil koding i autoriseringa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr "Ugyldig authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
 msgstr "Ugyldig autoriseringsmekanisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
 msgstr "Autoriseringsmekanismen er for svak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr "Mellombels autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Feil format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr "Feil namneromsprefiks"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Ressurskonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tidsavbrot på tilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr "Verten forsvann"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Ukjend vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr "Ikkje skikkeleg adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Ugyldig namnerom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Ugyldig XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
 msgstr "Ikke-samsvarande vertar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr "Framgangsmåtebrot"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
 msgstr "Feil i fjerntilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Ressursavgrensing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr "Avgrensa XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr "Sjå annan vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr "Systemet avsluttar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr "Uavklara tilstand"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Teiknkodinga er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatypen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Versjonen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "XML-koden er ikkje velforma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Feil i datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Klarte ikkje å utestengja brukaren (%s)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ukjend tilknyting: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Klarte ikkje å knyta til brukar %s som \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ukjend rolle: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Klarte ikkje å utføra rolla \"%s\" for brukaren: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Klarte ikkje å sparka ut brukaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1817
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlata praterommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Visa eller endra emnet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;brukar&gt; [rom]:  Utesteng brukaren frå rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva tilknyting brukaren har til rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
 msgstr "role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva rolle brukaren har i rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;brukar&gt; [melding]:  Invitér ein brukar til rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;rom&gt; [tenar]:  Gå inn i eit praterom på denne tenaren."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;brukar&gt; [rom]:  Spark ein brukar frå rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;brukar&gt; &lt;melding&gt;:  Send ei privat melding til ein annan brukar."
 
@@ -5393,7 +5467,7 @@
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 #: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../pidgin/gtkaccount.c:508
+#: ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domene"
 
@@ -5406,12 +5480,16 @@
 msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3276
 #: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Tilkoplingsport"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857
 #: ../pidgin/gtkaccount.c:837
@@ -5768,74 +5846,86 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-feil: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "dytt"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "dytta"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Dyttar"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Du har nettopp sendt ein dytt (\"nudge\")"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Skriv inn visingsnamnet ditt."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er namnet som vil synast hos andre MSN-vennar."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Skriv inn heimetelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Skriv inn arbeidstelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Skriv inn mobiltelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillèt du MSN Mobile-sider?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
 msgstr "Vil du tillata eller nekta personar i vennelista di å senda deg MSN Mobile-sider til mobiltelefonen din eller annan mobileining?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Nekt"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr "Send ei mobilmelding."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr "Side"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Har deg"
 
-#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/msn.c:588
 #: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Kjem straks tilbake"
 
-#: ../libpurple/protocols/msn/msn.c:555
+#: ../libpurple/protocols/msn/msn.c:592
 #: ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
@@ -5843,95 +5933,95 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Taler i  telefonen"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Skriv inn visingsnamn…"
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Skriv inn heimetelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Skriv inn jobbtelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Skriv inn mobiltelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ta i bruk/ta vekk mobile einingar…"
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillat/avslå mobilsider…"
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Opna Hotmail-innkorga"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Start ein _prat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Klarte ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/msn/msn.c:1479
-#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/msn/msn.c:1864
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Generelt"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alder"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5939,204 +6029,204 @@
 msgid "Location"
 msgstr "Stad"
 
-#: ../libpurple/protocols/msn/msn.c:1565
-#: ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Fritidssysler og interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1571
-#: ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697
-#: ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712
-#: ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Litt om meg sjølv"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr "Sosial"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Sivilstand"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Kjæledyr"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Heimstad/by"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
 msgstr "Tidlegare bustader"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Mote"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Musikk"
 
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favorittsitat"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Kontaktinfo"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Personleg"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr "Annan viktig"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Heimetelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Heimetelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Heimeadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Personleg mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Personleg e-postadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Personleg pratenett"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Arbeidstelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Jobbmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Personsøkar arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "E-postadresse jobb"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr "Pratenett arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Startdato"
 
-#: ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Favorittsakene mine"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Heimeside"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Brukaren har ikkje laga ein offentleg profil."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
 msgstr "MSN rapporterte at det ikkje var mogeleg å finna brukarprofilen. Det vil seia at brukaren anten ikkje finst, eller at ho/han ikkje har laga ein offentleg profil enno."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 msgid "Could not find any information in the user's profile. The user most likely does not exist."
 msgstr "Fann ingen informasjon i brukarprofilen. Brukaren finst mest truleg ikkje."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1878
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiladresse"
@@ -6151,20 +6241,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169
+#: ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
@@ -6183,8 +6273,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Klarte ikkje å kopla til"
 
@@ -6373,7 +6463,7 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Det kan vera at meldinga ikkje blei sendt sia ein ukjend feil oppstod:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
@@ -6397,6 +6487,212 @@
 msgid "The screen name specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ikkje gyldig."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Manglande kryptering"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Fann ikkje RC4-krypteringa"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Oppgrader til ein libpurple med RC4-støtte (>= 2.0.1). MySpaceIM-tillegget vil ikkje lastast."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+msgstr "MySpace støttar ikkje passord med fleire enn %d teikn. Passordet ditt er på %d teikn."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-feil"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Les utfordringa"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Uventa lengd på utfordringa frå tenaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Loggar på"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Nye e-postmeldingar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Ny blogg-kommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Ny profilkommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nye venneførespurnader"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nytt bilete-kommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Tilkopla"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Ikkje noko brukarnamn er skriven inn"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+msgstr "Gå til http://editprofile.myspace.com/index.cfm?fuseaction=profile.username og vel eit brukarnamn. Prøv deretter å logga på igjen."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokollfeil, kode %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Klarte ikkje å leggja til venn"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy'-kommandoen feila."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "'persist'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Brukaren %s finst ikkje"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Slår opp brukaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Klarte ikkje å fjerna vennen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "'blocklist'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Ugyldig inndatavilkår"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Leselageret er fullt"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Meldinga kan ikkje tolkast"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Klarte ikkje å kopla til verten: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Lynmeldingsvennar"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr "%d vennar blei lagde til eller oppdaterte frå tenaren (inkludert vennar som allereie var på tenarsidelista)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Legg til kontaktar frå tenaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Legg til vennar frå MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "klarte ikkje å importera vennane"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Søk etter personar…"
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Endra lynmeldingsnamn…"
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "myim adressehandterar"
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Fann ingen passande MySpaceIM-konto til å opna denne myim-adressa."
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Ta i bruk den rette MySpaceIM-kontoen og prøv igjen."
+
+#: ../libpurple/protocols/myspace/myspace.c:3280
+msgid "Show display name in status text"
+msgstr "Vis visingsnamnet i statusteksten"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Vis overskrift i statusteksten"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Send emotikon"
+
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Skjermoppløysing (punkt per tomme)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Grunnskriftstorleik (punkt)"
+
 #
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6621,7 +6917,7 @@
 msgstr "E-postkontor"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Brukar-ID"
 
@@ -6730,8 +7026,8 @@
 msgstr "Tenarport"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481
 #: ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099
@@ -6742,8 +7038,8 @@
 msgstr "Tenaren lukka tilkoplinga."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632
 #: ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111
 #: ../libpurple/proxy.c:1220
@@ -6797,7 +7093,7 @@
 msgstr "ICQ-protokolltillegg"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Teiknkoding"
@@ -6939,8 +7235,8 @@
 
 #. Label
 #: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Venneikon"
@@ -6962,7 +7258,7 @@
 msgstr "Prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:6011
 msgid "Get File"
 msgstr "Hent fil"
 
@@ -7035,17 +7331,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5781
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5816
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5802
 msgid "Occupied"
 msgstr "Oppteken"
 
@@ -7056,10 +7352,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:736
 #: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Usynleg"
 
@@ -7068,14 +7364,14 @@
 msgstr "Tilkopla"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/oscar/oscar.c:3717
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Åtvaringsnivå"
 
@@ -7120,14 +7416,14 @@
 msgstr "Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Ugyldig brukarnamn."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Feil passord."
 
@@ -7176,8 +7472,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6167
 #: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
@@ -7225,8 +7521,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:2290
 #: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
@@ -7310,42 +7606,42 @@
 msgid "_Decline"
 msgstr "_Avvis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia ho var ugyldig."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia dei var ugyldige."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Du fekk ikkje %hu melding frå %s fordi ho var for stor."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s fordi dei var for store."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia mengdegrensa er overskriden."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia mengdegrensa er overskriden."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia han/ho er for vond."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia han/ho er for vond."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia du er for vond."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia du er for vond."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7353,278 +7649,278 @@
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2809
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Klarte ikkje å senda til %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Evner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Tilgjengeleg melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege teikn.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Klarte ikkje å utføra den siste handlinga sia du er over mengdegrensa. Vent i 10 minutt og prøv igjen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du er blitt fråkopla praterommet %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3739
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Stilling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Arbeidsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Dette brukarnamnet er knytt til %s"
 msgstr[1] "Desse brukarnamna er knytte til %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du vil få ei e-postmelding der du blir spurt om å stadfesta %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet ikkje samsvarer med originalen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet er for langt."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia det allereie finst ein førespurnad for dette brukarnamnet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa har for mange brukarnamn knytte til seg."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: ukjent feil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Konto-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Lynmeldingsbiletet blei ikkje sendt. Du må vera direkte tilkopla for å kunna senda lynmeldingsbilete."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Klarer ikkje å lagra AIM-profilen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Du har truleg bede om å få lagra profilen din før pålogginga var ferdig. Profilen din er ikkje lagra - prøv igjen når du er heilt tilkopla."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "Den høgste profilstorleiken på %d bytar er overskriden. Han er blitt forkorta."
 msgstr[1] "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profilen er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er blitt forkorta."
 msgstr[1] "Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er blitt forkorta."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4638
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4640
+#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5088
 msgid "Unable To Add"
 msgstr "Klarer ikkje å leggja til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4749
 msgid "Unable To Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4750
 msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "AIM-tenarane er mellombels ute av stand til å senda vennelista di. Lista er ikkje tapt - ho vil truleg vera tilgjengeleg igjen om nokre timar."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5143
+#: ../libpurple/protocols/oscar/oscar.c:5148
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5071
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Kan ikkje leggja til vennen %s sia vennelista er full. Slett ein venn frå lista og prøv igjen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5085
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Klarte ikkje av ukjend årsak å leggja til vennen %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5179
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Authorization Given"
 msgstr "Godkjent"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Brukaren %s har gjeve deg løyve til å leggja dei til vennelista di."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5261
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5264
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7633,182 +7929,182 @@
 "Brukaren %s har avslått førespurnaden din om å få leggja dei til vennelista di. Årsaka er: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5265
 msgid "Authorization Denied"
 msgstr "Godkjenning avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5341
 msgid "Invalid chat name specified."
 msgstr "Det oppgjevne pratenamnet er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5410
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Biletet blei ikkje sendt. Du kan ikkje senda lynmeldingsbilete i AIM-praterom."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "Away Message"
 msgstr "Fråværsmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(hentar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5775
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennenotat for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Buddy Comment:"
 msgstr "Vennemerknad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5931
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Du har valt å opna eit direkte lynmeldingssamband med %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5935
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Handlinga kan medføra ein tryggleiksrisikio fordi ho avslører IP-adressa di. Vil du fortsetja?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
+#: ../libpurple/protocols/oscar/oscar.c:5941
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_Koplar til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5982
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5990
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Direct IM"
 msgstr "Direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Re-request Authorization"
 msgstr "Spør om ny godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Require authorization"
 msgstr "Krev autorisasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6087
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Nettnærvær (å slå på dette gjer at du kjem til å få søppelpost!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "ICQ Privacy Options"
 msgstr "ICQ personvernval"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Formatering av brukarnamnet vil berre endra store/små bokstavar og blankteikn."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du ventar ikkje på godkjenning</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "You are awaiting authorization from the following buddies"
 msgstr "De ventar på godkjenning frå desse vennane"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Du kan be om godkjenning frå desse vennane igjen ved å høgreklikka dei og velja \"Spør om ny godkjenning.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Find Buddy by E-Mail"
 msgstr "Finn venn utfrå e-postadessa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Search for a buddy by e-mail address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressa til vennen du leiter etter."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6237
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Set User Info (URL)..."
 msgstr "Skriv inn brukarinfo (URL)…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6406
 msgid "Change Password (URL)"
 msgstr "Endra passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Configure IM Forwarding (URL)"
 msgstr "Innstillingar for vidaresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6427
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6453
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Use recent buddies group"
 msgstr "Bruk seinaste vennegruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6524
 msgid "Show how long you have been idle"
 msgstr "Vis kor lenge du har vore uverksam"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6679
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8450,7 +8746,8 @@
 msgstr "%s har lagt deg til"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Vil du leggja han til?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8484,10 +8781,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s er ikkje på vennelista di"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Vil du leggja han til?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Tilkoplinga er lukka (skrivande)"
@@ -8551,10 +8844,6 @@
 msgid "Starting Services"
 msgstr "Startar tenester"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Tilkopla"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
@@ -8575,7 +8864,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Klarer ikkje å kopla til tenaren"
 
@@ -8596,151 +8885,151 @@
 msgid "Place Closed"
 msgstr "Staden er lukka"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Høgtalarar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Filoverføring"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Støttar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Ekstern brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Lag konferanse med brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Før opp eit emne for den nye konferansen og invitasjonsmeldinga som skal sendast til %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Ny konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Lag"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Tilgjengelege konferansar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Lag ny konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Inviter ein brukar til ein konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "Vel kva for konferanse frå lista nedanfor du ønskjer å invitera brukaren %s til å bli med i. Vel \"Lag ny konferanse\" om du konferansen ikkje finst frå før av."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Inviter til konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Inviter til konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Send TEST-melding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587
-#: ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4335
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr "Meanwhile-kontoen %s har ingen vert eller IP-adresse knytt til seg. Før opp ein av desse verdiane for å logga på."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Kopla til"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ukjend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Sist kjende klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime-ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Brukar-ID-en var ikkje eintydig"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Vel den rette brukaren frå lista nedanfor for å leggja han til i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Klarte ikkje å leggja til brukar: fann ikkje brukaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-fellesskapet ditt. Oppføringa er fjerna frå vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Klarte ikkje å leggja til brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8749,151 +9038,150 @@
 "Fillesefeil %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Fjernlagra venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Lagringstilstand venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Berre lokal venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Slå saman med liste frå tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Slå saman og lagra lista på tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synkronisera lista med tenaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Eksporter Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Klarte ikkje å leggja til gruppe: gruppa finst allereie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ei gruppe med namnet '%s' finst allereie i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Moglege treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Grupperesultat Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Identifikatoren '%s' kan visa til kven som helst av dei følgjande Notes adressebokgruppene. Vel den rette gruppa frå lista nedanfor for å leggja ho til i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Vel Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Klarte ikkje å leggja til gruppa: gruppa finst ikkje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Identifikatoren '%s' samsvarte ikkje med noka Notes adressebokgruppe i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes adressebokgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Før opp namnet til ei Notes adressebokgruppe i feltet nedanfor for å leggja til gruppa og medlemmene hennar i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Søkjeresultat for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Du kan leggja desse brukarane til i vennelista di, eller senda dei meldingar ved hjelp av knappane nedanfor."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539
-#: ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Søkjeresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Søk etter ein brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Skriv inn eit namn eller ei delvis ID-oppføring i feltet nedanfor for å søkja etter samsvarande brukarar i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Brukarsøk"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importer Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Eksporter Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Legg til Notes adressebokgruppe…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Brukarsøk…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Tvungen pålogging (sjå vekk frå tenarvidaresending)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Skjul klientidentitet"
 
@@ -10105,7 +10393,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10474,7 +10762,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2031
+#: ../pidgin/gtkprefs.c:2033
 msgid "Network"
 msgstr "Nettverk"
 
@@ -10949,8 +11237,8 @@
 msgstr "Passordet er endra"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -11013,94 +11301,99 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje støtta."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s sendte deg nettopp ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Melding om avvist autentisering:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista di."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista di grunna: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista di."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Yahoo-tenaren har spurt om å få bruka ein ukjent autentiseringsmetode. Du vil truleg ikkje vera i stand til å logga deg på Yahoo. Sjå hos %s etter oppdateringar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentiseringa feila"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "Du har prøvd å ignorera %s, men brukaren finst i vennelista di. Ved å klikka \"Ja\" vil vennen blir fjerna og ignorert."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Kontoen din er låst. Bruk Yahoo! sin nettstad for å logga deg på."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Ukjent feilnummer %d. Di kan kanskje løysa problemet ved å nytta Yahoo! sin nettstad for å logga deg på."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Tilkoplingsproblem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11109,7 +11402,7 @@
 "Mista sambandet med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11118,111 +11411,123 @@
 "Klaret ikkje å få til samband med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Ikkje ved pulten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Ikkje på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Ute eit bel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Framstå som tilkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Nærvær"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Verkar vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Bli med i praterom"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Lag konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Nærværsinnstillingar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Kva ID skal takast i bruk?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Join who in chat?"
 msgstr "Kven skal bli med i praterommet?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Ta i bruk ID…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Bli med brukaren i praterommet…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr "Du har nettopp sendt ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr "alarm"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr "alarmert"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr "Alarmerer"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: list romma på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
@@ -11236,123 +11541,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr "Søkjetenestetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr "Søkjetenestetenar (_Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr "S_økjeport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Filoverføringstenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Filoverføringstenar (Japa_n)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Filoverførings_port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo pratetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Invitasjonen avvist"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Klarte ikkje å bli med i praterommet"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Ukjent rom"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Kanskje er rommet fullt"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "Ukjent feil. Du treng kanskje å logga ut og venta i fem minutt før du prøver å bli med i rommet igjen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Du pratar no i %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Klarte ikkje å bli med vennen i praterommet"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Kanskje er dei ikkje i eit praterom?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Klarte ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Stemmer"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Nettkamera"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Klarer ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Brukarrom"
 
@@ -11678,7 +11983,22 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s er no kjend som %s. \n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "OBS! %s %s."
+
+#: ../libpurple/server.c:295
+#: ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "OBS!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "NB! Du er blitt %s."
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11687,12 +12007,12 @@
 "%s har invitert %s til praterommet %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s har invitert %s til praterommet %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Tek du i mot invitasjonen?"
 
@@ -11701,7 +12021,7 @@
 msgstr "Ta vekk"
 
 #: ../libpurple/status.c:155
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -11753,93 +12073,93 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Klarte ikkje å lesa %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Ein feil oppstod under lesinga av %s. Dei er ikkje blitt lasta, og den gamle fila har fått namnet %s~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Reknar…"
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Ukjend."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d time"
 msgstr[1] "%s, %d timar"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutt"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutt"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Klarte ikkje å opna %s: vidaresendt for mange gonger"
 
-#: ../libpurple/util.c:3559
-#: ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587
+#: ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Klarte ikkje å kopla til %s"
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
 msgstr "Klarer ikkje å tildela nok minne til å halda på innhaldet frå %s. Nettenaren prøver kanskje å gjera noko vondskapsfullt."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Klarte ikkje å lesa frå %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Klarte ikkje å skriva frå %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
@@ -11865,37 +12185,37 @@
 msgstr "Panelorienteringa."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Innloggingsval"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Proto_koll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "L_okalt alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Brukarval"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Varsling av ny _e-post"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
@@ -11930,7 +12250,7 @@
 msgstr "SOCKS 5"
 
 #: ../pidgin/gtkaccount.c:967
-#: ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Bruk miljøinnstillingar"
 
@@ -11953,17 +12273,17 @@
 msgstr "Mellomtenarval"
 
 #: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
 #: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Vert:"
 
 #: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -11972,32 +12292,44 @@
 msgstr "Brukar_namn:"
 
 #: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "P_assord:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Klarte ikkje å lagra den nye kontoen"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Det finst allereie ein konto med dei kriteria."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Grunnleggjande"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Opprett denne nye kontoen på tenaren"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "A_vansert"
 
-#: ../pidgin/gtkaccount.c:1982
+#: ../pidgin/gtkaccount.c:1973
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12012,244 +12344,256 @@
 "\n"
 "Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna kontoar frå <b>Kontoar->Legg til/endra</b> i vennelistevindauget"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Gå inn i eit praterom"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Skriv inn nødvendig informasjon om praterommet du ønskjer å gå inn i.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792
-#: ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848
-#: ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797
+#: ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890
+#: ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 #: ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "A_vblokker"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Hent _info"
 
-#: ../pidgin/gtkblist.c:1135
-#: ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140
+#: ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Lynmelding"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Send fil"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Legg til venne_varsling"
 
-#: ../pidgin/gtkblist.c:1153
-#: ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262
-#: ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158
+#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#: ../pidgin/gtkblist.c:1170
-#: ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270
-#: ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275
+#: ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "A_lias…"
 
-#: ../pidgin/gtkblist.c:1173
-#: ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272
-#: ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277
+#: ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Legg til ein _venn"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Legg til eit samtale_rom"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkblist.c:1263
 #: ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:459
-#: ../pidgin/pidginstock.c:82
+#: ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303
+#: ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Slå saman"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: ../pidgin/gtkblist.c:1572
-#: ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576
-#: ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktøy/Demp lydar"
 
-#: ../pidgin/gtkblist.c:2044
-#: ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055
+#: ../pidgin/gtkconv.c:4823
 #: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Du kan ikkje leggja til vennen med den kontoen du nyttar no."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Vennar"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Vennar/Hent brukar_info…"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Vennar/Vis brukar_logg…"
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Vennar/Vis _fråkopla vennar"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Vennar/Vis _tomme grupper"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Vennar/Vis venne_detaljar"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Vennar/Vis fr_åkoplingstid"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Vennar/Vis"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Vennar/Vis/_Fråkopla vennar"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Vennar/Vis/_Tomme grupper"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Vennar/Vis/Venne_detaljar"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Vennar/Vis/Fr_åkoplingstid"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Vennar/Vis/_Protokollikon"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Vennar/Sort_er vennane"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Vennar/Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Vennar/Legg til _gruppe…"
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Vennar/Avsl_utt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-#: ../pidgin/gtkblist.c:2870
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontoar/Legg til\\/endra"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/Venne_varsling"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Verktøy/_Sertifikat"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Verktøy/System_logg"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktøy/_Demp lydar"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
-#: ../pidgin/gtkblist.c:2889
-#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12258,81 +12602,81 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Venne-alias"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Pålogga"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Skummelt"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Storarta"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Glimrande"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "UVerksam %dd  %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "UVerksam %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Uverksam %dm"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3590
-#: ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600
+#: ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Vennar/Hent brukar_informasjon…"
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Vennar/Legg til venn…"
 
-#: ../pidgin/gtkblist.c:3593
-#: ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603
+#: ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Vennar/Legg til gruppe…"
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Personvern"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Verktøy/Romliste"
 
 #
-#: ../pidgin/gtkblist.c:3729
+#: ../pidgin/gtkblist.c:3739
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12340,55 +12684,55 @@
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d ulesne meldingar frå %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manuelt"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alfabetisk "
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Etter status"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Etter loggstorleiken"
 
-#: ../pidgin/gtkblist.c:4018
+#: ../pidgin/gtkblist.c:4028
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s fråkopla"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Ta kontoen i bruk att "
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s fråkopla: %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Brukarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Innlogging"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Kontoar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12402,82 +12746,86 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Vennar/Vis fråkopla vennar"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/vennar/Vis tomme grupper"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Vennar/Vis vennedetaljar"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Vennar/Vis uverksam tid"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Vennar/Vis/Fråkopla vennar"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Vennar/Vis/Tomme grupper"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Vennar/Vis/Vennedetaljar"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Vennar/Vis/Uverksam tid"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Vennar/Vis/Protokollikon"
 
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:5501
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Skriv inn brukarnamnet til personen du ønskjer å leggja til i vennelista. Om du ønskjer det, kan du skriva inn eit alias eller eit kallenamn på vennen. Kallenamnet/aliaset blir då nytta i staden for brukarnamnet der det er mogleg.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkblist.c:5516
-#: ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558
+#: ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "Al_ias:"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollen støttar ikkje praterom."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Ingen av dei aktive kontoane kan nyttast til prat."
 
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5880
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Skriv inn eit kallenamn og høveleg informasjon om praterommet du ønskjer å leggja til i vennelista.\n"
 
-#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
-#: ../pidgin/gtkblist.c:6603
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646
+#: ../pidgin/gtkconv.c:3053
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Slå av"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ta konto i bruk"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Vennar/Sorter vennar"
 
@@ -12492,224 +12840,220 @@
 "\n"
 "%s vil ikkje prøva å kopla kontoen til att før du rettar feilen og slår på kontoen."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Ukjend kommando."
 
-#: ../pidgin/gtkconv.c:759
-#: ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734
+#: ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Den vennen nyttar ikkje same protokoll som dette praterommet."
 
-#: ../pidgin/gtkconv.c:779
+#: ../pidgin/gtkconv.c:754
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Du kan ikkje nytta nokon av dei aktive kontoane til å invitera denne vennen."
 
-#: ../pidgin/gtkconv.c:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri velkomstmelding."
 
-#: ../pidgin/gtkconv.c:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Venn:"
 
-#: ../pidgin/gtkconv.c:903
+#: ../pidgin/gtkconv.c:878
 #: ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Melding:"
 
-#: ../pidgin/gtkconv.c:960
-#: ../pidgin/gtkconv.c:2521
+#: ../pidgin/gtkconv.c:935
+#: ../pidgin/gtkconv.c:2576
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Klarte ikkje å opna fila."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:941
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Lagra samtale"
 
-#: ../pidgin/gtkconv.c:1151
+#: ../pidgin/gtkconv.c:1126
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Finn"
 
-#: ../pidgin/gtkconv.c:1177
+#: ../pidgin/gtkconv.c:1152
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "S_øk etter:"
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
-
-#: ../pidgin/gtkconv.c:1368
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1602
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1605
 msgid "Ignore"
 msgstr "Blokker"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1625
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1648
 msgid "Last said"
 msgstr "Sist sagt"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2584
 msgid "Unable to save icon file to disk."
 msgstr "Klarte ikkje å lagra ikonet."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2635
 msgid "Save Icon"
 msgstr "Lagra ikon"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2687
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2692
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2695
 msgid "Save Icon As..."
 msgstr "Lagra ikon som…"
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2699
 msgid "Set Custom Icon..."
 msgstr "Bruk eige ikon…"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2712
 msgid "Remove Custom Icon"
 msgstr "Fjern eige ikon"
 
+#: ../pidgin/gtkconv.c:2839
+msgid "Show All"
+msgstr "Vis alt"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2858
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2860
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2867
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis l_ogg"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Lagra _som…"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/T_øm skjermen"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _vennevarsling…"
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2877
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/Hent info_rmasjon"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2881
 msgid "/Conversation/M_ore"
 msgstr "/Samtale/_Meir"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2885
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/_Kallenamn…"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker…"
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/_Unblock..."
 msgstr "/Samtale/_Avblokker…"
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2891
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/Legg _til…"
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2893
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/F_jern…"
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Set inn _lenkje…"
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2900
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2906
+msgid "/Conversation/_Hide"
+msgstr "/Samtale/Skj_ul"
+
+#: ../pidgin/gtkconv.c:2908
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2912
 msgid "/_Options"
 msgstr "/_Val"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2913
 msgid "/Options/Enable _Logging"
 msgstr "/Val/Bruk l_ogging"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2914
 msgid "/Options/Enable _Sounds"
 msgstr "/Val/Bruk _lydar"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Val/Vis venne_ikon"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Val/Vis _formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Val/Vis _tidsstempel"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/More"
 msgstr "/Samtale/Meir"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3097
 msgid "/Options"
 msgstr "/Val"
 
@@ -12718,183 +13062,179 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3093
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3132
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation"
 msgstr "/Samtale"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til vennevarsling…"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter…"
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Kallenamn…"
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker…"
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3206
 msgid "/Conversation/Unblock..."
 msgstr "/Samtale/Avblokker…"
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til…"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern…"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Set inn lenkje…"
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/Val/Skru på logging"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/Vis/Skru på lyd"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3246
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Val/Vis formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Timestamps"
 msgstr "/Val/Vis tidsstempel"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Val/Vis venne_ikon"
-
-#: ../pidgin/gtkconv.c:3297
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3326
+#: ../pidgin/gtkconv.c:3368
 msgid "User is typing..."
 msgstr "Brukaren skriv…"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3371
 msgid "User has typed something and stopped"
 msgstr "Brukaren har skrive noko og stoppa"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525
-#: ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3554
+#: ../pidgin/gtkconv.c:7997
 msgid "_Send To"
 msgstr "Sen_d som"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4267
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4371
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
-#: ../pidgin/gtkconv.c:5609
-#: ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5739
+#: ../pidgin/gtkconv.c:5860
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rommet"
 msgstr[1] "%d personar i rommet"
 
-#: ../pidgin/gtkconv.c:6338
+#: ../pidgin/gtkconv.c:6461
 #: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Skriv"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6465
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6468
 msgid "Nick Said"
 msgstr "Kallenamnet sa"
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6471
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ulesne meldingar"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6474
 msgid "New Event"
 msgstr "Ny hending"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7547
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tømmer skjermen."
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7711
 msgid "Confirm close"
 msgstr "Stadfest lukking"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7743
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Du har ulesne meldingar. Vil du verkeleg lukka vindauget?"
 
-#: ../pidgin/gtkconv.c:8111
+#: ../pidgin/gtkconv.c:8330
 msgid "Close other tabs"
 msgstr "Lukk andre faner"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8336
 msgid "Close all tabs"
 msgstr "Lukk alle fanene"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8344
 msgid "Detach this tab"
 msgstr "Kopla frå denne fana"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8350
 msgid "Close this tab"
 msgstr "Lukk denne fana"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8850
 msgid "Close conversation"
 msgstr "Lukk samtala"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9449
 msgid "Last created window"
 msgstr "Siste opna vindauge"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9451
 msgid "Separate IM and Chat windows"
 msgstr "Skilde lynmeldings- og samtalevindauge"
 
-#: ../pidgin/gtkconv.c:9213
-#: ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9453
+#: ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Nytt vindauge"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9455
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9457
 msgid "By account"
 msgstr "Etter konto"
 
@@ -12960,7 +13300,7 @@
 msgstr "Alvorleg feil"
 
 #: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
@@ -12979,8 +13319,8 @@
 #: ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85
 #: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
 #: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "utviklar"
 
@@ -12992,506 +13332,514 @@
 msgid "support/QA"
 msgstr "brukarstøtte/KS"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "utviklar og nettansvarleg"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr "Senior bidragsytar/KS"
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "win32-port"
 
-#: ../pidgin/gtkdialogs.c:105
-#: ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "ansvarleg"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim-ansvarleg"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "utviklar og nettansvarleg"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hackar og fast sjåfør [sofatryne]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP-utviklar"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "opprinneleg laga av"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../pidgin/gtkdialogs.c:130
-#: ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Katalansk"
 
 # Valensiansk er *ikkje* katalansk, men eit eige språk i den katalanske språkfamilen. Molt important!
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valensiansk"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Tysk"
 
-#: ../pidgin/gtkdialogs.c:145
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Australsk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanadisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Britisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estisk"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Baskisk"
 
-#: ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persisk"
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Fransk"
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galisisk"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Gujarati-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonesisk"
 
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdisk"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norsk bokmål"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Nederlandsk, flamsk"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Brasiliansk-portugisisk"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albansk"
 
-#: ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T. M. Thanh og Gnome-Vi-laget"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Forenkla kinesisk"
 
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong-kinesisk"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "%s er ein grafisk, modulær meldingsklient basert på libpurple som er i stand til å kopla seg opp mot AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ - alle på éin gong. Han er skriven ved å nytta GTK+.<BR><BR>Du kan endra og vidareformidla programmet i samsvar med vilkåra i GPL (versjon 2 eller seinare). Ein kopi av GPL ligg i fila 'COPYING' som kjem saman med %s.  Opphavsretten til %s ligg hos bidragsytarane. Sjå i fila 'COPYRIGHT' for ei fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst form for garanti.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:399
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin på irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:404
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:419
 msgid "Crazy Patch Writers"
 msgstr "Rettarar"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:434
 msgid "Retired Developers"
 msgstr "Tidlegare utviklarar"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Crazy Patch Writers"
 msgstr "Pensjonerte, pasjonerte lappeskrivarar"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:464
 msgid "Artists"
 msgstr "Kunstnarar"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:479
 msgid "Current Translators"
 msgstr "Noverande omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:499
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:517
 msgid "Debugging Information"
 msgstr "Feilsøkingsinformasjon "
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:887
 msgid "Get User Info"
 msgstr "Hent brukarinfo"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:889
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Skriv inn brukar- eller kallenamnet til personen du ønskjer informasjon om."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "View User Log"
 msgstr "Les brukarlogg"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:981
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Skriv inn brukar- eller kallenamnet til personen du ønskjer å lesa loggen til."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1001
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 msgid "Enter an alias for this contact."
 msgstr "Før opp eit kallenamn (alias) for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1024
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Før opp eit kallenamn (alias) for %s."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Alias Buddy"
 msgstr "Vennealias"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1047
 msgid "Alias Chat"
 msgstr "Kallenamn praterom"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1048
 msgid "Enter an alias for this chat."
 msgstr "Før opp eit kallenamn for dette praterommet."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1087
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
 msgstr[0] "Du er i ferd med å fjerna kontakten som inneheld %s og %d annan venn frå vennelista di. Ønskjer du å halda fram?"
 msgstr[1] "Du er i ferd med å fjerna kontakten som inneheld %s og %d andre vennar frå vennelista di. Ønskjer du å halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1095
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1098
 msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1129
 #, c-format
 msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "Du er i ferd med å slå gruppa med namnet %s saman med gruppa %s. Vil du halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1136
 msgid "Merge Groups"
 msgstr "Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1139
 msgid "_Merge Groups"
 msgstr "_Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1189
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du ønskjer å fjerna gruppa %s og alle medlemmene i ho frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1192
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1195
 msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1228
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du ønskjer å fjerna %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1231
 msgid "Remove Buddy"
 msgstr "Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1234
 msgid "_Remove Buddy"
 msgstr "_Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1255
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du ønskjer å fjerna praterommet %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1258
 msgid "Remove Chat"
 msgstr "Fjern praterom"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1261
 msgid "_Remove Chat"
 msgstr "_Fjern praterom"
 
@@ -13601,7 +13949,7 @@
 
 #. Pause button
 #: ../pidgin/gtkft.c:832
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13610,44 +13958,44 @@
 msgid "_Resume"
 msgstr "_Hald fram"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
-#: ../pidgin/gtkimhtml.c:831
-#: ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Ta vekk formatering"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Farge til å teikna lenkje."
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Lenkjefarge når musa peikar på lenkja."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkja i nettlesar"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkje"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13657,7 +14005,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13667,7 +14015,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13678,7 +14026,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13689,127 +14037,195 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476
-#: ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Vel skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Vel tekstfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Vel bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_Nettadresse"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "Skil_dring"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "Skriv inn nettadressa og ei skildring av lenkja du ønskjer å leggja til. Det er valfritt å skriva inn ei skildring."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Skriv inn nettadressa du ønskjer å leggja til."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Legg til lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433
+#: ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Set inn"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Klarte ikkje å lagra bilete: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519
-#: ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539
+#: ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Legg til bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Temaet har ingen tilgjengelege smilefjes."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Smil!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820
-#: ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Grupper element"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Avgrupper element"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Feit"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Understreka"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Gjennomstreking"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Auk skriftstorleiken"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Minsk skriftstorleiken"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Skrifttype"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Forgrunnsfarge"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Nullstill formateringa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Legg til lynmeldingsbilete"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Legg til smilefjes"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Feit</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understrek</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Gjennomstreking</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Større</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Mindre</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "_Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Lenkje"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Horisontal strek"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
@@ -13957,47 +14373,47 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Opna alle meldingar"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d ny melding."
 msgstr[1] "%s har %d nye meldingar."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Du har %d ny e-postmelding.</b>"
 msgstr[1] "<b>Du har %d nye e-postmeldingar.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Nettlesarkommandoen \"%s\" er ugyldig."
 
-#: ../pidgin/gtknotify.c:969
-#: ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994
-#: ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959
+#: ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984
+#: ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Klarte ikkje å opna adressa"
 
-#: ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Klarte ikkje å starta \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
@@ -14048,100 +14464,100 @@
 msgstr "Vel ei fil"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Varsling for"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Vennenamn:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Lo_ggar på"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "L_oggar av"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "Går _vekk"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_Kjem attende etter å ha vore vekke"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Blir _uverksam"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Er ikkje uverksam lenger"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Begynner å skriva"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "Tek ein _pause under skrivinga"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Stansar skrivinga"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Opna eit lynmeldingsvindauge"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Sprett opp eit _varsel"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Send ei _melding"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Køyr ein _kommando"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Spel ein _lyd"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Førehands_vis"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Gjentakande"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Varslingsmål"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Standard"
 
@@ -14182,7 +14598,7 @@
 msgstr "_Skjul  nye lynmeldingssamtaler:"
 
 #: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:1941
 msgid "When away"
 msgstr "Når vekke"
 
@@ -14279,127 +14695,127 @@
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
 msgstr "Slik vil dei utgåande meldingane dine sjå ut når du nyttar protokollar som støttar formatering."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN-tenar:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adressa _automatisk"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Før opp _portrekkje det skal lyttast til"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Sluttp_ort:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Mellomtenar"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Inga mellomlagring"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "Br_ukar:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME-standard"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Sjølvvald"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "Opna _lenkje i:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Nettlesarstandard"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Eksisterande vindauge"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14408,63 +14824,63 @@
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Logg_format:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "L_oggfør alle lynmeldingar"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Loggfør alle sa_mtaler"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Lydval"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Stillaste"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Stillare"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Stille"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Høg"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Høgare"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Høgast"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1712
 msgid "Console beep"
 msgstr "Konsollyd"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1719
 msgid "No sounds"
 msgstr "Ingen lydar"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1727
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14473,81 +14889,81 @@
 "Lyd_kommando:\n"
 "(%s for filnamn)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1756
 msgid "Enable sounds:"
 msgstr "Bruk lydar:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1767
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1847
 msgid "Play"
 msgstr "Spel"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1924
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1938
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1942
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1950
 msgid "Change status when _idle"
 msgstr "_Endra tilstand når uverksam"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1954
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutt før ein blir uverksam:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1962
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1985
 msgid "Use status from last _exit at startup"
 msgstr "Bruk tilstanden frå _siste avslutning ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1991
 msgid "Status to a_pply at startup:"
 msgstr "Tilstand å _bruka ved oppstart:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Smiley Themes"
 msgstr "Smilefjestema"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2038
 msgid "Browser"
 msgstr "Nettlesar"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2042
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
@@ -14639,24 +15055,24 @@
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Fila finst allereie"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Vil du skriva over?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Vel nytt namn"
 
-#: ../pidgin/gtkrequest.c:1647
-#: ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Vel mappe…"
 
@@ -14698,7 +15114,7 @@
 msgstr "_Tittel:"
 
 #: ../pidgin/gtksavedstatuses.c:1177
-#: ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -14712,7 +15128,7 @@
 msgid "Sa_ve & Use"
 msgstr "L_agra og bruk"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
@@ -14725,61 +15141,61 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388
-#: ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398
+#: ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Følgjande feil oppstod ved lastinga av %s: %s"
 
-#: ../pidgin/gtkutils.c:1391
-#: ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Klarte ikkje å lagra biletet"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Klarer ikkje å senda mappe %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "%s kan ikkje overføra mapper. Du er nøydd til å senda filene deira enkeltvis."
 
-#: ../pidgin/gtkutils.c:1520
-#: ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Du har drege eit biete"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "Du kan senda dette biletet som ei filoverføring, veva det inn i denne meldinga, eller bruka det som eit venneikon for denne brukaren."
 
-#: ../pidgin/gtkutils.c:1527
-#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Bruk som venne-ikon"
 
-#: ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538
+#: ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Send biletfil"
 
-#: ../pidgin/gtkutils.c:1529
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Legg til i meldinga"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vil du velja det som venneikon for denne brukaren?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "Du kan senda dette biletet som ei filoverføring, eller bruka det som eit venneikon for denne brukaren."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "Du kan setja inn dette biletet i denne meldinga, eller bruka det som eit venneikon for denne brukaren"
 
@@ -14788,15 +15204,15 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Du drog ein arbeidsflatestartar. Truleg ønskte du å senda det oppstartaren peiker mot i staden for oppstartaren sjølv."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14807,25 +15223,25 @@
 "<b>Filstorleik:</b> %s\n"
 "<b>Biletstorleik:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fila '%s' er for stor for %s. Prøv eit mindre bilete.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikon-feil"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Klarte ikkje å bruka ikonet"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikkje å opna fila '%s': %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "Klarte ikkje å lasta biletet '%s': grunnen er ikkje kjend, men er truleg grunna ei øydelagt biletfil"
@@ -14839,31 +15255,31 @@
 msgid "Select color"
 msgstr "Vel farge"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "A_lias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Lukk _faner"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Hent _informasjon"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Inviter"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Endra"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-smilefjes"
 
@@ -15029,18 +15445,6 @@
 msgid "Select Color for %s"
 msgstr "Vel farge for %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Feit"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Understreka"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ign_orer innkomande format"
@@ -15345,12 +15749,12 @@
 msgstr "Trekk markeringslinja i "
 
 #: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Lynmeldingsvindauge"
 
 #: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Samtalevindauge"
 
@@ -15362,32 +15766,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Musikkmeldingsøkta er stadfesta."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Musikkmeldingar"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Det oppstod ein konflikt under kjøringa av kommandoen:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Klarte ikkje å lasta skriveprogrammet"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Følgande feil har oppstått:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Musikkmeldingsinnstillingar"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Filbane til notearkbehandlaren"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Bruk"
 
@@ -15399,84 +15803,84 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musikkmeldingstillegg for samkomponering."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
 msgstr "Musikkmeldingstillegget tillèt fleire brukarar å arbeida samstundes på eit musikkstykke ved å endra eit felles noteark i sanntid."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Nytt varsel for"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Berre når nokon seier brukarnamnet ditt"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fokuserte vindauge"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Varslingsmåtar"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Legg til _tekst i tittellinja til vindauget:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Viser _talet på nye meldingar i vindaugstittelen"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Legg til talet på nye meldingar i _X-eigenskapen"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Plasserer eit \"_KRITISK\"-hint i vindaugsstyraren"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Hev samtalevindauge"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Varslingsfjerning"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Fjern når vindauget får _fokus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern når det blir _klikka i vindauget"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern når det blir _skrive i vindauget"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Fjern når ei _melding blir sendt"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Fjern når samtalef_ana får fokus "
 
@@ -15486,7 +15890,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Meldingsvarsling"
 
@@ -15494,8 +15898,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904
-#: ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Gjev varsel om uleste meldingar på fleire måtar."
 
@@ -15855,43 +16259,43 @@
 msgstr "Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for samtaler og loggmeldingar."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Ugjennomskin:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Samtalevindauge for lynmeldingar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_Gjennomsiktige lynmeldingsvindauge"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "Vis _glidefelt i lynmeldingsvindauga"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "Ta vekk transparens i lynmeldingsvindauge ved fokus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Alltid øvst"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Vennelista"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "Gjennomsiktig _venneliste"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Ta vekk transparens i vennelistevindauge ved fokus"
 
@@ -15901,19 +16305,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Gjennomsikt"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabel gjennomsikt i vennelista og samtalevindauga."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
@@ -15923,47 +16327,47 @@
 "\n"
 "*Merk: Tillegget krev Windows 2000 eller seinare utgåver."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ kjøremiljøversjon"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Oppstart"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s saman med Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Vennelista kan _festast"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Hald vennelistevindauget øvst:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Berre når festa"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "La vindauget _blinka når det kjem nye meldingar"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin-val"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av vennelista."
 
diff -ru pidgin-2.1.1/po/pa.po pidgin-2.2.0/po/pa.po
--- pidgin-2.1.1/po/pa.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/pa.po	2007-09-14 00:45:43.000000000 -0400
@@ -10385,7 +10385,7 @@
 msgstr "ਕਿਹੜਾ ID ਸਰਗਰਮ ਕਰਨਾ ਹੈ?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3239
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਕੌਣ ਸ਼ਾਮਿਲ ?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3251
diff -ru pidgin-2.1.1/po/pl.po pidgin-2.2.0/po/pl.po
--- pidgin-2.1.1/po/pl.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/pl.po	2007-09-14 00:45:43.000000000 -0400
@@ -11665,7 +11665,7 @@
 msgstr "Które ID aktywować?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Kogo przyłączyć do konferencji?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/POTFILES.in pidgin-2.2.0/po/POTFILES.in
--- pidgin-2.1.1/po/POTFILES.in	2007-08-20 14:13:00.000000000 -0400
+++ pidgin-2.2.0/po/POTFILES.in	2007-09-14 00:45:41.000000000 -0400
@@ -2,6 +2,7 @@
 finch/finch.c
 finch/gntaccount.c
 finch/gntblist.c
+finch/gntcertmgr.c
 finch/gntconn.c
 finch/gntconv.c
 finch/gntdebug.c
@@ -34,6 +35,7 @@
 finch/plugins/lastlog.c
 libpurple/account.c
 libpurple/blist.c
+libpurple/certificate.c
 libpurple/connection.c
 libpurple/conversation.c
 libpurple/dbus-server.c
@@ -61,9 +63,9 @@
 libpurple/plugins/psychic.c
 libpurple/plugins/signals-test.c
 libpurple/plugins/simple.c
-libpurple/plugins/ssl/ssl.c
 libpurple/plugins/ssl/ssl-gnutls.c
 libpurple/plugins/ssl/ssl-nss.c
+libpurple/plugins/ssl/ssl.c
 libpurple/plugins/statenotify.c
 libpurple/plugins/tcl/tcl.c
 libpurple/protocols/bonjour/bonjour.c
@@ -75,6 +77,7 @@
 libpurple/protocols/irc/irc.c
 libpurple/protocols/irc/msgs.c
 libpurple/protocols/irc/parse.c
+libpurple/protocols/jabber/adhoccommands.c
 libpurple/protocols/jabber/auth.c
 libpurple/protocols/jabber/buddy.c
 libpurple/protocols/jabber/chat.c
@@ -85,6 +88,8 @@
 libpurple/protocols/jabber/presence.c
 libpurple/protocols/jabber/roster.c
 libpurple/protocols/jabber/si.c
+libpurple/protocols/jabber/usermood.c
+libpurple/protocols/jabber/usernick.c
 libpurple/protocols/jabber/xdata.c
 libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
@@ -96,6 +101,9 @@
 libpurple/protocols/msn/state.c
 libpurple/protocols/msn/switchboard.c
 libpurple/protocols/msn/userlist.c
+libpurple/protocols/myspace/myspace.c
+libpurple/protocols/myspace/user.c
+libpurple/protocols/myspace/zap.c
 libpurple/protocols/novell/nmuser.c
 libpurple/protocols/novell/novell.c
 libpurple/protocols/oscar/flap_connection.c
@@ -144,17 +152,18 @@
 libpurple/protocols/simple/simple.c
 libpurple/protocols/toc/toc.c
 libpurple/protocols/yahoo/yahoo.c
-libpurple/protocols/yahoo/yahoochat.c
 libpurple/protocols/yahoo/yahoo_doodle.c
 libpurple/protocols/yahoo/yahoo_filexfer.c
 libpurple/protocols/yahoo/yahoo_packet.c
 libpurple/protocols/yahoo/yahoo_profile.c
+libpurple/protocols/yahoo/yahoochat.c
 libpurple/protocols/yahoo/ycht.c
 libpurple/protocols/zephyr/zephyr.c
 libpurple/proxy.c
 libpurple/request.h
 libpurple/savedstatuses.c
 libpurple/server.c
+libpurple/sslconn.c
 libpurple/status.c
 libpurple/util.c
 pidgin.desktop.in
@@ -162,6 +171,7 @@
 pidgin/gtkaccount.c
 pidgin/gtkblist.c
 pidgin/gtkcellview.c
+pidgin/gtkcertmgr.c
 pidgin/gtkconn.c
 pidgin/gtkconv.c
 pidgin/gtkdebug.c
@@ -185,8 +195,8 @@
 pidgin/gtkstatusbox.c
 pidgin/gtkutils.c
 pidgin/gtkwhiteboard.c
-pidgin/pidgincombobox.c
 pidgin/pidgin.h
+pidgin/pidgincombobox.c
 pidgin/pidginstock.c
 pidgin/pixmaps/emotes/default/24/default.theme.in
 pidgin/pixmaps/emotes/none/none.theme.in
@@ -198,11 +208,11 @@
 pidgin/plugins/gevolution/add_buddy_dialog.c
 pidgin/plugins/gevolution/assoc-buddy.c
 pidgin/plugins/gevolution/eds-utils.c
-pidgin/plugins/gevolution/gevolution.c
 pidgin/plugins/gevolution/gevo-util.c
+pidgin/plugins/gevolution/gevolution.c
 pidgin/plugins/gevolution/new_person_dialog.c
-pidgin/plugins/gtkbuddynote.c
 pidgin/plugins/gtk-signals-test.c
+pidgin/plugins/gtkbuddynote.c
 pidgin/plugins/history.c
 pidgin/plugins/iconaway.c
 pidgin/plugins/mailchk.c
diff -ru pidgin-2.1.1/po/ps.po pidgin-2.2.0/po/ps.po
--- pidgin-2.1.1/po/ps.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/ps.po	2007-09-14 00:45:43.000000000 -0400
@@ -13801,7 +13801,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "چه سره ګپ شپ کول غواړی؟"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:3224
diff -ru pidgin-2.1.1/po/pt_BR.po pidgin-2.2.0/po/pt_BR.po
--- pidgin-2.1.1/po/pt_BR.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/pt_BR.po	2007-09-14 00:45:43.000000000 -0400
@@ -3,12 +3,13 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-16 01:21-0300\n"
-"PO-Revision-Date: 2007-08-16 01:21-0300\n"
+"POT-Creation-Date: 2007-09-14 00:00-0300\n"
+"PO-Revision-Date: 2007-09-14 00:00-0300\n"
 "Last-Translator: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -62,13 +63,15 @@
 "investigar e completar a migração manualmente. Pedimos também que você "
 "relate este erro em http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1514
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -84,74 +87,78 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Lembrar senha"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Não há nenhum plugin de protocolo instalado."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Provavelmente você esqueceu de digitar 'make install')"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../finch/gntaccount.c:495 ../finch/gntconn.c:135
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nome de usuário:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:888 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2447
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -163,12 +170,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -185,110 +192,112 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:1010 ../pidgin/gtkdialogs.c:1034
+#: ../pidgin/gtkdialogs.c:1056 ../pidgin/gtkdialogs.c:1104
+#: ../pidgin/gtkdialogs.c:1145 ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkdialogs.c:1267
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Remover conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Você pode ativar/desativar as contas a partir da lista abaixo."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:887 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1667
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Adicionar"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:810 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:943 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:968 ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:975 ../finch/gntaccount.c:1002
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Negar"
 
@@ -312,19 +321,19 @@
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1033 ../pidgin/gtkdialogs.c:1055
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Apelido"
@@ -333,11 +342,11 @@
 msgid "Group"
 msgstr "Grupo"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Conta"
 
@@ -350,7 +359,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
@@ -364,9 +373,10 @@
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:923
+#: ../libpurple/protocols/jabber/jabber.c:926
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -378,7 +388,7 @@
 msgid "Auto-join"
 msgstr "Entrar automaticamente"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
@@ -401,8 +411,8 @@
 msgstr "Um grupo com este nome já existe."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Criar grupo"
 
@@ -434,7 +444,7 @@
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:506
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -445,10 +455,10 @@
 msgstr "Adicionar ação de usuário"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:518
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1602
+#: ../pidgin/gtkconv.c:1615
 msgid "Send File"
 msgstr "Enviar arquivo"
 
@@ -491,15 +501,15 @@
 msgid "Confirm Remove"
 msgstr "Confirmar remoção"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1651 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1664 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
@@ -513,15 +523,20 @@
 msgstr "(Des)ativar marca"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/jabber.c:936
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -531,29 +546,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Inativo"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "No celular"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -562,12 +577,12 @@
 "Conectados: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Conta: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -576,50 +591,54 @@
 "\n"
 "Visto pela última vez: %s atrás"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:740
+#: ../pidgin/gtkdialogs.c:879 ../pidgin/gtkdialogs.c:960
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:745
+#: ../pidgin/gtkdialogs.c:884 ../pidgin/gtkdialogs.c:965
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:753
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:755
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa para quem você deseja mandar "
 "mensagens instantâneas."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntconn.c:134
+#: ../finch/gntnotify.c:79 ../libpurple/account.c:1003
+#: ../libpurple/account.c:1253 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -636,54 +655,166 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4022
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:758
+#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Exibir grupos vazios"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Exibir amigos desconectados"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Ordenar por status"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Ordenar alfabeticamente"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Ordenar por tamanho do log"
 
-#: ../finch/gntconn.c:110
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Importação de certificado"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Especifique um nome de host"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Digite o nome de host para o qual este certificado será gerado."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"O arquivo %s não pôde ser importado.\n"
+"Verifique que este arquivo pode ser acessado e que ele está no formato PEM.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Erro ao importar certificado"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "Falha ao importar certificado X.509"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Selecione um certificado PEM"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Falha ao exportar para o arquivo %s.\n"
+"Verifique se você tem permissão de escrita na pasta de destino\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Erro ao exportar certificado"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "Falha ao exportar certificado X.509"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "Exportar certificado PEM X.509"
+
+#: ../finch/gntcertmgr.c:187
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificado de %s"
+
+#: ../finch/gntcertmgr.c:194
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Nome usual: %s\n"
+"\n"
+"Impressão digital SHA1:\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197
+msgid "SSL Host Certificate"
+msgstr "Certificado SSL do host"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Tem certeza de que deseja deletar o certificado de %s?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
+msgid "Confirm certificate delete"
+msgstr "Confirmação de remoção de certificado"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:601
+msgid "Certificate Manager"
+msgstr "Gerenciador de certificados"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Nome do host"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1643
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Info"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Fechar"
+
+#: ../finch/gntconn.c:123
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:114
+#: ../finch/gntconn.c:127
 #, c-format
 msgid ""
 "%s\n"
@@ -696,43 +827,51 @@
 "O Finch não tentará reconectar esta conta até que você corrija o erro e "
 "reative a mesma."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconn.c:136 ../pidgin/gtkblist.c:4038
+msgid "Re-enable Account"
+msgstr "Re-ativar conta"
+
+#: ../finch/gntconv.c:138
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:142 ../pidgin/gtkconv.c:488
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:501
+#: ../finch/gntconv.c:147 ../pidgin/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:152 ../pidgin/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:511
+#: ../finch/gntconv.c:155 ../pidgin/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:516
+#: ../finch/gntconv.c:159 ../pidgin/gtkconv.c:509
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:167
+msgid "Message was not sent, because you are not signed on."
+msgstr "A mensagem não pôde ser enviada porque você não está conectado."
+
+#: ../finch/gntconv.c:250
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:273
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:278 ../finch/gntconv.c:772
 #, c-format
 msgid ""
 "\n"
@@ -741,48 +880,69 @@
 "\n"
 "%s está digitando..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:297
 msgid "You have left this chat."
 msgstr "Você saiu deste bate-papo."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:386 ../pidgin/gtkconv.c:1370
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
+"gravadas."
+
+#: ../finch/gntconv.c:392 ../pidgin/gtkconv.c:1378
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
+"gravadas."
+
+#: ../finch/gntconv.c:441
 msgid "Send To"
 msgstr "Enviar para"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:485
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:491
 msgid "Clear Scrollback"
 msgstr "Limpar tela"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:495 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Exibir marcações de tempo"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:511
 msgid "Add Buddy Pounce..."
 msgstr "Adicionar ação de usuário..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:526
+msgid "Enable Logging"
+msgstr "Ativar gravação de conversas"
+
+#: ../finch/gntconv.c:532
+msgid "Enable Sounds"
+msgstr "Ativar sons"
+
+#: ../finch/gntconv.c:738
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-RESPOSTA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:860
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:338
+#: ../finch/gntconv.c:1022 ../pidgin/gtkconv.c:330
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1058 ../pidgin/gtkconv.c:380
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:390
+#: ../finch/gntconv.c:1061 ../pidgin/gtkconv.c:383
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -790,7 +950,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1119 ../pidgin/gtkconv.c:7564
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -798,12 +958,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1122 ../pidgin/gtkconv.c:7567
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1125 ../pidgin/gtkconv.c:7570
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -811,43 +971,43 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7355
+#: ../finch/gntconv.c:1128 ../pidgin/gtkconv.c:7573
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7361
+#: ../finch/gntconv.c:1131 ../pidgin/gtkconv.c:7579
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1134
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Exibe a lista dos usuários que estão no bate-papo."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1139
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra a janela de plugins."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1142
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de amigos."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1145
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra a janela de contas."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1148
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra a janela de depuração."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1151
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra a janela de preferências"
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1154
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra a janela de status salvos."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -873,99 +1033,95 @@
 msgstr "Transferências de arquivo - %d%% de %d arquivos"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferências de arquivos"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Tamanho"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Restante"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Feche esta janela quando todas as transferências terminarem"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Limpar transferências concluídas"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Parar"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Fechar"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Cancelada"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Falhou"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "O arquivo foi salvo como %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -977,11 +1133,11 @@
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Assunto"
 
@@ -992,17 +1148,17 @@
 msgstr[0] "%s (%s) tem %d nova mensagem."
 msgstr[1] "%s (%s) tem %d novas mensagens."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Novo e-mail"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Informações de %s:"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informações do amigo"
 
@@ -1010,11 +1166,7 @@
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1630 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Info"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1591
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1604
 msgid "IM"
 msgstr "MI"
 
@@ -1022,7 +1174,7 @@
 msgid "Join"
 msgstr "Entrar"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Convidar"
 
@@ -1081,7 +1233,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -1089,7 +1241,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Favor digitar o amigo que terá a ação."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nova ação de usuário"
@@ -1103,7 +1254,7 @@
 msgstr "Quem terá a ação"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1112,7 +1263,7 @@
 msgstr "Nome do amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Executar quando o amigo..."
 
@@ -1157,7 +1308,7 @@
 msgstr "Enviar uma mensagem"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Ação"
 
@@ -1185,70 +1336,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Executar apenas quando meu status for indisponível"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Não foi possível criar ação de usuário"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Você não tem nenhuma conta."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Você precisa criar uma conta antes de poder criar uma ação de usuário."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Você tem certeza de que deseja remover a ação sobre %s de %s?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Ações de usuário"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para você (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pausou ao digitar para você (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para você (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de ação desconhecido. Por favor reporte isso!"
 
@@ -1256,12 +1419,12 @@
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
@@ -1311,119 +1474,119 @@
 msgstr "Mudar status para"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Logs"
 
-#: ../finch/gntrequest.c:563
+#: ../finch/gntrequest.c:582
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:658 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:658 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Amigo conecta"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Amigo desconecta"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Mensagem recebida inicia conversa"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Pessoa entra no bate-papo"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Pessoa sai do bate-papo"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Você fala no bate-papo"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Outros falam no bate-papo"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Alguém diz seu nome no bate-papo"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "Falha no GStreamer"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer não pôde ser inicializado."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(padrão)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Selecionar arquivo de som..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Preferências de som"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Bipe do console"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Sem sons"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Método:"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1433,55 +1596,55 @@
 "(%s para nome do arquivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Opções de som"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Emitir sons quando a janela da conversa ganhar foco"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Evento"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Arquivo"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Testar"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Escolher..."
 
@@ -1498,9 +1661,9 @@
 msgid "Saved Statuses"
 msgstr "Status salvos"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1510,46 +1673,55 @@
 msgid "Type"
 msgstr "Tipo"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Mensagem:"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Usar"
 
@@ -1561,56 +1733,79 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Favor digitar um título não-vazio para o status."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Título duplicado duplicada"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Favor digitar um título diferente para o status."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Mensagem:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Editar status"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Usar status diferente para as seguintes contas"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Salvar e usar"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificados"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Status"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Erro ao carregar o plugin."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Não foi possível encontrar o servidor X"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Não foi possível encontrar a janela"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+"O plugin não pôde ser carregado porque este não foi compilado com suporte ao "
+"X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Plugin da área de transferência"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1736,86 +1931,88 @@
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Uma senha é necessária para conectar-se."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Digite a senha para %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Erro de conexão"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Senha original"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Nova senha"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Favor digitar sua senha atual e sua nova senha."
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar informações do usuário para %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Definir informações de usuário"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3237 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -1823,22 +2020,186 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(NÃO COINCIDE)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s enviou este certificado de uso único:"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Nome usual: %s %s\n"
+"Impressão digital (SHA1): %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Verificação de certificado de uso único"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Autoridades de certificação"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "Cache dos pares SSL"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Aceitar certificado de %s?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "Verificação do certificado SSL"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Aceitar"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Rejeitar"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_Ver certificado..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"O certificado enviado por \"%s\" diz vir de \"%s\". Isto significa que você "
+"pode não estar conectando ao serviço que pensa estar."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser "
+"verificado automaticamente."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "A cadeia de certificados enviada para %s não é válida."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "Erro no certificado SSL"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Cadeia de certificado inválida"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"você não tem um banco de dados de certificados raiz, logo este certificado "
+"não pode ser validado."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"O certificado raiz que expediu este certificado não é conhecido pelo Pidgin."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"A cadeia de certificado apresentada por %s não tem uma assinatura digital "
+"válida vinda da Autoridade de Certificação do qual ele diz ter uma "
+"assinatura."
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Assinatura de autoridade de certificação inválida"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Nome usual: %s\n"
+"\n"
+"Impressão digital (SHA1): %s\n"
+"\n"
+"Data de ativação: %s\n"
+"Data de expiração: %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Informações do certificado"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Erro ao registrar"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Erro ao desregistrar"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s conectou"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectou"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2335
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1862,40 +2223,40 @@
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Enviar mensagem"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "Envia_r mensagem"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Você mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mudou seu apelido para %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s saiu da sala."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saiu da sala (%s)."
@@ -2418,12 +2779,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2468,8 +2829,8 @@
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "Anotações"
 
@@ -2893,7 +3254,7 @@
 "O resto das mensagens será salvo como ações. Você pode alterar/remover as "
 "ações a partir da caixa de diálogo `Ações de usuário'"
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2902,19 +3263,19 @@
 "\"%s\" está desconectado. Você deseja salvar o resto das mensagens como uma "
 "ação e enviá-las automaticamente quando \"%s\" conectar-se novamente?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensagem desconectada"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Você pode alterar/excluir a ação a partir da caixa de diálogo `Ações de "
 "usuário'"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2924,9 +3285,9 @@
 msgid "Yes"
 msgstr "Sim"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2936,11 +3297,11 @@
 msgid "No"
 msgstr "Não"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Salvar mensagens offline como ações"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Não perguntar. Sempre salvar como ações."
 
@@ -3035,23 +3396,30 @@
 msgid "Tests to see that most things are working."
 msgstr "Verifica se a maioria das coisas estão funcionando."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
+msgid "X.509 Certificates"
+msgstr "Certificados X.509"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "Fornece um envoltório para as bibliotecas de suporte à SSL."
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Fornece suporte a SSL através do GNUTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -3059,18 +3427,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Fornece suporte a SSL através do GNUTLS."
+#: ../libpurple/plugins/ssl/ssl-nss.c:813
+#: ../libpurple/plugins/ssl/ssl-nss.c:815
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
 #. *< type
 #. *< ui_requirement
@@ -3078,18 +3446,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Fornece suporte a SSL através do Mozilla NSS."
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "Fornece um envoltório para as bibliotecas de suporte à SSL."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3184,25 +3551,25 @@
 "rodando?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2214
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3211,13 +3578,13 @@
 msgid "E-Mail"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Conta do AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Conta do XMPP"
 
@@ -3231,27 +3598,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Nome do host"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:931
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3263,38 +3621,38 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:383
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:435
-#: ../libpurple/protocols/bonjour/jabber.c:658
-#: ../libpurple/protocols/bonjour/jabber.c:676
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-#: ../libpurple/protocols/bonjour/jabber.c:581
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Erro ao definir as opções do socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:613
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:621
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1828
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1828
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3364,47 +3722,49 @@
 msgid "Registration completed successfully!"
 msgstr "O registro foi concluído com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:912
+#: ../libpurple/protocols/jabber/jabber.c:915
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Password"
 msgstr "Senha"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Senha (redigitar)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Digite o token atual"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Token atual"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Por favor, preencha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:956
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3412,242 +3772,242 @@
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Homem ou mulher"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Masculino"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Feminino"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Apenas conectado"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Favor digitar seu critério de busca abaixo"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Preencha os campos."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Sua senha atual é diferente da senha que você especificou."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Não foi possível alterar a senha. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Mudar senha da conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Senha atual"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Alterar a senha do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selecione o bate-papo para o amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Disponível"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Páginas amarelas do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Nenhum usuário compatível encontrado"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos transferida"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Sua lista de amigos foi transferida do servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos enviada"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Falha na conexão."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Não conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Alterar senha..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Enviar lista de amigos para o servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
@@ -3662,16 +4022,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Cliente de mensagens instantâneas popular na Polônia"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
@@ -3728,7 +4088,8 @@
 msgstr "Mensagem do dia (MOTD) para %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2349
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
@@ -3742,7 +4103,7 @@
 msgstr "_Canal:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Senha:"
 
@@ -3750,65 +4111,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Apelidos do IRC não podem conter espaços"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1279
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:609
+#: ../libpurple/protocols/jabber/jabber.c:1094
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2462
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Falha na conexão"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Falha na negociação SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2345
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuários"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Tópico"
 
@@ -3820,47 +4178,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que é menos ruim"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codificações"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:903
+#: ../libpurple/protocols/jabber/jabber.c:906
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3876,7 +4235,7 @@
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3886,7 +4245,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -3917,7 +4276,7 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4200,7 +4559,7 @@
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2260
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -4330,6 +4689,22 @@
 msgid "Disconnected."
 msgstr "Desconectado."
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:670
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:1886
+msgid "Unknown Error"
+msgstr "Erro desconhecido"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+msgid "Ad-Hoc Command Failed"
+msgstr "Comando ad-hoc falhou"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
+msgid "execute"
+msgstr "execute"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
@@ -4341,8 +4716,8 @@
 msgstr ""
 "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4351,33 +4726,33 @@
 "%s requer autenticação via texto puro sobre uma conexão não criptografada. "
 "Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:596
+#: ../libpurple/protocols/jabber/auth.c:597
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:608
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não utiliza nenhum método de autenticação suportado"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:559
+#: ../libpurple/protocols/jabber/auth.c:774
+#: ../libpurple/protocols/jabber/auth.c:915
+#: ../libpurple/protocols/jabber/auth.c:940
+#: ../libpurple/protocols/jabber/auth.c:959
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "O servidor retornou uma resposta inválida."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:598
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4385,113 +4760,114 @@
 "O servidor requer autenticação via texto puro sobre uma conexão não "
 "criptografada. Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:818
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identificação inválida"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:890
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:976
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Endereço (Rua)"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Região"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Nome da organização"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Grupo de trabalho"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Função"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Data de nascimento"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descrição"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard do XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4499,116 +4875,385 @@
 "Todos os itens a seguir são opcionais. Preencha apenas as informações que "
 "quiser."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operacional"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
-msgid "Resource"
-msgstr "Recurso"
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Última atividade"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Informações da localização de serviços"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
-msgid "Priority"
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Itens da localização de serviços"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Endereçamento de Stanza estendido"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Bate-papo multiusuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Informações estendidas de presença em bate-papos multiusuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "Bytestreams In-Band"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Comandos ad-hoc"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "Serviço PubSub"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "Bytestreams via SOCKS5"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Suporte a dados 'out of band'"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "Registro 'In-Band'"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Localização do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Imagem de exibição do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Notificações do status do bate-papo"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Versão do software"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Inicialização de fluxoOrientação"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Transferência de arquivo"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Humor do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Atividade do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Recursos do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Negociação de sessão criptografada"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "Música do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr "Troca de itens da lista de amigos"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr "Endereço de contato"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Perfil do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Áudio do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Apelido do usuário"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "ECI UDP do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "ECI TCP do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr "UDP puro do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Vídeo do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Discagem a tom do Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Recibos de mensagem"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Publicação de chave pública"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "Notificação de bate-papos"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "Notificação de onde está navegando"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "Notificação do que está jogando"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "Notificação do que está assistindo"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Criptografia de Stanza"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Informações de horário"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Entrega atrasada"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Objetos de dados colaborativos"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "Compartilhamento e repositório de arquivos"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Serviço de descoberta STUN para o Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Negociação de sessão criptografada simplificada"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Verificação de saltos"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Recursos"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
+msgid "Resource"
+msgstr "Recurso"
+
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome do meio"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Endereço"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Caixa postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "(Re-)requisitar autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Parar de monitorar a presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Conectar"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Desconectar"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1621
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2206
 msgid "JID"
 msgstr "ID Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2242
 msgid "The following are the results of your search"
 msgstr "Os seguintes são os resultados da sua busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2317
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4616,71 +5261,71 @@
 "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: "
 "Todos os campos suportam caracteres coringa (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2337
 msgid "Directory Query Failed"
 msgstr "A consulta ao serviço de diretório falhou"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2338
 msgid "Could not query the directory server."
 msgstr "Não foi possível consultar o servidor do serviço de diretório."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2372
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruções do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2379
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Preencha um ou mais campos para procurar um usuário XMPP que satisfaça este "
 "critério."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2399
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/jabber/buddy.c:2409
 msgid "Search for XMPP users"
 msgstr "Procurar por usuários XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2410
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2425
 msgid "Invalid Directory"
 msgstr "Diretório inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Enter a User Directory"
 msgstr "Digite um diretório de usuários"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2443
 msgid "Select a user directory to search"
 msgstr "Selecione um diretório de usuários para procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2446
 msgid "Search Directory"
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "Sa_la:"
 
@@ -4770,25 +5415,29 @@
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr "Erro ao inicializar sessão"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:144
+msgid "You require encryption, but it is not available on this server."
+msgstr "Você requereu criptografia, mas este servidor não a suporta."
+
+#: ../libpurple/protocols/jabber/jabber.c:258
+#: ../libpurple/protocols/jabber/jabber.c:311
+#: ../libpurple/protocols/jabber/jabber.c:339
 msgid "Write error"
 msgstr "Erro ao enviar"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:407
+#: ../libpurple/protocols/jabber/jabber.c:444
 msgid "Read Error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:481
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4797,55 +5446,70 @@
 "Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:528
 msgid "Unable to create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:574
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:579
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:655
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:661
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Registro em %s efetuado com sucesso"
+
+#: ../libpurple/protocols/jabber/jabber.c:663
+#: ../libpurple/protocols/jabber/jabber.c:664
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Erro desconhecido"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:673
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:691
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Remoção do registro de %s efetuada com sucesso"
+
+#: ../libpurple/protocols/jabber/jabber.c:693
+#: ../libpurple/protocols/jabber/jabber.c:694
+msgid "Unregistration Successful"
+msgstr "Desregistro efetuado com sucesso"
+
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:703
+msgid "Unregistration Failed"
+msgstr "Desregistro falhou"
+
+#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:961
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:966
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:971
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4855,377 +5519,543 @@
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:981
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:986
+msgid "Unregister"
+msgstr "Desregistrar"
+
+#: ../libpurple/protocols/jabber/jabber.c:993
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Por favor preencha as informações abaixo para mudar seu registro de conta."
+
+#: ../libpurple/protocols/jabber/jabber.c:996
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1005
 msgid "Register New XMPP Account"
 msgstr "Registrar nova conta do XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1015
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1011
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Modificar registro de conta em %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Registrar nova conta em %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1015
+msgid "Change Registration"
+msgstr "Mudar registro"
+
+#: ../libpurple/protocols/jabber/jabber.c:1119
+#: ../libpurple/protocols/jabber/jabber.c:1120
+msgid "Error unregistering account"
+msgstr "Erro ao desregistrar conta"
+
+#: ../libpurple/protocols/jabber/jabber.c:1125
+#: ../libpurple/protocols/jabber/jabber.c:1126
+msgid "Account successfully unregistered"
+msgstr "Conta desregistrada com sucesso"
+
+#: ../libpurple/protocols/jabber/jabber.c:1283
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1288
+msgid "Initializing SSL/TLS"
+msgstr "Inicializando SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1292
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:1908
+#: ../libpurple/protocols/jabber/jabber.c:1944
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1441
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1443
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1448
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1450
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1452
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1455
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Humor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Mood Text"
+msgstr "Humor (texto)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Artist"
+msgstr "Artista da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Title"
+msgstr "Título da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Album"
+msgstr "Álbum da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Genre"
+msgstr "Gênero da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Comment"
+msgstr "Comentário da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune Track"
+msgstr "Faixa da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Time"
+msgstr "Duração da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Year"
+msgstr "Ano da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune URL"
+msgstr "URL da música"
+
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+msgid "Allow Buzz"
+msgstr "Permitir que chamem sua atenção"
+
+#: ../libpurple/protocols/jabber/jabber.c:1664
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1669
+#: ../libpurple/protocols/jabber/jabber.c:1670
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1727
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/jabber.c:1734
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1734
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1748
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1753
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1758
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1844
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1848
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1850
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1854
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1856
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1858
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1860
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1862
 msgid "Not Allowed"
 msgstr "Não permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid "Payment Required"
 msgstr "Pagamento requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1868
 msgid "Recipient Unavailable"
 msgstr "Destinatário indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1872
 msgid "Registration Required"
 msgstr "Registro requerido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1874
 msgid "Remote Server Not Found"
 msgstr "Servidor remoto não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1876
 msgid "Remote Server Timeout"
 msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "Server Overloaded"
 msgstr "Servidor sobrecarregado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1880
 msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1882
 msgid "Subscription Required"
 msgstr "Inscrição requerida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1884
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1910
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1919
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1921
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1926
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Invalid Namespace"
 msgstr "Namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Non-matching Hosts"
 msgstr "Hosts não compatíveis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2051
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2071
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2076
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2095
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2153
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2184
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Não foi possível verificar presença de usuário %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#: ../libpurple/protocols/jabber/jabber.c:2216
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+"Não foi possível chamar a atenção de %s, pois nada é conhecido sobre ele(a)."
+
+#: ../libpurple/protocols/jabber/jabber.c:2212
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+"Não foi possível chamar a atenção de %s, pois este(a) pode estar "
+"desconectado."
+
+#: ../libpurple/protocols/jabber/jabber.c:2238
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+"Não foi possível chamar a atenção de %s, pois este não suporta tal recurso."
+
+#: ../libpurple/protocols/jabber/jabber.c:2252
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2256
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2265
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5233,7 +6063,7 @@
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5241,25 +6071,36 @@
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2312
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [sala]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "outro usuário."
 
+#: ../libpurple/protocols/jabber/jabber.c:2323
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+"ping &lt;jid&gt;:       Verifica conexão com usuário/componente/servidor."
+
+#: ../libpurple/protocols/jabber/jabber.c:2328
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+"buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5270,84 +6111,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr "Requerer SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Forçar SSL antigo (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3270
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Porta de conexão"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3267
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s saiu da conversa."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Mensagem de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "A entrega de mensagens para %s falhou: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "Erro de mensagem do XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s chamou sua atenção!"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5355,66 +6210,112 @@
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não suporta "
 "transferência de arquivos."
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Falha no envio de arquivo"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Não foi possível enviar o arquivo para %s, ID do Jabber inválido"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois o usuário não está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Não foi possível enviar arquivo para %s, pois você não está recebendo "
 "informações de presença deste usuário"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 "Favor selecionar o recurso de %s para o qual você gostaria de mandar um "
 "arquivo"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Selecione um recurso"
 
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+msgid "Edit User Mood"
+msgstr "Editar humor do usuário"
+
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Please select your mood from the list."
+msgstr "Favor selecionar seu humor na lista."
+
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid "Set"
+msgstr "Definir"
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+msgid "Set Mood..."
+msgstr "Definir humor..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Set User Nickname"
+msgstr "Definir apelido do usuário"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+msgid "Please specify a new nickname for you."
+msgstr "Favor digitar seu novo apelido."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Como estas informações são visíveis para todos os contatos da sua lista de "
+"contatos, é recomendável escolher algo apropriado."
+
+#: ../libpurple/protocols/jabber/usernick.c:99
+msgid "Set Nickname..."
+msgstr "Definir apelido..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Ações"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Selecione uma ação"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5634,7 +6535,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1379
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
@@ -5668,39 +6569,49 @@
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Você acabou de chamar a atenção do usuário!"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Chamar a atenção"
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s chamou sua atenção!"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Chamando a atenção de %s..."
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Seu novo apelido é longo demais."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Defina seu apelido."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Esse é o nome que será visto como seu pelos outros amigos MSN."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Defina seu número de telefone de casa."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Defina seu número de telefone do trabalho."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Defina seu número de telefone móvel."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir pages MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5708,132 +6619,134 @@
 "Você deseja permitir ou não permitir que pessoas na sua lista de amigos "
 "enviem pages MSN Mobile para seu celular ou outro dispositivo móvel?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta do Hotmail pode não estar ativa."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Tem você"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Definir apelido..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Definir número de telefone de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Definir número de telefone do trabalho..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Definir número de telefone móvel..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ativar/Desativar dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Não permitir pages para dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Abrir caixa de entrada do Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5841,188 +6754,188 @@
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "E-Mail pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1679
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "E-Mail de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6032,7 +6945,7 @@
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6040,7 +6953,7 @@
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL do Perfil"
@@ -6055,19 +6968,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
 msgid "MSN Protocol Plugin"
 msgstr "Plugin do protocolo MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
@@ -6086,8 +6999,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Não foi possível conectar"
 
@@ -6272,56 +7185,449 @@
 msgid "Message could not be sent because the user is offline:"
 msgstr "A mensagem não pôde ser enviada porque o usuário está desconectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "A mensagem não pôde ser enviada porque um erro de conexão ocorreu:"
+#: ../libpurple/protocols/msn/switchboard.c:416
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "A mensagem não pôde ser enviada porque um erro de conexão ocorreu:"
+
+#: ../libpurple/protocols/msn/switchboard.c:420
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+"A mensagem não pôde ser enviada porque estamos enviando muito rapidamente:"
+
+#: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"A mensagem não pôde ser enviada porque não podemos estabelecer uma sessão "
+"com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
+"em alguns minutos:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
+
+#: ../libpurple/protocols/msn/switchboard.c:439
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
+
+#: ../libpurple/protocols/msn/userlist.c:252
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s te adicionou à sua lista de contatos."
+
+#: ../libpurple/protocols/msn/userlist.c:321
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s te removeu da sua lista de contatos."
+
+#: ../libpurple/protocols/msn/userlist.c:643
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Não foi possível adicionar \"%s\"."
+
+#: ../libpurple/protocols/msn/userlist.c:645
+msgid "The screen name specified is invalid."
+msgstr "O nome de usuário especificado é inválido."
+
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Cifra não encontrada"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "A cifra RC4 não pôde ser encontrada"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Atualize sua versão do libpurple para uma que tenha suporte a RC4 (>= "
+"2.0.1). O plugin do MySpace não será carregado."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Desculpe, senhas com mais de %d caracteres (a sua possui %d) não são "
+"suportadas pelo MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1794
+msgid "MySpaceIM Error"
+msgstr "Erro do MySpace"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Lendo negociação de criptografia"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Tamanho inesperado de challenge criptográfico vindo do servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Conectando"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+"Conexão com o servidor perdida (não houve recepção de dados nos últimos %d "
+"segundos)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Novas mensagens de email"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Novos comentários no blog"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Novos comentários no perfil"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Novos pedidos de amizade!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Novos comentários nas fotos"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../libpurple/protocols/myspace/myspace.c:1547
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid "No username set"
+msgstr "Nenhum nome de usuário definido"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Favor visitar http://e<ditprofile.myspace.com/index.cfm?fuseaction=profile."
+"username e escolher um nome de usuário e tentar conectar novamente."
+
+#: ../libpurple/protocols/myspace/myspace.c:1775
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Erro de protocolo, código %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1965
+#: ../libpurple/protocols/myspace/myspace.c:1999
+msgid "Failed to add buddy"
+msgstr "Falha ao adicionar amigo"
+
+#: ../libpurple/protocols/myspace/myspace.c:1965
+msgid "'addbuddy' command failed."
+msgstr "O comando 'addbuddy' falhou."
+
+#: ../libpurple/protocols/myspace/myspace.c:1999
+#: ../libpurple/protocols/myspace/myspace.c:2240
+msgid "persist command failed"
+msgstr "O comando 'persist' falhou"
+
+#: ../libpurple/protocols/myspace/myspace.c:2108
+#, c-format
+msgid "No such user: %s"
+msgstr "Usuário não existe: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+msgid "User lookup"
+msgstr "Procurar usuário"
+
+#: ../libpurple/protocols/myspace/myspace.c:2221
+#: ../libpurple/protocols/myspace/myspace.c:2240
+#: ../libpurple/protocols/myspace/myspace.c:2262
+msgid "Failed to remove buddy"
+msgstr "Falha ao remover amigo"
+
+#: ../libpurple/protocols/myspace/myspace.c:2221
+msgid "'delbuddy' command failed"
+msgstr "O comando 'delbuddy' falhou"
+
+#: ../libpurple/protocols/myspace/myspace.c:2262
+msgid "blocklist command failed"
+msgstr "O comando 'blocklist' falhou"
+
+#: ../libpurple/protocols/myspace/myspace.c:2308
+msgid "Invalid input condition"
+msgstr "Condição de entrada inválida"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2326
+#: ../libpurple/protocols/myspace/myspace.c:2357
+msgid "Read buffer full"
+msgstr "Buffer de leitura cheio"
+
+#: ../libpurple/protocols/myspace/myspace.c:2395
+msgid "Unparseable message"
+msgstr "Mensagem impossível de ser processada"
+
+#: ../libpurple/protocols/myspace/myspace.c:2464
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Não foi possível conectar ao host: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2635
+msgid "IM Friends"
+msgstr "Amigos de MI"
+
+#: ../libpurple/protocols/myspace/myspace.c:2734
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d amigos foram adicionados ou atualizados do servidor (incluindo amigos que "
+"já estavam na lista de amigos do servidor)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+msgid "Add contacts from server"
+msgstr "Adicionar contatos do servidor"
+
+#: ../libpurple/protocols/myspace/myspace.c:2787
+#: ../libpurple/protocols/myspace/myspace.c:2852
+msgid "Add friends from MySpace.com"
+msgstr "Adicionar amigos do MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+msgid "Importing friends failed"
+msgstr "Falha ao importar amigos"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2844
+msgid "Find people..."
+msgstr "Encontrar pessoas..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2847
+msgid "Change IM name..."
+msgstr "Alterar nome da conversa..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3149
+msgid "myim URL handler"
+msgstr "Suporte a URLs myim"
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+"Não foi possível encontrar uma conta adequada do MySpace para abrir esta URL "
+"myim."
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Ative a conta do MySpace correta e tente novamente."
+
+#: ../libpurple/protocols/myspace/myspace.c:3274
+msgid "Show display name in status text"
+msgstr "Exibir apelido na mensagem de status"
+
+#: ../libpurple/protocols/myspace/myspace.c:3277
+msgid "Show headline in status text"
+msgstr "Exibir frase na mensagem de status"
+
+#: ../libpurple/protocols/myspace/myspace.c:3282
+msgid "Send emoticons"
+msgstr "Enviar emoticons"
+
+#: ../libpurple/protocols/myspace/myspace.c:3287
+msgid "Screen resolution (dots per inch)"
+msgstr "Resolução da tela (pontos por polegada)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3290
+msgid "Base font size (points)"
+msgstr "Tamanho base da fonte (pontos)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Usuário"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "Frase"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Música"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Total de amigos"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Versão do cliente"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Dar choque"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s te deu um choque!"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Dando um choque em %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Bater"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s bateu em você!"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Batendo em %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Queimar"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s queimou você!"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "Queimando %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Beijar"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s te beijou!"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Beijando %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Abraçar"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s te abraçou!"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Abraçando %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Dar tapa"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s te deu um tapa!"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Dando um tapa em %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Beliscar"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
-msgid "Message could not be sent because we are sending too quickly:"
-msgstr ""
-"A mensagem não pôde ser enviada porque estamos enviando muito rapidamente:"
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s te beliscou!"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"A mensagem não pôde ser enviada porque não podemos estabelecer uma sessão "
-"com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
-"em alguns minutos:"
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "Beliscando %s..."
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "Cumprimentar"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
-msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s te cumprimentou!"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s está chamando sua atenção!"
+msgid "High-fiving %s..."
+msgstr "Cumprimentando %s..."
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Tirar onda"
+
+#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s te adicionou à sua lista de contatos."
+msgid "%s has punk'd you!"
+msgstr "%s tirou onda de você!"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s te removeu da sua lista de contatos."
+msgid "Punking %s..."
+msgstr "Tirando onda de %s..."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Dar língua"
+
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Não foi possível adicionar \"%s\"."
+msgid "%s has raspberried you!"
+msgstr "%s te deu língua!"
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "O nome de usuário especificado é inválido."
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Dar língua para %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6566,7 +7872,7 @@
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -6682,19 +7988,19 @@
 msgstr "Porta do servidor"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/proxy.c:1115 ../libpurple/proxy.c:1224
+#: ../libpurple/proxy.c:1324 ../libpurple/proxy.c:1452
 msgid "Server closed the connection."
 msgstr "O servidor encerrou a conexão."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1127 ../libpurple/proxy.c:1236
+#: ../libpurple/proxy.c:1336 ../libpurple/proxy.c:1464
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6704,9 +8010,9 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/proxy.c:1144 ../libpurple/proxy.c:1249
+#: ../libpurple/proxy.c:1348 ../libpurple/proxy.c:1420
+#: ../libpurple/proxy.c:1477
 msgid "Received invalid data on connection with server."
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
@@ -6741,7 +8047,7 @@
 msgstr "Plugin do protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificação"
@@ -6771,7 +8077,7 @@
 msgid "Direct IM established"
 msgstr "Mensagem instantânea direta estabelecida"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O arquivo %s tem %s, o que é maior que o tamanho máximo de %s."
@@ -6894,8 +8200,8 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
@@ -6917,7 +8223,7 @@
 msgstr "Bate-papo"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Receber arquivo"
 
@@ -6990,17 +8296,17 @@
 msgstr "Câmera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Não disponível"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -7010,8 +8316,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -7020,13 +8326,13 @@
 msgstr "Conectado"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "Endereço IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
@@ -7078,14 +8384,14 @@
 "números."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Nome de usuário inválido."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
@@ -7139,10 +8445,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -7179,33 +8485,33 @@
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7216,18 +8522,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7240,7 +8546,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7253,7 +8559,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7266,38 +8572,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7308,21 +8614,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7330,55 +8636,47 @@
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Recursos"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7386,7 +8684,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7394,82 +8692,82 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nomes de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7478,13 +8776,13 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7493,7 +8791,7 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7502,7 +8800,7 @@
 "Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7511,7 +8809,7 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7520,32 +8818,32 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O endereço de e-mail de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7555,7 +8853,7 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7570,11 +8868,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7589,11 +8887,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7604,17 +8902,17 @@
 "Nomes de usuário têm que ser um email válido, começar com uma letra e conter "
 "apenas letras, números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7623,15 +8921,15 @@
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7640,17 +8938,17 @@
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7659,23 +8957,23 @@
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7686,53 +8984,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7740,66 +9038,66 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a capitalização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7807,73 +9105,73 @@
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endereço de e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7881,27 +9179,27 @@
 "Sempre usar o proxy do servidor ICQ para transferências de arquivo\n"
 "(mais lento, mas não revela seu endereço IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pedindo para %s conectar a nós em %s:%hu para mensagem instantânea direta."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentando conectar a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Tentando conectar pelo servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para fazer uma conexão direta com %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8110,14 +9408,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Desculpe, você não faz meu tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Rejeitar"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Falha ao adicionar amigo com pedido de autenticação"
@@ -8523,8 +9813,9 @@
 msgstr "Você foi adicionado por %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
-msgstr "Deseja adicioná-lo(a)?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
+msgstr "Você deseja adicioná-lo?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
@@ -8557,10 +9848,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s não está na sua lista de amigos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Você deseja adicioná-lo?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Conexão fechada (escrevendo)"
@@ -8624,10 +9911,6 @@
 msgid "Starting Services"
 msgstr "Iniciando serviços"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Conectado"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8650,7 +9933,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Não foi possível conectar ao servidor."
 
@@ -8671,37 +9954,33 @@
 msgid "Place Closed"
 msgstr "Local fechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microfone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Caixas de som"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Transferência de arquivo"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Suporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Usuário externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Criar conferência com usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8710,27 +9989,27 @@
 "Favor digitar um tópico para a nova conferência, e uma mensagem de convite "
 "para ser enviada para %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nova conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Criar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Conferências disponíveis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Criar nova conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Convidar usuário para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8741,27 +10020,27 @@
 "usuário %s. Selecione \"Criar nova conferência\" se você deseja criar uma "
 "nova conferência e convidar este usuário para ela."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Convidar para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Convidar para conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4361
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8770,42 +10049,42 @@
 "Nenhum servidor ou endereço IP foi configurado para a conta %s do Meanwhile. "
 "Favor digitar um abaixo para continuar o processo de conexão."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuração da conexão do Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desconhecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Último cliente conhecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "ID do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Um ID de usuário ambíguo foi digitado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8815,15 +10094,15 @@
 "Por favor selecione o usuário correto a partir da lista abaixo para adicioná-"
 "lo a sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Selecionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Não foi possível adicionar usuário: usuário não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8832,11 +10111,11 @@
 "O identificador '%s' não corresponde a nenhum usuário na sua comunidade do "
 "Sametime. Esta entrada foi removida da sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Não foi possível adicionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8845,63 +10124,63 @@
 "Erro ao ler arquivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos armazenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Modo de armazenamento da lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Apenas lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Mesclar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Mesclar e salvar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sincronizar lista com o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Não foi possível adicionar grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Um grupo com o nome '%s' já existe na sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Não foi possível adicionar grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Possíveis resultados"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Resultados dos grupos do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8912,15 +10191,15 @@
 "endereços do Notes a seguir. Favor selecionar o grupo correto da lista "
 "abaixo para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Selecionar catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Não foi possível adicionar grupo: grupo não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8929,11 +10208,11 @@
 "O identificador '%s' não corresponde a nenhum grupo do catálogo de endereços "
 "Notes da sua comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Grupo do catálogo de endereços Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8941,12 +10220,12 @@
 "Digite o nome de um grupo do catálogo de endereços do Notes no campo abaixo "
 "para adicionar o grupo e seus membros à sua lista de contatos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca por '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8957,31 +10236,30 @@
 "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os "
 "botões de ação abaixo."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "O identificador '%s' não corresponde a nenhum usuário da sua comunidade "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Procurar por um usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8989,32 +10267,32 @@
 "Digite um nome o ID parcial no campo abaixo para procurar por usuários "
 "correspondentes na sua comunidade do Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Procurar por usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exportar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Adicionar grupo do catálogo de endereços do Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Busca por usuários..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forçar conexão (ignorar redirecionamentos do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Esconder identidade do cliente"
 
@@ -9402,13 +10680,6 @@
 msgid "User Modes"
 msgstr "Modos do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Humor"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10074,13 +11345,6 @@
 msgstr "Estatísticas da rede"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falha no ping"
@@ -10237,7 +11501,7 @@
 msgstr "Seu humor atual"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10638,7 +11902,7 @@
 "Internet Live Conferencing - SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Rede"
 
@@ -10898,26 +12162,30 @@
 msgstr "Não foi possível enviar"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1059
+msgid "Unknown server response."
+msgstr "Resposta do servidor desconhecida."
+
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "Não foi possível criar socket de escuta"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "Não foi possível resolver ao host"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "Não foi possível resolver host"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
 
@@ -10929,36 +12197,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Anunciar status (nota: todos podem te observar)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "Usuário de autenticação"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
@@ -11124,8 +12392,8 @@
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -11188,32 +12456,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que é um recurso não suportado."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! não foi enviada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s está chamando sua atenção!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensagem do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
-"de amigos."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11222,11 +12484,18 @@
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos com o seguinte motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
+"de amigos."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11237,11 +12506,11 @@
 "desconhecido. Provavelmente, você não conseguirá conectar com sucesso ao "
 "Yahoo. Verifique %s por atualizações."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Falha na autenticação do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11250,52 +12519,52 @@
 "Você tentou ignorar %s, mas o usuário está na sua lista de amigos. Ao clicar "
 "\"Sim\" o usuário será removido e ignorado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
 "corrigir isso."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Não foi possível adicionar amigo à lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11304,7 +12573,7 @@
 "A conexão com %s foi perdida:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11313,112 +12582,112 @@
 "Não foi possível estabelecer conexão com %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Open Inbox"
 msgstr "Abrir caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
-msgid "You have just sent a Buzz!"
-msgstr "Você acabou de chamar a atenção do usuário!"
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Chamar a atenção"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Chamando a atenção de %s..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
-msgid "buzz: Buzz a user to get their attention"
-msgstr ""
-"buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -11432,131 +12701,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Convite rejeitado"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "Falha ao entrar no bate-papo"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Sala desconhecida"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Talvez a sala esteja cheia"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "Não disponível"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos "
-"antes de poder ingressar novamente numa sala de bate-papo"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Você está conversando em %s."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "Falha ao ingressar amigo no bate-papo"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "Talvez eles não estejam em um bate-papo?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "Falha ao obter a lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Vozes"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "Não foi possível obter lista de salas."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Salas de usuário"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11665,9 +12862,81 @@
 "perfil de um usuário. Se você sabe que o usuário existe, favor tentar "
 "novamente."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
-msgid "The user's profile is empty."
-msgstr "O perfil do usuário está vazio."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+msgid "The user's profile is empty."
+msgstr "O perfil do usuário está vazio."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s rejeitou seu convite para uma conferência na sala \"%s\" porque \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Convite rejeitado"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Falha ao entrar no bate-papo"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Sala desconhecida"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Talvez a sala esteja cheia"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Não disponível"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erro desconhecido. Você pode ter que desconectar e esperar cinco minutos "
+"antes de poder ingressar novamente numa sala de bate-papo"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Você está conversando em %s."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Falha ao ingressar amigo no bate-papo"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Talvez eles não estejam em um bate-papo?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Falha ao obter a lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Vozes"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Não foi possível obter lista de salas."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Salas de usuário"
 
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
@@ -11695,11 +12964,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Não foi possível enviar para o bate-papo %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Usuário"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11851,8 +13115,8 @@
 msgid "Exposure"
 msgstr "Exposição"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:893 ../libpurple/proxy.c:1048
+#: ../libpurple/proxy.c:1616
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11866,24 +13130,24 @@
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:697 ../libpurple/proxy.c:743 ../libpurple/proxy.c:779
+#: ../libpurple/proxy.c:791
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexão do proxy HTTP %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:787
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d."
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1011
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1713
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver host"
 
@@ -11921,7 +13185,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s mudou seu apelido para %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Chamando a atenção de %s..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s chamou sua atenção!"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11930,20 +13204,36 @@
 "%s convidou %s para a sala de bate-papo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou %s para a sala de bate-papo %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "Falha na conexão SSL"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "Falha na negociação SSL"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "O outro lado enviou um certificado SSL inválido"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Erro de SSL desconhecido"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Redefinir"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
@@ -11995,12 +13285,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2702
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2703
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12009,67 +13299,67 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3203
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3206
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3232
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3244
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3258
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3266
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
 
-#: ../libpurple/util.c:3569 ../libpurple/util.c:3864
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3692
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12078,17 +13368,17 @@
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3727
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3783
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
@@ -12114,37 +13404,37 @@
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Apelido _local:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Opções do usuário"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Notificar ao receber novos e_mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar este _ícone de exibição para esta conta:"
 
@@ -12178,7 +13468,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -12200,15 +13490,15 @@
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Porta:"
 
@@ -12216,31 +13506,43 @@
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Não foi possível salvar nova conta"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Já existe uma conta com os atributos especificados."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Criar esta nova conta no servidor"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12264,11 +13566,11 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12277,92 +13579,92 @@
 "gostaria de entrar.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Enviar arquivo"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Adicionar ação de _usuário"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Ver _log"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Adicionar um _amigo"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Adicionar um c_hat"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4709
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4849
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -12370,126 +13672,138 @@
 "Você não está conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _log do usuário..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Amigos/Exibir amig_os desconectados"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Amigos/Exibir grupos _vazios"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Amigos/Exibir _detalhes do amigo"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Amigos/Exibir _tempos de inatividade"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Amigos/Exibir"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Amigos/Exibir/Amig_os desconectados"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Amigos/Exibir/Grupos _vazios"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Amigos/Exibir/_Detalhes do amigo"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Amigos/Exibir/_Tempos de inatividade"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Amigos/Exibir/Ícones de _protocolo"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Adicionar\\/Editar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Ferramentas/_Certificados"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _depuração"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12498,132 +13812,128 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inativo por %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3805
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Por tamanho do log"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4024
-msgid "Re-enable Account"
-msgstr "Re-ativar conta"
-
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12642,23 +13952,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4566
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Amigos/Exibir amigos desconectados"
-
-#: ../pidgin/gtkblist.c:4569
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Amigos/Exibir grupos vazios"
-
-#: ../pidgin/gtkblist.c:4575
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Amigos/Exibir detalhes do amigo"
-
-#: ../pidgin/gtkblist.c:4578
-msgid "/Buddies/Show Idle Times"
-msgstr "/Amigos/Exibir tempos de inatividade"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Amigos/Exibir/Amigos desconectados"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Amigos/Exibir/Grupos vazios"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Amigos/Exibir/Detalhes do amigo"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Amigos/Exibir/Tempos de inatividade"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Amigos/Exibir/Ícones de protocolo"
 
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12670,19 +13984,19 @@
 "possível.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "Nome de _usuário:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "Ape_lido:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12690,7 +14004,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12698,42 +14012,47 @@
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3015
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3079
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:529
+msgid "SSL Servers"
+msgstr "Servidores SSL"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12747,25 +14066,25 @@
 "O %s não tentará reconectar esta conta até que você corrija o erro e reative "
 "a mesma."
 
-#: ../pidgin/gtkconv.c:488
+#: ../pidgin/gtkconv.c:481
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: ../pidgin/gtkconv.c:760 ../pidgin/gtkconv.c:786
+#: ../pidgin/gtkconv.c:753 ../pidgin/gtkconv.c:779
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:773
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:833
+#: ../pidgin/gtkconv.c:826
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:863
+#: ../pidgin/gtkconv.c:856
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12773,201 +14092,188 @@
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:884
+#: ../pidgin/gtkconv.c:877
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:904 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:897 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:961 ../pidgin/gtkconv.c:2522 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:955 ../pidgin/gtkconv.c:2604 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Não foi possível abrir arquivo."
 
-#: ../pidgin/gtkconv.c:967
+#: ../pidgin/gtkconv.c:961
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1003
+#: ../pidgin/gtkconv.c:999
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1152 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1178 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1174 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1361
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
-"gravadas."
-
-#: ../pidgin/gtkconv.c:1369
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
-"gravadas."
-
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1630
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkconv.c:1633
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1640
+#: ../pidgin/gtkconv.c:1653
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1663
+#: ../pidgin/gtkconv.c:1676
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2530
+#: ../pidgin/gtkconv.c:2612
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2581
+#: ../pidgin/gtkconv.c:2663
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2715
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2638
+#: ../pidgin/gtkconv.c:2720
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2641
+#: ../pidgin/gtkconv.c:2723
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2645
+#: ../pidgin/gtkconv.c:2727
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2740
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
+#: ../pidgin/gtkconv.c:2867
+msgid "Show All"
+msgstr "Mostrar todos"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2886
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2888
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2893
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2895
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _log"
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2917
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2919
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2921
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2840
+#: ../pidgin/gtkconv.c:2926
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: ../pidgin/gtkconv.c:2848
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2938
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2939
 msgid "/Options/Enable _Logging"
 msgstr "/Opções/Gravar _log"
 
-#: ../pidgin/gtkconv.c:2854
+#: ../pidgin/gtkconv.c:2940
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2855
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Mostrar í_cones de amigos"
-
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2942
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2858
+#: ../pidgin/gtkconv.c:2943
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:3067
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
-#: ../pidgin/gtkconv.c:3059
+#: ../pidgin/gtkconv.c:3123
 msgid "/Options"
 msgstr "/Opções"
 
@@ -12976,177 +14282,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3094 ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3158 ../pidgin/gtkconv.c:3190
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver log"
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3204
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:3144
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3150
+#: ../pidgin/gtkconv.c:3214
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3154
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3160
+#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3164
+#: ../pidgin/gtkconv.c:3228
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3232
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3236
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3182
+#: ../pidgin/gtkconv.c:3246
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: ../pidgin/gtkconv.c:3186
+#: ../pidgin/gtkconv.c:3250
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3256
 msgid "/Options/Enable Logging"
 msgstr "/Opções/Gravar log"
 
-#: ../pidgin/gtkconv.c:3195
+#: ../pidgin/gtkconv.c:3259
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3272
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3211
+#: ../pidgin/gtkconv.c:3275
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3214
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Mostrar ícones de amigos"
-
-#: ../pidgin/gtkconv.c:3298 ../pidgin/gtkconv.c:3340
+#: ../pidgin/gtkconv.c:3352 ../pidgin/gtkconv.c:3394
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3343
+#: ../pidgin/gtkconv.c:3397
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3526 ../pidgin/gtkconv.c:7818
+#: ../pidgin/gtkconv.c:3580 ../pidgin/gtkconv.c:8026
 msgid "_Send To"
 msgstr "_Enviar para"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4293
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4397
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5611 ../pidgin/gtkconv.c:5732
+#: ../pidgin/gtkconv.c:5768 ../pidgin/gtkconv.c:5889
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:6341 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6490 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6494
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6497
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6351 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6500 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6354
+#: ../pidgin/gtkconv.c:6503
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7358
+#: ../pidgin/gtkconv.c:7576
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todas as janela de conversa."
 
-#: ../pidgin/gtkconv.c:7522
+#: ../pidgin/gtkconv.c:7740
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7554
+#: ../pidgin/gtkconv.c:7772
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:8145
+#: ../pidgin/gtkconv.c:8359
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:8151
+#: ../pidgin/gtkconv.c:8365
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:8159
+#: ../pidgin/gtkconv.c:8373
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:8165
+#: ../pidgin/gtkconv.c:8379
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8651
+#: ../pidgin/gtkconv.c:8879
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:9251
+#: ../pidgin/gtkconv.c:9481
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:9253
+#: ../pidgin/gtkconv.c:9483
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:9255 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9485 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:9257
+#: ../pidgin/gtkconv.c:9487
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9259
+#: ../pidgin/gtkconv.c:9489
 msgid "By account"
 msgstr "Por conta"
 
@@ -13210,7 +14512,7 @@
 msgid "Fatal Error"
 msgstr "Erro fatal"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "desenvolvedor principal"
 
@@ -13221,8 +14523,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "desenvolvedor"
 
@@ -13234,376 +14536,391 @@
 msgid "support/QA"
 msgstr "suporte/QA"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "desenvolvedor & webmaster"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Contribuidor Sênior/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "port para Win32"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "mantenedor"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "mantenedor da libfaim"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "desenvolvedor & webmaster"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e dirigente designado [vagabundo preguiçoso]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "desenvolvedor do XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "autor original"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Africâner"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:134
+msgid "Belarusian Latin"
+msgstr "Latim bielorrusso"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:223
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:141
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "Catalan"
 msgstr "Catalão"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalão"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:226
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Danish"
 msgstr "Dinamarquês"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:227
 msgid "German"
 msgstr "Alemão"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
 msgid "Greek"
 msgstr "Grego"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:155
 msgid "Australian English"
 msgstr "Inglês australiano"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:156
 msgid "Canadian English"
 msgstr "Inglês canadense"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:157
 msgid "British English"
 msgstr "Inglês britânico"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:158
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:160
+msgid "Estonian"
+msgstr "Estônio"
+
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:162
 msgid "Euskera(Basque)"
 msgstr "Basco"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:165
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "French"
 msgstr "Francês"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:238
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
 msgid "Gujarati"
 msgstr "Guzerate"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:171
 msgid "Gujarati Language Team"
 msgstr "Time de tradução do idioma Guzerate"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:239
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hindi"
 msgstr "Hindu"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:240
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:175
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:245
 msgid "Georgian"
 msgstr "Geórgio"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:178
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores do Ubuntu do idioma Geórgio"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:179
 msgid "Kannada"
 msgstr "Canarês"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:179
 msgid "Kannada Translation team"
 msgstr "Time de tradução do idioma Canarês"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:250
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:251
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:188
 msgid "Nepali"
 msgstr "Nepalês"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:189
 msgid "Dutch, Flemish"
 msgstr "Holandês, Flamengo"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:190
 msgid "Norwegian Nynorsk"
 msgstr "Novo norueguês"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:252
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:195
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:196
 msgid "Pashto"
 msgstr "Afegão"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:197
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:255 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:202
 msgid "Albanian"
 msgstr "Albanês"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:206
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:207
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:208
 msgid "Thai"
 msgstr "Tailandês"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:261
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:210
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:210
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:262
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Hong Kong Chinese"
 msgstr "Chinês de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:263
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:222
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:348
 #, c-format
 msgid "About %s"
 msgstr "Sobre o %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:386
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "O %s é um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
 "XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu e QQ de uma vez só. Ele é escrito usando o GTK+."
+"Zephyr, MySpace, Gadu-Gadu e QQ de uma vez só. Ele é escrito usando o GTK+."
 "<BR><BR>Você pode modificar e redistribuir o programa sob os termos da GPL "
 "(versão 2 ou superior). Uma cópia da GPL está contida no arquivo 'COPYING' "
 "distribuído com o %s. Os direitos de cópia do %s pertencem aos seus "
 "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes "
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:404
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:409
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:424
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:439
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:454
 msgid "Retired Crazy Patch Writers"
 msgstr "Escritores de patch aposentados"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:469
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:484
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:504
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:522
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:892
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:894
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13611,43 +14928,43 @@
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:984
 msgid "View User Log"
 msgstr "Ver log do usuário"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:986
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1006
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1007
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1029
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1031
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1052
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1053
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1092
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13662,15 +14979,15 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1100
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1103
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1134
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13679,15 +14996,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1141
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1144
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1194
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13696,30 +15013,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1197
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1200
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1233
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1236
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1239
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1260
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13728,11 +15045,11 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1263
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1266
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
@@ -13841,7 +15158,7 @@
 msgstr "_Detalhes da transferência"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pausar"
 
@@ -13854,7 +15171,7 @@
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
@@ -13937,27 +15254,27 @@
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13965,91 +15282,155 @@
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Agrupar itens"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Desagrupar itens"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Negrito"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Itálico"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Sublinhado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Tachado"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Aumentar tamanho da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Diminuir tamanho da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Tipo da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Cor do fundo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Cor da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Limpar formatação"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Inserir imagem de MI"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Inserir emoticon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrito</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Itálico</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Sublinhado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Tachado</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Maior</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "N_ormal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>M_enor</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Co_r do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "Ima_gem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Link"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "Régua _horizontal"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14207,7 +15588,7 @@
 "Favor especificar o que você estava fazendo na hora em que o erro ocorreu\n"
 "e enviar o backtrace do arquivo de core.  Se você não sabe\n"
 "como obter o backtrace, favor ler as instruções em\n"
-"%swiki/GetABackTrace\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "Se você precisa de assistência adicional, mande uma mensagem instantânea\n"
 "para o SeanEgn ou o LSchiere (via AIM e em inglês).  Informações de contato\n"
@@ -14220,44 +15601,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Abrir todas as mensagens"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Você tem %d novo e-mail.</b>"
 msgstr[1] "<b>Você tem %d novos e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Não foi possível abrir URL"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14311,99 +15692,100 @@
 msgstr "Selecione um arquivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "_Desconectar"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "O amigo ficar _ausente"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "Volta_r da ausência"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Tornar-se _inativo"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Não estiver mais i_nativo"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "C_omeçar a digitar"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "P_ausar ao digitar"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Parar de di_gitar"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "En_viar uma mensagem"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Abrir uma jan_ela de MI"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "Exibir notificação _popup"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Envia_r uma mensagem"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "E_xecutar um comando"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Tocar um _som"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pré-_visualizar"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "_Executar apenas quando meu status não for Disponível"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
 #: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Padrão"
 
@@ -14447,7 +15829,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Quando ausente"
 
@@ -14544,11 +15926,11 @@
 msgid "Conversation _font:"
 msgstr "_Fonte para as conversas:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14556,119 +15938,119 @@
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
 "suportem formatação."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14677,63 +16059,63 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "_Formato do log:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Gravar todos as mudanças de _status no log do sistema"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14742,81 +16124,81 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de tornar inativo:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -14907,23 +16289,23 @@
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
@@ -14965,7 +16347,7 @@
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -14979,7 +16361,7 @@
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -14992,21 +16374,21 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15015,12 +16397,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15028,23 +16410,23 @@
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15052,7 +16434,7 @@
 "Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
 "ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15065,11 +16447,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15077,7 +16459,7 @@
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15088,25 +16470,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15122,30 +16504,34 @@
 msgid "Select color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Apelido:"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Fechar _abas"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Ver info"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "Conv_idar"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Abrir e-mail"
 
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Emoticons do Pidgin"
+
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Penguin Pimps"
@@ -15317,18 +16703,6 @@
 msgid "Select Color for %s"
 msgstr "Selecione a cor de %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Negrito"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Itálico"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Sublinhado"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorar formato original"
@@ -15575,15 +16949,6 @@
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Comentário do amigo</b>: %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15605,6 +16970,15 @@
 "Teste para ver se todos os sinais da interface estão funcionando "
 "corretamente."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Comentário do amigo</b>: %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Histórico"
@@ -15653,11 +17027,11 @@
 msgid "Draw Markerline in "
 msgstr "Desenhar linha em"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Janelas de mensagens _instantâneas"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "J_anelas de bate-papo"
 
@@ -15673,32 +17047,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Sessão de conversa musical confirmada."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Conversa musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Houve um conflito ao executar o comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Erro ao executar editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "O seguinte erro ocorreu:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuração de conversa musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Caminho do editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -15710,12 +17084,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin de conversa musical para composição colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15725,74 +17099,74 @@
 "tempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notificar para"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Apenas quando alguém menciona seu nome"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Janelas com foco"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Métodos de notificação"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Inserir este _texto no título da janela:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserir c_ontador de novas mensagens no título da janela"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Inserir c_ontador de novas mensagens na propriedade _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Definir a opção \"_URGENT\" do gerenciador de janelas"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Coloc_ar janela de conversa no topo"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Remoção de notificação"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Remover quando a janela da conversa _ganhar foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "_Remover quando a janela da conversa for clicada"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Remover ao _digitar na janela da conversa"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Remover quando uma _mensagem for enviada"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remover ao mudar para a a_ba da conversa"
 
@@ -15802,7 +17176,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notificação de mensagens"
 
@@ -15810,7 +17184,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Oferece diversas maneiras de te notificar sobre mensagens não lidas."
 
@@ -16185,44 +17559,44 @@
 "Este plugin permite ao usuário personalizar os formatos de marcação de tempo "
 "nas conversas e logs."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Janelas de conversa por mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparência da janela de _mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Mostrar slider na janela de mensagem instantânea"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Remover transparência da janela quando esta ganhar foco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Sempre no topo"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Janela da lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparência da janela da _lista de amigos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Remover a transparência da lista de amigos ao focá-la"
 
@@ -16232,19 +17606,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparência"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparência variável para a lista de amigos e conversas."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
diff -ru pidgin-2.1.1/po/pt.po pidgin-2.2.0/po/pt.po
--- pidgin-2.1.1/po/pt.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/pt.po	2007-09-14 00:45:43.000000000 -0400
@@ -12084,7 +12084,7 @@
 msgstr "Activar qual ID?"
 
 #: ../src/protocols/yahoo/yahoo.c:3070
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Juntar a quem no chat?"
 
 #: ../src/protocols/yahoo/yahoo.c:3080
diff -ru pidgin-2.1.1/po/ro.po pidgin-2.2.0/po/ro.po
--- pidgin-2.1.1/po/ro.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/ro.po	2007-09-14 00:45:43.000000000 -0400
@@ -11251,7 +11251,7 @@
 msgstr "Ce identitate doriţi să activaţi?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Cui doriţi să vă alăturaţi în chat?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3268
diff -ru pidgin-2.1.1/po/ru.po pidgin-2.2.0/po/ru.po
--- pidgin-2.1.1/po/ru.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/ru.po	2007-09-14 00:45:44.000000000 -0400
@@ -11217,7 +11217,7 @@
 msgstr "Какой ID активировать?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "К кому присоединиться в чате?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/sk.po pidgin-2.2.0/po/sk.po
--- pidgin-2.1.1/po/sk.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sk.po	2007-09-14 00:45:44.000000000 -0400
@@ -3,19 +3,22 @@
 # This file is distributed under the same license as the Pidgin package.
 # loptosko <loptosko@gmail.com>, 2007.
 # Jozef Káčer <quickparser@gmail.com>, 2007.
+# Ivan Masár <helix84@centrum.sk>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-19 03:21-0400\n"
-"PO-Revision-Date: 2007-07-18 19:59+0100\n"
-"Last-Translator: loptosko <loptosko@gmail.com>\n"
+"POT-Creation-Date: 2007-08-30 00:02+0000\n"
+"PO-Revision-Date: 2007-09-10 17:31+0000\n"
+"Last-Translator: helix84 <helix84@centrum.sk>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Rosetta-Export-Date: 2007-09-10 18:08:25+0000\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -27,7 +30,7 @@
 #: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Príkaz `%s -h' zobrazí viac informácií.\n"
+msgstr "%s. Príkaz „%s -h“ zobrazí viac informácií.\n"
 
 #: ../finch/finch.c:208
 #, c-format
@@ -50,7 +53,7 @@
 "  -n, --nologin       neprihlasovať automaticky\n"
 "  -v, --version       zobrazí verziu programu a skončí\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:710
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -97,10 +100,10 @@
 
 #: ../finch/gntaccount.c:480
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Pravdepodobne ste zabudli na 'make install'.)"
+msgstr "(Pravdepodobne ste zabudli na „make install“.)"
 
 #: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4023
+#: ../pidgin/gtkblist.c:4025
 msgid "Modify Account"
 msgstr "Upraviť účet"
 
@@ -187,7 +190,7 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:1016
 #: ../libpurple/protocols/yahoo/yahoo.c:3398
 #: ../libpurple/protocols/yahoo/yahoo.c:3409 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5925
+#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5929
 #: ../pidgin/gtkdialogs.c:750 ../pidgin/gtkdialogs.c:888
 #: ../pidgin/gtkdialogs.c:980 ../pidgin/gtkdialogs.c:1000
 #: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1046
@@ -251,7 +254,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5924 ../pidgin/gtkconv.c:1654
+#: ../pidgin/gtkblist.c:5928 ../pidgin/gtkconv.c:1654
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Pridať"
@@ -274,8 +277,8 @@
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
-"%s%s%sPoužívateľ %s si chce pridať používateľa %s do svojho zoznamu priateľov"
-"%s%s"
+"%s%s%sPoužívateľ %s si chce pridať používateľa %s do svojho zoznamu "
+"priateľov%s%s"
 
 #: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
 #: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
@@ -337,7 +340,7 @@
 #: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkblist.c:2988 ../pidgin/gtknotify.c:488
 #: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Účet"
@@ -351,7 +354,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:5431
+#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:5435
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Pridať priateľa"
@@ -379,7 +382,7 @@
 msgid "Auto-join"
 msgstr "Prihlásiť automaticky"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5810
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5814
 msgid "Add Chat"
 msgstr "Pridať chat"
 
@@ -401,7 +404,7 @@
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5921
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5925
 msgid "Add Group"
 msgstr "Pridať skupinu"
 
@@ -425,11 +428,11 @@
 msgid "Edit Settings"
 msgstr "Upraviť nastavenia"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:941
 msgid "Information"
 msgstr "Informácie"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:941
 msgid "Retrieving..."
 msgstr "Prijíma sa..."
 
@@ -500,7 +503,7 @@
 
 #. Buddy List
 #: ../finch/gntblist.c:1225 ../finch/gntblist.c:2297 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4267
+#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4269
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Zoznam priateľov"
@@ -532,7 +535,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061 ../pidgin/gtkblist.c:3012
 msgid "Nickname"
 msgstr "Prezývka"
 
@@ -545,8 +548,8 @@
 #: ../libpurple/protocols/novell/novell.c:2825
 #: ../libpurple/protocols/oscar/oscar.c:2882
 #: ../libpurple/protocols/yahoo/yahoo.c:2997
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3443 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3040
+#: ../pidgin/gtkblist.c:3445 ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr "Nečinný"
 
@@ -639,7 +642,7 @@
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:1015
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3408 ../pidgin/gtkblist.c:4022
+#: ../libpurple/protocols/yahoo/yahoo.c:3408 ../pidgin/gtkblist.c:4024
 #: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:887
 #: ../pidgin/gtkdialogs.c:979 ../pidgin/gtkrequest.c:269
 msgid "OK"
@@ -702,7 +705,8 @@
 msgstr "Tento príkaz neexistuje."
 
 #: ../finch/gntconv.c:122 ../pidgin/gtkconv.c:495
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Chyba syntaxi: V príkaze ste zadali nesprávny počet argumentov."
 
 #: ../finch/gntconv.c:127 ../pidgin/gtkconv.c:501
@@ -786,18 +790,20 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Pomocníka ku zadanému príkazu zobrazíte zadaním \"/help &lt;príkaz&gt;\".\n"
+"Pomocníka ku zadanému príkazu zobrazíte zadaním „/help &lt;príkaz&gt;“.\n"
 "V tomto kontexte sú dostupné nasledujúce príkazy:\n"
 
 #: ../finch/gntconv.c:1001 ../pidgin/gtkconv.c:7350
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr "say &lt;správa&gt;:  Odošle správu rovnako, ako bez použitia príkazu."
+msgstr ""
+"say &lt;správa&gt;:  Odošle správu rovnako, ako bez použitia príkazu."
 
 #: ../finch/gntconv.c:1004 ../pidgin/gtkconv.c:7353
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;akcia&gt;:  Odošle priateľovi alebo na chat akciu v štýle IRC."
+msgstr ""
+"me &lt;akcia&gt;:  Odošle priateľovi alebo na chat akciu v štýle IRC."
 
 #: ../finch/gntconv.c:1007 ../pidgin/gtkconv.c:7356
 msgid ""
@@ -824,23 +830,23 @@
 
 #: ../finch/gntconv.c:1024
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Zobrazí zoznam priateľov."
+msgstr "zoznam kamarátov: Zobraziť zoznam."
 
 #: ../finch/gntconv.c:1027
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Zobrazí okno účtov."
+msgstr "účty: Zobraziť okno s účtami."
 
 #: ../finch/gntconv.c:1030
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: Zobrazí ladiace okno."
+msgstr "ladiace okno: Zobraziť ladiace okno"
 
 #: ../finch/gntconv.c:1033
 msgid "prefs: Show the preference window."
-msgstr "prefs: Zobrazí okno nastavení."
+msgstr "vlastnosti: Zobraziť okno vlastností"
 
 #: ../finch/gntconv.c:1036
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Zobrazí okno uložených stavov."
+msgstr "stavy: Zobraziť okno stavov."
 
 #: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
@@ -849,14 +855,14 @@
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
-#.
+#. 
 #: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Vyčistiť"
 
 #: ../finch/gntdebug.c:261
 msgid "Filter: "
-msgstr "Filter:"
+msgstr "Filter: "
 
 #: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
@@ -911,8 +917,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/sametime/sametime.c:3264
 #: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3097 ../pidgin/gtkblist.c:3099
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Stav"
@@ -923,7 +929,7 @@
 
 #: ../finch/gntft.c:215
 msgid "Clear finished transfers"
-msgstr "Vymazať dokončené prenosy"
+msgstr "Odstrániť dokončené prenosy"
 
 #: ../finch/gntft.c:229
 msgid "Stop"
@@ -1245,6 +1251,7 @@
 msgstr "používateľ %s vám poslal správu. (%s)"
 
 #: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznáma udalosť sledovania. Oznámte to, prosím!"
 
@@ -1284,11 +1291,11 @@
 
 #: ../finch/gntprefs.c:199
 msgid "Log chats"
-msgstr "Zaznamenávať chaty"
+msgstr "Ukladať rozhovory"
 
 #: ../finch/gntprefs.c:200
 msgid "Log status change events"
-msgstr "Zaznamenávať zmeny stavu"
+msgstr "Ukladať zmenu stavu"
 
 #: ../finch/gntprefs.c:206
 msgid "Report Idle time"
@@ -1332,15 +1339,15 @@
 
 #: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
-msgstr "Priateľ sa prihlási"
+msgstr "Priateľ sa prihlásil"
 
 #: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
-msgstr "Priateľ sa odhlási"
+msgstr "Priateľ sa odhlásil"
 
 #: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
 msgid "Message received"
-msgstr "Prijatie správy"
+msgstr "Prijatá správa"
 
 #: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
@@ -1348,7 +1355,7 @@
 
 #: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
 msgid "Message sent"
-msgstr "Odoslanie správy"
+msgstr "Správa odoslaná"
 
 #: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
@@ -1413,11 +1420,11 @@
 
 #: ../finch/gntsound.c:951 ../pidgin/gtkprefs.c:1707
 msgid "Sound Method"
-msgstr "Spôsob prehrávania zvukov"
+msgstr "Metóda zvukov"
 
 #: ../finch/gntsound.c:956
 msgid "Method: "
-msgstr "Spôsob:"
+msgstr "Spôsob: "
 
 #: ../finch/gntsound.c:963
 #, c-format
@@ -1484,7 +1491,7 @@
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Naozaj chcete odstrániť \"%s\""
+msgstr "Naozaj chcete odstrániť „%s“"
 
 #: ../finch/gntstatus.c:140
 msgid "Delete Status"
@@ -1500,7 +1507,7 @@
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
-msgstr "Titulok"
+msgstr "Nadpis"
 
 #: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
@@ -1749,13 +1756,13 @@
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:108
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Chýba modul protokolu pre protokol %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4019
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:111
+#: ../pidgin/gtkblist.c:4021
 msgid "Connection Error"
 msgstr "Chyba pripojenia"
 
@@ -1809,7 +1816,7 @@
 
 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
 #: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5321 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../pidgin/gtkblist.c:5325 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Priatelia"
@@ -1818,21 +1825,21 @@
 msgid "buddy list"
 msgstr "zoznam priateľov"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/connection.c:110
 msgid "Registration Error"
 msgstr "Chyba pri registrácii"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:300
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ používateľ %s sa prihlásil"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:330
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ používateľ %s sa odhlásil"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/connection.c:447 ../libpurple/plugin.c:282
 #: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
@@ -1912,7 +1919,8 @@
 
 #: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "D-BUS server knižnice Purple nie je spustený z nižšie uvedeného dôvodu"
+msgstr ""
+"D-BUS server knižnice Purple nie je spustený z nižšie uvedeného dôvodu"
 
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1951,6 +1959,7 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:577
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "Počas čítania z procesu resolveru sa vyskytlo EOF"
 
@@ -1996,7 +2005,7 @@
 
 #: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
-msgstr "Posielanie súborov o veľkosti 0 bajtov nie je možné."
+msgstr "Posielanie súborov s veľkosťou 0 bajtov nie je možné."
 
 #: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
@@ -2029,24 +2038,24 @@
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Súbor je k dispozícií na stiahnute z:\n"
-"Vzdialený hostiteľ: %s\n"
+"Súbor je k dispozícii na stiahnutie z:\n"
+"Vzdialený počítač: %s\n"
 "Vzdialený port: %d"
 
 #: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "Používateľ %s ponúka na odoslanie súbor %s"
+msgstr "Používateľ %s vám ponúka súbor %s"
 
 #: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "Názov súboru %s nie je platný.\n"
+msgstr "%s nie je platný názov súboru.\n"
 
 #: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "Ponúka sa odoslanie súboru %s používateľovi %s"
+msgstr "Ponúkam poslať %2$s %1$s"
 
 #: ../libpurple/ft.c:519
 #, c-format
@@ -2059,6 +2068,7 @@
 msgstr "Prenos súboru %s bol dokončený"
 
 #: ../libpurple/ft.c:683
+#, c-format
 msgid "File transfer complete"
 msgstr "Prenos súboru je dokončený"
 
@@ -2068,6 +2078,7 @@
 msgstr "Zrušili ste prenos %s"
 
 #: ../libpurple/ft.c:1106
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Prenos súboru zrušený"
 
@@ -2097,175 +2108,167 @@
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"aim\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „aim“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"gg\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „gg“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"icq\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „icq“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"irc\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „irc“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"msnim\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „msnim“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"sip\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „sip“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"xmpp\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „xmpp“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Príkaz na ovládanie adries typu \"ymsgr\", ak je povolené."
+msgstr "Príkaz na obsluhu adries typu „ymsgr“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "Príkaz pre adresy \"aim\""
+msgstr "Príkaz pre adresy „aim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "Príkaz pre adresy \"gg\""
+msgstr "Príkaz pre adresy „gg“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "Príkaz pre adresy \"icq\""
+msgstr "Príkaz pre adresy „icq“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "Príkaz pre adresy \"irc\""
+msgstr "Príkaz pre adresy „irc“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "Príkaz pre adresy \"msnim\""
+msgstr "Príkaz pre adresy „msnim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "Príkaz pre adresy \"sip\""
+msgstr "Príkaz pre adresy „sip“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Príkaz pre adresy \"xmpp\""
+msgstr "Príkaz pre adresy „xmpp“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Príkaz pre adresy \"ymsgr\""
+msgstr "Príkaz pre adresy „ymsgr“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"aim"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"aim"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"icq"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „icq“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"irc"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „irc“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy "
-"\"msnim\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „msnim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"sip"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „sip“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy \"xmpp"
-"\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „xmpp“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči \"command\" má spracovávať URL adresy "
-"\"ymsgr\"."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „ymsgr“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Pravda, ak bude príkaz používaný na spracovanie tohto druhu adresies "
-"spustený v termináli."
+"Pravda, ak bude príkaz používaný na spracovanie tohto druhu adries spustený "
+"v termináli."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"aim\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „aim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"gg\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „gg“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"icq\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „icq“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"irc\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „irc“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"msnim\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „msnim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"sip\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „sip“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"xmpp\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „xmpp“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Či má zadaný príkaz ovládať adresy \"ymsgr\""
+msgstr "Či má zadaný príkaz obsluhovať adresy „ymsgr“"
 
 #: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">Zaznamenávač nepodporuje čítanie</font></b>"
+msgstr "<b><font color=\"red\">Záznamník nepodporuje čítanie</font></b>"
 
 #: ../libpurple/log.c:597
 msgid "HTML"
@@ -2307,7 +2310,8 @@
 
 #: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Nepodarilo sa nájsť cestu k záznamu!</b></font>"
+msgstr ""
+"<font color=\"red\"><b>Nepodarilo sa nájsť cestu k záznamu!</b></font>"
 
 #: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
@@ -2325,6 +2329,7 @@
 msgstr "Používate %s, ale tento modul vyžaduje %s."
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Tento modul nemá definované ID."
 
@@ -2386,8 +2391,7 @@
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"Automaticky potvrdený prenos súboru \"%s\" od používateľa \"%s\" je "
-"dokončený."
+"Automaticky potvrdený prenos súboru „%s“ od používateľa „%s“ je dokončený."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2607,7 +2611,7 @@
 #. *  summary
 #: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "Test podpory IPC modulov ako klient"
+msgstr "Test podpory IPC modulov ako klient."
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
@@ -2615,8 +2619,8 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Test podpory IPC modulov ako klient. Nájde modul serveru a spustí "
-"zaregistrované príkazy"
+"Test podpory IPC modulov ako klient. Nájde modul servera a spustí "
+"zaregistrované príkazy."
 
 #. *< type
 #. *< ui_requirement
@@ -2637,7 +2641,8 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgid ""
+"Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Test podpory IPC modulov ako server. Zaregistruje príkazy IPC."
 
 #: ../libpurple/plugins/joinpart.c:229
@@ -2858,7 +2863,9 @@
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
-msgstr "Pridáva entery pred správy, čo spôsobí že správy sa zobrazujú pod používateľským menom priateľa"
+msgstr ""
+"Pridáva entery pred správy, čo spôsobí že správy sa zobrazujú pod "
+"používateľským menom priateľa"
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -2866,14 +2873,16 @@
 
 #: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Ukladať správy ktoré boli odoslané odhláseným používateľom ako výzvu."
+msgstr ""
+"Ukladať správy ktoré boli odoslané odhláseným používateľom ako výzvu."
 
 #: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Zostatok správ bude uložený ako sledovanie. Sledovanie môžete pridať/odstrániť v dialógu `Sledovanie priateľov'."
+"Zostatok správ bude uložený ako sledovanie. Sledovanie môžete "
+"pridať/odstrániť v dialógu „Sledovanie priateľov“."
 
 #: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
@@ -2881,8 +2890,8 @@
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"Používateľ \"%s\" je momentálne odhlásený. Chcete uložiť zvyšok správ do sledovania, a "
-"automaticky ich odoslať hneď, keď sa \"%s\" prihlási?"
+"Používateľ „%s“ je momentálne odhlásený. Chcete uložiť zvyšok správ do "
+"sledovania, a automaticky ich odoslať hneď, keď sa „%s“ prihlási?"
 
 #: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
@@ -2890,7 +2899,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Sledovanie môžete pridať/odstrániť v dialógu `Sledovanie priateľov'"
+msgstr "Sledovanie môžete pridať/odstrániť v dialógu „Sledovanie priateľov“"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
@@ -3159,7 +3168,8 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Nepodarilo sa založiť spojenie s miestnym mDNS serverom.  Je spustený?"
+msgstr ""
+"Nepodarilo sa založiť spojenie s miestnym mDNS serverom.  Je spustený?"
 
 #. Creating the options for the protocol
 #: ../libpurple/protocols/bonjour/bonjour.c:344
@@ -3185,7 +3195,7 @@
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1056
 msgid "E-Mail"
 msgstr "E-mail"
 
@@ -3218,7 +3228,7 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:512
 #: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
-msgstr "Purple Osoba"
+msgstr "Fialová osoba"
 
 #. Creating the user splits
 #: ../libpurple/protocols/bonjour/bonjour.c:610
@@ -3384,7 +3394,7 @@
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Gender"
 msgstr "Pohlavie"
 
@@ -3467,7 +3477,7 @@
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
 #: ../libpurple/protocols/yahoo/yahoo.c:2999 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3419
+#: ../pidgin/gtkblist.c:3084 ../pidgin/gtkblist.c:3421
 #: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Odpojený"
@@ -3500,6 +3510,7 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3627 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
 #: ../pidgin/gtkstatusbox.c:1057
+#, c-format
 msgid "Away"
 msgstr "Neprítomný"
 
@@ -3541,7 +3552,8 @@
 
 #: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
-msgstr "Používatelia, ktorí vyhovujú vaším kritériám vyhľadávania neexistujú."
+msgstr ""
+"Používatelia, ktorí vyhovujú vaším kritériám vyhľadávania neexistujú."
 
 #: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
@@ -3553,7 +3565,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
-msgstr "Váš zoznam priateľov bol stiahnutý zo serveru."
+msgstr "Váš zoznam priateľov bol stiahnutý zo servera."
 
 #: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
@@ -3613,11 +3625,11 @@
 
 #: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
-msgstr "Stiahnuť zoznam priateľov zo serveru"
+msgstr "Stiahnuť zoznam priateľov zo servera"
 
 #: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
-msgstr "Odstrániť zoznam priateľov zo serveru"
+msgstr "Odstrániť zoznam priateľov zo servera"
 
 #: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
@@ -3692,16 +3704,16 @@
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr "Žiadne MOTD nie je dostupné"
+msgstr "Žiadna správa dňa nie je dostupná"
 
 #: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
-msgstr "S týmto pripojením nie je asociované žiadne MOTD"
+msgstr "S týmto pripojením nie je asociovaná žiadna správa dňa"
 
 #: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
-msgstr "MOTD pre %s"
+msgstr "Správa dňa pre %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
@@ -3710,7 +3722,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
-msgstr "Zobraziť MOTD"
+msgstr "Zobraziť správu dňa"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
@@ -3750,7 +3762,7 @@
 #: ../libpurple/protocols/simple/simple.c:464
 #: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
-msgstr "Nepodarilo sa vytvoriť soket"
+msgstr "Nepodarilo sa vytvoriť socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/oscar/oscar.c:1281
@@ -3776,7 +3788,7 @@
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
-msgstr "Užívatelia"
+msgstr "Používatelia"
 
 #: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3375
@@ -3798,7 +3810,7 @@
 #. *< version
 #: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
-msgstr "Modul protokolu IRC"
+msgstr "Plugin IRC protokolu"
 
 #. *  summary
 #: ../libpurple/protocols/irc/irc.c:917
@@ -3858,10 +3870,10 @@
 msgid "Real name"
 msgstr "Skutočné meno"
 
-#.
+#. 
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-#.
+#. 
 #: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Používať SSL"
@@ -3939,7 +3951,7 @@
 #: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "Neznáma správa '%s'"
+msgstr "Neznáma správa „%s“"
 
 #: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
@@ -3960,7 +3972,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
-msgstr "Miestny čas IRC serveru je:"
+msgstr "Miestny čas IRC servera je:"
 
 #: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
@@ -3977,7 +3989,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
-msgstr "Takáto prezývka alebo kanál neexistuje "
+msgstr "Takáto prezývka alebo kanál neexistuje"
 
 #: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
@@ -4042,7 +4054,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
-msgstr "Chyba: neplatný PONG od servra"
+msgstr "Chyba: neplatný PONG od servera"
 
 #: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
@@ -4229,7 +4241,8 @@
 "(bez ohľadu na kanál)."
 
 #: ../libpurple/protocols/irc/parse.c:145
-msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgid ""
+"quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Odpojí zo servera s nepovinnou správou."
 
 #: ../libpurple/protocols/irc/parse.c:146
@@ -4350,7 +4363,7 @@
 #: ../libpurple/protocols/jabber/auth.c:933
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
-msgstr "Chybná odpoveď zo serveru."
+msgstr "Chybná odpoveď zo servera."
 
 #: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
@@ -4363,7 +4376,7 @@
 #: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
-msgstr "Chybná výzva zo serveru."
+msgstr "Chybná výzva zo servera."
 
 #: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
@@ -4397,7 +4410,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:276
 #: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
-msgstr "Adresa ulice"
+msgstr "Ulica"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
 #: ../libpurple/protocols/jabber/buddy.c:890
@@ -4452,11 +4465,11 @@
 #: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/oscar/oscar.c:3717
 msgid "Birthday"
-msgstr "Narodeniny"
+msgstr "Dátum narodenia"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3095
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Popis"
@@ -4549,7 +4562,7 @@
 #. removed?
 #: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
-msgstr "Odpísať sa"
+msgstr "Odhlásiť sa"
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
 #: ../libpurple/protocols/jabber/jabber.c:1252
@@ -4565,6 +4578,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:726
 #: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../libpurple/protocols/sametime/sametime.c:3298
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Nerušiť"
 
@@ -4604,7 +4618,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Inštrukcie serveru: %s"
+msgstr "Inštrukcie servera: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
@@ -4656,7 +4670,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
-msgstr "Miestnosť:"
+msgstr "_Miestnosť:"
 
 #: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
@@ -4678,12 +4692,12 @@
 #: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s nie je správny názov serveru"
+msgstr "%s nie je správny názov servera"
 
 #: ../libpurple/protocols/jabber/chat.c:230
 #: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
-msgstr "Chybný názov serveru"
+msgstr "Chybný názov servera"
 
 #: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
@@ -4720,7 +4734,7 @@
 #: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
-"V miestnostiach, ktoré nie sú typu \"MUC\", nie je možné zmeniť prezývku."
+"V miestnostiach, ktoré nie sú typu „MUC“, nie je možné zmeniť prezývku."
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
@@ -4747,7 +4761,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
-msgstr "Chyba počas zakladania sedenia"
+msgstr "Chyba počas zakladania relácie"
 
 #: ../libpurple/protocols/jabber/jabber.c:247
 #: ../libpurple/protocols/jabber/jabber.c:300
@@ -4793,7 +4807,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:646
 #: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
-msgstr "Registrácia bola úspešná"
+msgstr "Registrácia úspešná"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
 #: ../libpurple/protocols/jabber/jabber.c:1524
@@ -4808,7 +4822,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:771
 #: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
-msgstr "Už registrovaný"
+msgstr "Už zaregistrovaný"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
 #: ../libpurple/protocols/oscar/oscar.c:3758
@@ -4837,8 +4851,8 @@
 #: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
-"Ak si chcete zaregistrovať nový účet, vyplňte, prosím, nižšie uvedené "
-"informácie"
+"Pre zaregistrovanie vášho nového konta, vyplňte prosím nižšie uvedené "
+"informácie."
 
 #: ../libpurple/protocols/jabber/jabber.c:879
 #: ../libpurple/protocols/jabber/jabber.c:880
@@ -4848,7 +4862,7 @@
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
 msgid "Register"
-msgstr "Register"
+msgstr "Registrovať"
 
 #: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
@@ -4857,7 +4871,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
-msgstr "Overuje sa"
+msgstr "Autentifikácia"
 
 #: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
@@ -4900,7 +4914,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
-msgstr "Zapísanie"
+msgstr "Prihlásenie"
 
 #: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
@@ -4971,7 +4985,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1492
 #: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
-msgstr "Vnútorná chyba serveru"
+msgstr "Vnútorná chyba servera"
 
 #: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
@@ -4979,7 +4993,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
-msgstr "Chybné XMPP ID"
+msgstr "Chybný XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
@@ -5155,22 +5169,22 @@
 #: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Neznáme pričlenenie: \"%s\""
+msgstr "Neznámy vzťah: „%s“"
 
 #: ../libpurple/protocols/jabber/jabber.c:1711
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Používateľ %s sa nedá pričleniť ako \"%s\""
+msgstr "Používateľ %s sa nedá pričleniť ako „%s“"
 
 #: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Neznáma úloha: \"%s\""
+msgstr "Neznáma úloha: „%s“"
 
 #: ../libpurple/protocols/jabber/jabber.c:1735
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Nepodarilo sa nastaviť úlohu \"%s\" pre používateľa: %s"
+msgstr "Nepodarilo sa nastaviť úlohu „%s“ pre používateľa: %s"
 
 #: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
@@ -5199,7 +5213,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1852
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;používateľ&gt; [miestnosť]:  Vykázať používateľa z miestnosti."
+msgstr ""
+"ban &lt;používateľ&gt; [miestnosť]:  Vykázať používateľa z miestnosti."
 
 #: ../libpurple/protocols/jabber/jabber.c:1858
 msgid ""
@@ -5398,7 +5413,7 @@
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s v miestnom zozname je v skupine \"%s\", ale nie je v zozname servera. "
+"%s v miestnom zozname je v skupine „%s“, ale nie je v zozname servera. "
 "Chcete tohto kamaráta pridať?"
 
 #: ../libpurple/protocols/msn/dialog.c:124
@@ -5411,194 +5426,241 @@
 "kamaráta pridať?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Správa sa nedá spracovať"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Chyba syntaxe (pravdepodobne chyba v klientovi)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Chybná e-mailová adresa"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Používateľ neexistuje"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Chýba plne kvalifikované doménové meno"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Už je prihlásený"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "Používateľské meno je chybné"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Priateľské meno je chybné"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Zoznam je plný"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Už sa tam nachádza"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
-msgstr "Nie je na zozname"
+msgstr "Nie je v zozname"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Používateľ je odpojený"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Už v režime"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Už v opačnom zozname"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Príliš veľa skupín"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Chybná skupina"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Používateľ nie je v skupine"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Názov skupiny príliš dlhý"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Nie je možné odstrániť nultú skupinu"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Pokúšate sa pridať používateľa do skupiny, ktorá neexistuje"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Prepojenie zlyhalo"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Upozornenie prenosu zlyhalo"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Chýbajú požadované polia"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Priveľa úderov pre FND"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:119
+#, c-format
 msgid "Not logged in"
 msgstr "Neprihlásený"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Služba je dočasne nedostupná"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
-msgstr "Chyba databázového serveru"
+msgstr "Chyba databázového servera"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Príkaz vypnutý"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Chyba súborového operátora"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Chyba vyhradenie pamäte"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
-msgstr "Nesprávna CHL hodnota zaslaná serveru"
+msgstr "Nesprávna CHL hodnota zaslaná servera"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server zaneprázdnený"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server je nedostupný"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Server upozornenia na partnera je vypnutý"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
-msgstr "Chyba pripojenia ku databáze"
+msgstr "Chyba pripojenia k databáze"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server sa vypína (opustite ľoď)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Chyba pri vytváraní spojenia"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametre sú buď neznáme alebo nedovolené"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Nepodarilo sa zapisovať"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
-msgstr "Sedenie preťažené"
+msgstr "Relácia preťažená"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Používateľ je príliš aktívny"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
-msgstr "Príliš veľa sedení"
+msgstr "Príliš veľa relácií"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Heslo nebolo overené"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Nesprávny súbor priateľa"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Neočakávané"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Priateľské meno sa mení príliš rýchlo"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server je príliš zaneprázdnený"
 
@@ -5607,26 +5669,32 @@
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#, c-format
 msgid "Authentication failed"
 msgstr "Autentifikácia zlyhala"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Nepovolené v odpojenom stave"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Neprijímame nových používateľov"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Detský pas bez súhlasu rodičov"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Účet pasu nebol ešte overený"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Nesprávny lístok"
 
@@ -5769,10 +5837,11 @@
 #: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
-msgstr "Zahájiť _chat"
+msgstr "Začať _chat"
 
 #: ../libpurple/protocols/msn/msn.c:698
-msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL "
 "knižnicu."
@@ -5795,19 +5864,19 @@
 #: ../libpurple/protocols/oscar/oscar.c:3723
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 msgid "Age"
 msgstr "Vek"
 
 #: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Occupation"
-msgstr "Zamestnanie"
+msgstr "Povolanie"
 
 #: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
@@ -5829,7 +5898,7 @@
 msgstr "Sociálne"
 
 #: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Marital Status"
 msgstr "Manželský stav"
 
@@ -5863,7 +5932,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
 #: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
 msgid "Favorite Quote"
 msgstr "Obľúbený citát"
 
@@ -6001,7 +6070,7 @@
 "public profile."
 msgstr ""
 "MSN ohlásilo, že nie je schopné nájsť používateľov profil. To znamená, že "
-"buď užívateľ neexistuje alebo existuje, ale nemá vytvorený verejný profil."
+"používateľ buď neexistuje alebo existuje, ale nemá vytvorený verejný profil."
 
 #: ../libpurple/protocols/msn/msn.c:1833
 msgid ""
@@ -6012,7 +6081,7 @@
 "pravdepodobne neexistuje."
 
 #: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1235
 msgid "Profile URL"
 msgstr "Adresa profilu"
 
@@ -6161,7 +6230,7 @@
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Chyba pripojenia %s serveru:\n"
+"Chyba pripojenia %s servera:\n"
 "%s"
 
 #: ../libpurple/protocols/msn/session.c:299
@@ -6179,7 +6248,8 @@
 msgstr "Prihlásili ste sa z iného miesta."
 
 #: ../libpurple/protocols/msn/session.c:310
-msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgid ""
+"The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN servery sú dočasne nedostupné. Počkajte, prosím, a skúste to znovu."
 
@@ -6225,7 +6295,7 @@
 
 #: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
-msgstr "Na telefóne"
+msgstr "Telefonujem"
 
 #: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
@@ -6256,13 +6326,14 @@
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
-"Správu sa nepodarilo odoslať, pretože nebolo možné založiť sedenie na serveri. "
-"Toto je pravdepodobne problém serveru, skúste to znovu o pár minút:"
+"Správu sa nepodarilo odoslať, pretože nebolo možné založiť reláciu na "
+"serveri. Toto je pravdepodobne problém servera, skúste to znovu o pár minút:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla chyba s prepínačom:"
+msgstr ""
+"Správu sa nepodarilo odoslať, pretože sa vyskytla chyba s prepínačom:"
 
 #: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
@@ -6286,7 +6357,7 @@
 #: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Nepodarilo sa pridať \"%s\"."
+msgstr "Nepodarilo sa pridať „%s“."
 
 #: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
@@ -6458,7 +6529,8 @@
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Nepodarilo sa odoslať správu. Nepodarilo sa vytvoriť konferenciu (%s)."
+msgstr ""
+"Nepodarilo sa odoslať správu. Nepodarilo sa vytvoriť konferenciu (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:584
 #, c-format
@@ -6535,14 +6607,14 @@
 #: ../libpurple/protocols/novell/novell.c:1502
 #: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
-msgstr "Používateľské ID"
+msgstr "ID používateľa"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
-#.
+#. 
 #: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Celé meno"
@@ -6594,7 +6666,8 @@
 
 #. we don't want to reconnect in this case
 #: ../libpurple/protocols/novell/novell.c:2012
-msgid "You have been logged out because you logged in at another workstation."
+msgid ""
+"You have been logged out because you logged in at another workstation."
 msgstr ""
 "Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici."
 
@@ -6607,7 +6680,7 @@
 
 #. TODO: Would be nice to prompt if not set!
 #. *  purple_request_fields(gc, _("Server Address"),...);
-#.
+#. 
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
@@ -6622,6 +6695,7 @@
 msgstr "Chyba. SSL podpora nie je nainštalovaná."
 
 #: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Táto konferencia bola uzavretá. Nie je možné do nej odosielať ďalšie správy."
@@ -6643,11 +6717,11 @@
 
 #: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
-msgstr "Adresa serveru"
+msgstr "Adresa servera"
 
 #: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
-msgstr "Port serveru"
+msgstr "Port servera"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
 #: ../libpurple/protocols/yahoo/yahoo.c:2374
@@ -6668,7 +6742,7 @@
 "Lost connection with server:\n"
 "%s"
 msgstr ""
-"Pripojenie k serveru bolo prerušené:\n"
+"Pripojenie k servera bolo prerušené:\n"
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
@@ -6782,7 +6856,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
-msgstr "Bolo zamietnuté klientom"
+msgstr "Odmietnuté klientom"
 
 #: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
@@ -6818,7 +6892,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
-msgstr "Používateľ dočasne nedostupný"
+msgstr "Používateľ je dočasne nedostupný"
 
 #: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
@@ -6861,8 +6935,8 @@
 "kódovanie ako %s, alebo má %s chybný klient.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Ikona priateľa"
@@ -6958,20 +7032,24 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:724
 #: ../libpurple/protocols/oscar/oscar.c:5728
+#, c-format
 msgid "Free For Chat"
 msgstr "Voľný pre rozhovor"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
 #: ../libpurple/protocols/oscar/oscar.c:5763
+#, c-format
 msgid "Not Available"
 msgstr "Nedostupný"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
 #: ../libpurple/protocols/oscar/oscar.c:5749
+#, c-format
 msgid "Occupied"
 msgstr "Zaneprázdnený"
 
 #: ../libpurple/protocols/oscar/oscar.c:734
+#, c-format
 msgid "Web Aware"
 msgstr "Web aware"
 
@@ -6979,10 +7057,12 @@
 #: ../libpurple/protocols/qq/qq.c:288
 #: ../libpurple/protocols/yahoo/yahoo.c:2995 ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
+#, c-format
 msgid "Invisible"
 msgstr "Neviditeľný"
 
 #: ../libpurple/protocols/oscar/oscar.c:738
+#, c-format
 msgid "Online"
 msgstr "Pripojený"
 
@@ -7035,9 +7115,9 @@
 #: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+"Unable to login: Could not sign on as %s because the screen name is invalid. "
+" Screen names must be a valid email address, or start with a letter and "
+"contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Nepodarilo sa prihlásiť: Nepodarilo sa prihlásiť ako %s, pretože "
 "používateľské meno je chybné.  Používateľské mená musia byť v tvare e-"
@@ -7103,7 +7183,7 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
+#. 
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
@@ -7260,12 +7340,9 @@
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] ""
-"Prišli ste o %hu správ od používateľa %s, pretože boli príliš veľké."
-msgstr[1] ""
-"Prišli ste o %hu správu od používateľa %s, pretože bola príliš veľká."
-msgstr[2] ""
-"Prišli ste o %hu správy od používateľa %s, pretože boli príliš veľké."
+msgstr[0] "%hu správa od %s nebola prijatá, pretože bola príliš veľká."
+msgstr[1] "%hu správy od %s neboli prijaté, pretože boli príliš veľké."
+msgstr[2] "%hu správ od %s nebolo prijatých, pretože boli príliš veľké."
 
 #: ../libpurple/protocols/oscar/oscar.c:2584
 #, c-format
@@ -7296,8 +7373,10 @@
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Prišli ste o %hu správ od používateľa %s, pretože ste príliš zlý."
-msgstr[1] "Prišli ste o %hu správu od používateľa %s, pretože ste príliš zlý."
-msgstr[2] "Prišli ste o %hu správy od používateľa %s, pretože ste príliš zlý."
+msgstr[1] ""
+"Prišli ste o %hu správu od používateľa %s, pretože ste príliš zlý."
+msgstr[2] ""
+"Prišli ste o %hu správy od používateľa %s, pretože ste príliš zlý."
 
 #: ../libpurple/protocols/oscar/oscar.c:2611
 #, c-format
@@ -7311,7 +7390,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "Nepodarilo sa odoslať správu: %s"
+msgstr "Nemôžem odoslať správu: %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:2766
 #: ../libpurple/protocols/oscar/oscar.c:2771
@@ -7323,21 +7402,21 @@
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "Nepodarilo sa odoslať správu používateľovi %s:"
+msgstr "Nemôžem poslať správu k %s:"
 
 #: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
-msgstr "Podrobnosti o používateľovi nie sú dostupné: %s"
+msgstr "Informácie o používateľovi sú nedostupné: %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Pripojený od"
 
 #: ../libpurple/protocols/oscar/oscar.c:2871
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1180
 msgid "Member Since"
-msgstr "Členom od"
+msgstr "Člen od"
 
 #: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
@@ -7353,7 +7432,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
-msgstr "Vaše AIM pripojenie môže byť stratené."
+msgstr "Vaše AIM spojenie je zrejme prerušené."
 
 #. The conversion failed!
 #: ../libpurple/protocols/oscar/oscar.c:3202
@@ -7386,17 +7465,17 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:3727
 msgid "Personal Web Page"
-msgstr "Osobná web stránka"
+msgstr "Osobná webová stránka"
 
 #: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
-msgstr "Rozširujúce informácie"
+msgstr "Ďoplňujúce informácie"
 
 #: ../libpurple/protocols/oscar/oscar.c:3759
 #: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Zip Code"
-msgstr "Zip kód"
+msgstr "PSČ"
 
 #: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Division"
@@ -7445,6 +7524,7 @@
 msgstr "Podvrdenie účtu bolo vyžiadané"
 
 #: ../libpurple/protocols/oscar/oscar.c:3970
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Chyba pri zmene podrobností účtu"
 
@@ -7645,7 +7725,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:5134
 msgid "Authorization Given"
-msgstr "Udelená autorizácia"
+msgstr "Autorizácia udelená"
 
 #. Granted
 #: ../libpurple/protocols/oscar/oscar.c:5207
@@ -7741,7 +7821,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:5950
 msgid "Direct IM"
-msgstr "Priame IM"
+msgstr "Priama rýchla správa"
 
 #: ../libpurple/protocols/oscar/oscar.c:5972
 msgid "Re-request Authorization"
@@ -7753,7 +7833,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:6034
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Web aware (zapnutie tejto možnosti spôsobí, že budete dostávať SPAM!)"
+msgstr ""
+"Web aware (zapnutie tejto možnosti spôsobí, že budete dostávať SPAM!)"
 
 #: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "ICQ Privacy Options"
@@ -7786,7 +7867,7 @@
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "Týchto priateľov môžete znovu požiadať o autorizáciu, keď na nich kliknete "
-"pravým tlačidlom a vyberiete možnosť \"Znovu požiadať o autorizáciu.\""
+"pravým tlačidlom a vyberiete možnosť „Znovu požiadať o autorizáciu“."
 
 #: ../libpurple/protocols/oscar/oscar.c:6179
 msgid "Find Buddy by E-Mail"
@@ -7873,6 +7954,7 @@
 msgstr "Pokúšame sa pripojiť ku %s:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:833
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Pokúšame sa pripojiť cez proxy server."
 
@@ -8151,7 +8233,7 @@
 
 #: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
-msgstr "ID:"
+msgstr "ID: "
 
 #: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
@@ -8217,8 +8299,7 @@
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
-"Vaša požiadavka pre vstup do skupiny %d bola odmietnutá administrátorom %"
-"d"
+"Vaša požiadavka pre vstup do skupiny %d bola odmietnutá administrátorom %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
@@ -8229,12 +8310,12 @@
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr "[%d] Opustili ste skupinu \"%d\""
+msgstr "[%d] Opustili ste skupinu „%d“"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "[%d] Boli ste pridaný do skupiny \"%d\""
+msgstr "[%d] Boli ste pridaný do skupiny „%d“"
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
@@ -8398,7 +8479,7 @@
 #: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP serveru</b>: %s: %d<br>\n"
+msgstr "<b>IP servera</b>: %s: %d<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:446
 #, c-format
@@ -8719,7 +8800,7 @@
 "this user to."
 msgstr ""
 "Vyberte konferenciu zo zoznamu nižšie pre odoslanie pozvánky pre používateľa "
-"%s. Vyberte \"Vytvoriť novú konferenciu\", ak chcete vytvoriť novú "
+"%s. Vyberte „Vytvoriť novú konferenciu“, ak chcete vytvoriť novú "
 "konferenciu, kam chcete pozvať tohto používateľa."
 
 #: ../libpurple/protocols/sametime/sametime.c:3472
@@ -8759,7 +8840,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Nebol určený žiadny server komunity rovnakého času"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4024
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4026
 msgid "Connect"
 msgstr "Pripojiť"
 
@@ -8792,7 +8873,7 @@
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"Identifikátor '%s' môže odkazovať na ktoréhokoľvek z nasledujúcich "
+"Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich "
 "používateľov. Vyberte, prosím, správneho používateľa zo zoznamu nižšie a "
 "pridajte ho do svojho zoznamu kamarátov."
 
@@ -8810,7 +8891,7 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"Identifikátoru '%s' nevyhovujú žiadni používatelia vo vašej Sametime "
+"Identifikátoru „%s“ nevyhovujú žiadni používatelia vo vašej Sametime "
 "komunite. Tento záznam bol odstránený z vášho zoznamu priateľov."
 
 #: ../libpurple/protocols/sametime/sametime.c:4426
@@ -8867,7 +8948,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Skupina pomenovaná '%s' sa už nachádza vo vašom zozname priateľov."
+msgstr "Skupina s názvom „%s“ sa už nachádza vo vašom zozname priateľov."
 
 #: ../libpurple/protocols/sametime/sametime.c:5314
 #: ../libpurple/protocols/sametime/sametime.c:5444
@@ -8889,7 +8970,7 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"Identifikátor '%s' môže odkazovať na ktoréhokoľvek z nasledujúcich skupín "
+"Identifikátor „%s“ môže odkazovať na ktoréhokoľvek z nasledujúcich skupín "
 "Notes zoznamu adries. Vyberte, prosím, správneho používateľa zo zoznamu "
 "nižšie a pridajte ho do svojho zoznamu kamarátov."
 
@@ -8907,8 +8988,8 @@
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"Identifikátoru '%s' nevyhovujú žiadne skupiny Notes zoznamu adries vo vašej "
-"Sametime komunite. "
+"Identifikátoru „%s“ nevyhovujú žiadne skupiny Notes zoznamu adries vo vašej "
+"Sametime komunite."
 
 #: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
@@ -8925,7 +9006,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
-msgstr "Výsledky vyhľadávania '%s'"
+msgstr "Výsledky vyhľadávania „%s“"
 
 #: ../libpurple/protocols/sametime/sametime.c:5532
 #, c-format
@@ -8934,9 +9015,9 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"Identifikátoru '%s' môže vyhovovať niektorý z týchto používateľov. Môžete si "
+"Identifikátoru „%s“ môže vyhovovať niektorý z týchto používateľov. Môžete si "
 "ho pridať do vášho zoznamu priateľov, alebo mu odoslať správu pomocou "
-"tlačidiel, ktoré sú nižšie. "
+"tlačidiel, ktoré sú nižšie."
 
 #. Create the window
 #: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:726
@@ -8949,10 +9030,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"Identifikátoru '%s' nevyhovujú žiadni používatelia vo vašej Sametime "
-"komunite. "
+"Identifikátoru „%s“ nevyhovujú žiadni používatelia vo vašej Sametime "
+"komunite."
 
 #: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
@@ -9197,7 +9279,7 @@
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "Nemôžete prijímať upozornenia na priateľa, dokým si neimportujete jeho "
-"verejný kľúč. Kľúč je možné importovať možnosťou \"Získať verejný kľúč\"."
+"verejný kľúč. Kľúč je možné importovať možnosťou „Získať verejný kľúč“."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1059
@@ -9464,7 +9546,7 @@
 #: ../libpurple/protocols/silc/chat.c:39
 #: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
-msgstr "Heslo:"
+msgstr "_Heslo:"
 
 #: ../libpurple/protocols/silc/chat.c:80
 #: ../libpurple/protocols/silc10/chat.c:80
@@ -9523,6 +9605,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Režimy kanála:</b> "
 
@@ -9552,7 +9635,7 @@
 #: ../libpurple/protocols/silc/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
-msgstr "Heslo kanálu"
+msgstr "Heslo kanála"
 
 #: ../libpurple/protocols/silc/chat.c:430
 #: ../libpurple/protocols/silc10/chat.c:408
@@ -9561,6 +9644,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9700,12 +9784,12 @@
 #: ../libpurple/protocols/silc/chat.c:1047
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
-msgstr "Pripojiť sa do súktormej skupiny"
+msgstr "Pripojiť sa k súkromnej skupine"
 
 #: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
-msgstr "Nepodarilo sa pripojiť do súkromnej skupiny"
+msgstr "Nepodarilo sa pripojiť k súkromnej skupine"
 
 #: ../libpurple/protocols/silc/chat.c:1260
 #: ../libpurple/protocols/silc/silc.c:1217
@@ -9778,11 +9862,11 @@
 
 #: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "Sedenie prenosu súborov neexistuje"
+msgstr "Relácia prenosu súborov neexistuje"
 
 #: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
-msgstr "Nie je aktívne žiadne sedenie pre prenos súborov"
+msgstr "Nie je aktívna žiadna relácia prenosu súborov"
 
 #: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
@@ -9812,7 +9896,7 @@
 #: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "používateľ %s zmeníl tému <I>%s</I> na: %s"
+msgstr "%s zmenil tému <I>%s</I> na: %s"
 
 #: ../libpurple/protocols/silc/ops.c:617
 #: ../libpurple/protocols/silc10/ops.c:638
@@ -9865,7 +9949,7 @@
 #: ../libpurple/protocols/silc/ops.c:796
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
-msgstr "Odhlásenie zo serveru"
+msgstr "Odhlásenie zo servera"
 
 #: ../libpurple/protocols/silc/ops.c:983
 #: ../libpurple/protocols/silc10/ops.c:1017
@@ -9902,7 +9986,7 @@
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
-msgstr "Pripojiť sa na chat"
+msgstr "Pripojiť sa k rozhovoru"
 
 #: ../libpurple/protocols/silc/ops.c:1127
 #: ../libpurple/protocols/silc10/chat.c:1039
@@ -9920,7 +10004,7 @@
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
 msgid "Real Name"
 msgstr "Skutočné meno"
 
@@ -9953,7 +10037,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
-msgstr "Odpojiť zo serveru"
+msgstr "Odpojiť zo servera"
 
 #: ../libpurple/protocols/silc/ops.c:1369
 #: ../libpurple/protocols/silc10/ops.c:1371
@@ -10005,12 +10089,12 @@
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
-msgstr "Štatistiky serveru"
+msgstr "Štatistiky servera"
 
 #: ../libpurple/protocols/silc/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
-msgstr "Nepodarilo sa zobraziť štatistiky serveru"
+msgstr "Nepodarilo sa zobraziť štatistiky servera"
 
 #: ../libpurple/protocols/silc/ops.c:1556
 #: ../libpurple/protocols/silc10/ops.c:1581
@@ -10033,10 +10117,10 @@
 "Total router operators: %d\n"
 msgstr ""
 "Čas spustenia lokálneho serveri: %s\n"
-"Dĺžka behu lokálneho serveru: %s\n"
-"Klienti lokálneho serveru: %d\n"
-"Kanály lokálneho serveru: %d\n"
-"Operátori lokálneho serveru: %d\n"
+"Dĺžka behu lokálneho servera: %s\n"
+"Klienti lokálneho servera: %d\n"
+"Kanály lokálneho servera: %d\n"
+"Operátori lokálneho servera: %d\n"
 "Operátori lokálneho routeru: %d\n"
 "Lokálni cell klienti: %d\n"
 "Lokálne cell kanály: %d\n"
@@ -10045,7 +10129,7 @@
 "Celkom kanálov: %d\n"
 "Celkom serverov: %d\n"
 "Celkom routerov: %d\n"
-"Celkom operátorov serveru: %d\n"
+"Celkom operátorov servera: %d\n"
 "Celkom operátorov routeru: %d\n"
 
 #: ../libpurple/protocols/silc/ops.c:1588
@@ -10068,7 +10152,7 @@
 #: ../libpurple/protocols/silc/ops.c:1601
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
-msgstr "Bola prijatá odpoveď na ping zo serveru"
+msgstr "Bola prijatá odpoveď na ping zo servera"
 
 #: ../libpurple/protocols/silc/ops.c:1609
 #: ../libpurple/protocols/silc10/ops.c:1625
@@ -10090,7 +10174,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
-msgstr "Obnovuje sa sedenie"
+msgstr "Obnovuje sa relácia"
 
 #: ../libpurple/protocols/silc/ops.c:1726
 #: ../libpurple/protocols/silc10/ops.c:1813
@@ -10100,7 +10184,7 @@
 #: ../libpurple/protocols/silc/ops.c:1777
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
-msgstr "Overuje sa verejný kľúč serveru"
+msgstr "Overuje sa verejný kľúč servera"
 
 #: ../libpurple/protocols/silc/ops.c:1814
 #: ../libpurple/protocols/silc10/ops.c:1902
@@ -10168,7 +10252,7 @@
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Pokračovanie v odpojenom sedení zlyhalo. Kliknutím na Znovu pripojiť "
+"Obnovenie prerušenej relácie zlyhalo. Kliknutím na „Znovu pripojiť“ "
 "vytvoríte nové pripojenie."
 
 #: ../libpurple/protocols/silc/silc.c:265
@@ -10189,8 +10273,9 @@
 msgstr "Pripája sa na SILC server"
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
-msgstr "Nedá sa načínať pár kľúčov SILC"
+msgstr "Nedá sa načítať pár kľúčov SILC"
 
 #: ../libpurple/protocols/silc/silc.c:366
 #: ../libpurple/protocols/silc10/silc.c:355
@@ -10200,7 +10285,7 @@
 #: ../libpurple/protocols/silc/silc.c:395
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
-msgstr "Mimo pamäte"
+msgstr "Nedostatok pamäte"
 
 #: ../libpurple/protocols/silc/silc.c:438
 #: ../libpurple/protocols/silc10/silc.c:313
@@ -10218,6 +10303,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#, c-format
 msgid "Normal"
 msgstr "Normálna"
 
@@ -10299,7 +10385,7 @@
 msgstr ""
 "Ak chcete, môžete ostatným používateľom umožniť, aby videli, či ste "
 "pripojení, a poznalii vaše osobné informácie. Vyplňte, prosím, len tie "
-"informácie, ktoré chcete, aby ich ostatní používatelia o vás videli. "
+"informácie, ktoré chcete, aby ich ostatní používatelia o vás videli."
 
 #: ../libpurple/protocols/silc/silc.c:859
 #: ../libpurple/protocols/silc/silc.c:865
@@ -10397,7 +10483,7 @@
 #: ../libpurple/protocols/silc/silc.c:1438
 #: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
-msgstr "Je potrebné zadať prezývku"
+msgstr "Musíte zadať prezývku"
 
 #: ../libpurple/protocols/silc/silc.c:1540
 #: ../libpurple/protocols/silc10/silc.c:1469
@@ -10468,7 +10554,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:1682
 #: ../libpurple/protocols/silc10/silc.c:1611
-msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgid ""
+"query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;prezývka&gt; [&lt;správa&gt;]:  Odoslať súkromnú správu "
 "používateľovi"
@@ -10476,12 +10563,12 @@
 #: ../libpurple/protocols/silc/silc.c:1686
 #: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  Zobraziť \"správu dňa\" serveru"
+msgstr "motd:  Zobraziť „správu dňa“ servera"
 
 #: ../libpurple/protocols/silc/silc.c:1690
 #: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
-msgstr "detach:  Odpojiť toto sedenie"
+msgstr "detach:  Odpojiť túto reláciu"
 
 #: ../libpurple/protocols/silc/silc.c:1694
 #: ../libpurple/protocols/silc10/silc.c:1623
@@ -10534,7 +10621,7 @@
 #: ../libpurple/protocols/silc/silc.c:1728
 #: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;prezývka&gt; [-pubkey]:  Získať práva operátora serveru"
+msgstr "oper &lt;prezývka&gt; [-pubkey]:  Získať práva operátora servera"
 
 #: ../libpurple/protocols/silc/silc.c:1732
 #: ../libpurple/protocols/silc10/silc.c:1661
@@ -10542,19 +10629,20 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  pozvať priateľa, alebo pridať/"
-"odstrániť zo zoznamu pozvaných na kanál"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  pozvať priateľa, alebo "
+"pridať/odstrániť zo zoznamu pozvaných na kanál"
 
 #: ../libpurple/protocols/silc/silc.c:1736
 #: ../libpurple/protocols/silc10/silc.c:1665
-msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgid ""
+"kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanál&gt; &lt;prezývka&gt; [komentár]:  Vyhodiť klienta z kanála"
 
 #: ../libpurple/protocols/silc/silc.c:1740
 #: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  Zobraziť administratívne detaily serveru"
+msgstr "info [server]:  Zobraziť administratívne detaily servera"
 
 #: ../libpurple/protocols/silc/silc.c:1744
 #: ../libpurple/protocols/silc10/silc.c:1673
@@ -10570,7 +10658,7 @@
 #: ../libpurple/protocols/silc/silc.c:1752
 #: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
-msgstr "stats:  Zobrazí štatistiky serveru a siete"
+msgstr "stats:  Zobrazí štatistiky servera a siete"
 
 #: ../libpurple/protocols/silc/silc.c:1756
 #: ../libpurple/protocols/silc10/silc.c:1685
@@ -10790,7 +10878,7 @@
 #: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr "Používateľ %s odoslal správu na tabuľu. Prajete si otvoriť tabuľu"
+msgstr "Používateľ %s odoslal správu na tabuľu. Želáte si otvoriť tabuľu?"
 
 #: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
@@ -10798,7 +10886,7 @@
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-"Používateľ %s odoslal správu na tabuľu na kanáli %s. Prajete si otvoriť "
+"Používateľ %s odoslal správu na tabuľu na kanáli %s. Želáte si otvoriť "
 "tabuľu?"
 
 #: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
@@ -10810,43 +10898,53 @@
 msgstr "Nie sú dostupné žiadne štatistiky"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Zlyhanie: Nezhoda verzií, aktualizujte vášho klienta"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Zlyhanie: Druhá strana nepodroruje alebo nedôveruje vášmu verejnému kľúču"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadanú KE skupinu"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadanú šifru"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Zlyhanie: Druhá strana nepodroruje vyžiadané PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Chyba: Vzdialený nepodporuje ponúknutú hash funkciu"
+msgstr "Chyba: Vzdialený nepodporuje ponúknutú hašovaciu funkciu"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Chyba: Vzdialený nepodporuje ponúknutú HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Chyba: Nesprávny podpis"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Chyba: Neplatné cookie"
+msgstr "Chyba: Neplatný koláčik (cookie)"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Zlyhala antentifikácia"
 
@@ -10955,12 +11053,12 @@
 #: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
-msgstr "Nepodarilo sa čítať zo súboru %s."
+msgstr "Nepodarilo sa zapísať do súboru %s."
 
 #: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
-msgstr "Nepodarilo sa zapisovať do súboru %s."
+msgstr "Nepodarilo sa čítať zo súboru %s."
 
 #: ../libpurple/protocols/toc/toc.c:494
 #, c-format
@@ -10978,8 +11076,9 @@
 msgstr "Varovanie na %s nie je dovolené."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Správa bola zrušená, prekračujete rýchlostný limit serveru"
+msgstr "Správa bola zrušená, prekračujete rýchlostný limit servera"
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -11003,38 +11102,47 @@
 "Prišli ste o správu od používateľa %s, pretože bola odoslaná príliš rýchlo."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Zlyhanie."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Príliš veľa výskytov."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Vyžaduje viac parametrov."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Služba dir je dočasne nedostupná"
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Vyhľadávanie e-mailu obmedzené."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Kľúčové slovo bolo ignorované."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Žiadne kľúče."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Používateľ nemá žiadne podrobnosti v adresári."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Krajina nie je podporovaná."
 
@@ -11044,20 +11152,24 @@
 msgstr "Neznáme zlyhanie: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Nesprávne používateľské meno alebo heslo."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Služba je dočasne nedostupná."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Vaša úroveň upozornenia je momentálne príliš vysoká na to, aby ste sa mohli "
 "prihlásiť."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -11081,7 +11193,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
-msgstr "Pripojenie uzavreté"
+msgstr "Spojenie ukončené"
 
 #: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
@@ -11095,10 +11207,10 @@
 msgid "Password Change Successful"
 msgstr "Heslo bolo úspešne zmenené"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5883
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5534
+#: ../pidgin/gtkblist.c:5887
 msgid "_Group:"
-msgstr "Skupina:"
+msgstr "_Skupina:"
 
 #: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
@@ -11135,14 +11247,14 @@
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %s)%"
-"s%s"
+"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f "
+"%s)%s%s"
 msgstr[1] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súboru: %s (%.2f %s)%s"
-"%s"
+"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súboru: %s (%.2f "
+"%s)%s%s"
 msgstr[2] ""
-"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f %s)%"
-"s%s"
+"Používateľ %s vyžaduje od používateľa %s potvrdenie %d súborov: %s (%.2f "
+"%s)%s%s"
 
 #: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
@@ -11165,7 +11277,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:823
 msgid "Your Yahoo! message did not get sent."
-msgstr "Vaša Yahoo! správa sa neodoslala."
+msgstr "Vaša Yahoo! správa nebola odoslaná."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:895
 #, c-format
@@ -11199,7 +11311,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1148
 msgid "Add buddy rejected"
-msgstr "Pridanie kamaráta odmietnuté"
+msgstr "Pridanie kamaráta bolo odmietnuté"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1899
 #, c-format
@@ -11222,7 +11334,7 @@
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 "Pokúsili ste sa ignorovať používateľa %s, ale používateľ sa nachádza na "
-"vašom zozname priateľov. Kliknutím \"Áno\" odstránite používateľa zo zoznamu "
+"vašom zozname priateľov. Kliknutím „Áno“ odstránite používateľa zo zoznamu "
 "priateľov a ignorujete ho."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1971
@@ -11235,7 +11347,8 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2037
 #, c-format
-msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgid ""
+"Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Neznáme číslo chyby %d. Prihlásenie sa na stránke Yahoo! to môže napraviť."
 
@@ -11257,7 +11370,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2556
 msgid "Received unexpected HTTP response from server."
-msgstr "Zo serveru bola prijatá neočakávaná HTTP odpoveď."
+msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2580
 #: ../libpurple/protocols/yahoo/yahoo.c:2766
@@ -11267,7 +11380,7 @@
 #: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
-msgstr "Problém pripojenia"
+msgstr "Problém s pripojením"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2606
 #, c-format
@@ -11284,7 +11397,7 @@
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"Nebolo možné založiť spojenie s %s:\n"
+"Nebolo možné nadviazať spojenie s %s:\n"
 "%s"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2981
@@ -11333,15 +11446,15 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3197
 msgid "Appear Offline"
-msgstr "Javí sa odpojený"
+msgstr "Vyzerať odpojený"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Don't Appear Permanently Offline"
-msgstr "Nejaví sa trvale odpojený"
+msgstr "Nevyzerať sa trvale odpojený"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Join in Chat"
-msgstr "Spojiť sa v chate"
+msgstr "Pripojiť sa k rozhovoru"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3260
 msgid "Initiate Conference"
@@ -11353,7 +11466,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Start Doodling"
-msgstr "Začať \"Doodlovať\""
+msgstr "Začať Čmárať"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3395
 msgid "Activate which ID?"
@@ -11390,11 +11503,11 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4015
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Pošlite používateľovi \"bzzz\" a tým si získajte jeho pozornosť"
+msgstr "buzz: Pošlite používateľovi „bzzz“ a tým si získajte jeho pozornosť"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4019
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Požiadať používateľa o sedenie Doodle"
+msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie"
 
 #. *< type
 #. *< ui_requirement
@@ -11417,15 +11530,15 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4255
 msgid "Pager server"
-msgstr "Server pageru"
+msgstr "Pager server"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4258
 msgid "Japan Pager server"
-msgstr "Server pageru pre Japonsko"
+msgstr "Pager server pre Japonsko"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4261
 msgid "Pager port"
-msgstr "Port pageru"
+msgstr "Port pagera"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4264
 msgid "File transfer server"
@@ -11463,8 +11576,7 @@
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
-"%s odmietol vaše pozvanie na konferenciu do miestnosti \"%s\", pretože \"%s"
-"\"."
+"%s odmietol vaše pozvanie na konferenciu do miestnosti „%s“, pretože „%s“."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
@@ -11534,16 +11646,16 @@
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
-#.
+#. 
 #: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
-msgstr "Odoslať požiadavku Doodle."
+msgstr "Odoslať žiadosť na začatie Čmárania."
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
-msgstr "Nepodarilo sa založiť deskriptor súboru."
+msgstr "Nepodarilo sa založiť popisovač súboru."
 
 #. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
@@ -11571,50 +11683,50 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Ak si chcete prezrieť tento profil, musíte navštívíť tento odkaz vo vašom "
-"internetovom prehliadači:"
+"Ak si želáte vidieť tento profil, budete musieť navštíviť tento odkaz vo "
+"vašom webovom prehliadači."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1029
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1104
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1112
 msgid "Hobbies"
 msgstr "Koníčky"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1122
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1126
 msgid "Latest News"
 msgstr "Aktuálne novinky"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1147
 msgid "Home Page"
 msgstr "Domovská stránka"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1162
 msgid "Cool Link 1"
 msgstr "Super odkaz 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 2"
 msgstr "Super odkaz 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1171
 msgid "Cool Link 3"
 msgstr "Super odkaz 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Last Update"
 msgstr "Posledná aktualizácia"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1194
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podrobnosti o používateľovi %s nie sú dostupné"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -11622,15 +11734,15 @@
 "Prepáčte, ale tento profil je v jazyku alebo formáte, ktorý momentálne nie "
 "je podporovaný."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 "Nepodarilo sa stiahnuť profil používateľa. Toto je zrejme krádkodobý problém "
-"na strane serveru. Skúste to, prosím, neskôr."
+"na strane servera. Skúste to, prosím, neskôr."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1219
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11641,7 +11753,7 @@
 "používateľa. Ak ste si istý, že tento používateľ existuje, skúste to znovu "
 "neskôr."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1226
 msgid "The user's profile is empty."
 msgstr "Profil používateľa je prázdny."
 
@@ -11664,7 +11776,7 @@
 "in the Account Editor)"
 msgstr ""
 "(Počas prevodu tejto správy sa vyskytla chyba.\t Skontrolujte možnosť "
-"'kódovanie' v editore účtu)"
+"„kódovanie“ v editore účtu)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -11694,7 +11806,7 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
-msgstr "Trieda:"
+msgstr "_Trieda:"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
@@ -11742,31 +11854,32 @@
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;inštancia&gt;: Poslať správu &lt;správa,<i>inštancia</i>,*&gt;"
+msgstr ""
+"zi &lt;inštancia&gt;: Poslať správu &lt;správa,<i>inštancia</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to "
+"&lt;<i>class</i>,<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;trieda&gt; &lt;inštancia&gt;: Poslať správu &lt;<i>trieda</i>,"
-"<i>inštancia</i>,*&gt;"
+"zci &lt;trieda&gt; &lt;inštancia&gt;: Poslať správu "
+"&lt;<i>trieda</i>,<i>inštancia</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to "
+"&lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &lt;trieda&gt; &lt;inštancia&gt; &lt;príjemca&gt;: Poslať správu &lt;"
-"<i>trieda</i>,<i>inštancia</i>,<i>príjemca</i>&gt;"
+"zcir &lt;trieda&gt; &lt;inštancia&gt; &lt;príjemca&gt;: Poslať správu "
+"&lt;<i>trieda</i>,<i>inštancia</i>,<i>príjemca</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to "
+"&lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &lt;inštancia&gt; &lt;príjemca&gt;: Poslať správu &lt;SPRÁVA,"
-"<i>inštancia</i>,<i>príjemca</i>&gt;"
+"zir &lt;inštancia&gt; &lt;príjemca&gt;: Poslať správu "
+"&lt;SPRÁVA,<i>inštancia</i>,<i>príjemca</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -11778,7 +11891,7 @@
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
-msgstr "Získať zápisy zo serveru"
+msgstr "Získať zápisy zo servera"
 
 #. *< type
 #. *< ui_requirement
@@ -11851,7 +11964,8 @@
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d."
+msgstr ""
+"Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d."
 
 #: ../libpurple/proxy.c:995
 #, c-format
@@ -11864,7 +11978,7 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#.
+#. 
 #: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "Án_o"
@@ -11875,14 +11989,14 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#.
+#. 
 #: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "Použiť"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
-#.
+#. 
 #: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Momentálne nie som prítomný"
@@ -12246,11 +12360,11 @@
 "toto okno otvoríte v ponuke <b>Účty->Pridať/Upraviťt</b> v okne Zoznam "
 "priateľov"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:762
 msgid "Join a Chat"
 msgstr "Pripojiť sa k chatu"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:783
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12259,92 +12373,92 @@
 "pripojiť.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5478
-#: ../pidgin/gtkblist.c:5844 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:794 ../pidgin/gtkblist.c:5482
+#: ../pidgin/gtkblist.c:5848 ../pidgin/gtkpounce.c:540
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Účet:"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1083 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokovať"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1083
 msgid "Un_block"
 msgstr "Od_blokovať"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1134
 msgid "Get _Info"
 msgstr "Zobraziťo podrobnosti"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1137 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1143
 msgid "_Send File"
 msgstr "Odoslať _súbor"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1150
 msgid "Add Buddy _Pounce"
 msgstr "Pridať _sledovanie priatela"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1264 ../pidgin/gtkblist.c:1287
 msgid "View _Log"
 msgstr "Zobraziť _záznam"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1172 ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Alias..."
 msgstr "_Prezývka..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkblist.c:1295
 msgid "_Remove"
 msgstr "Odst_rániť"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1233
 msgid "Add a _Buddy"
 msgstr "Pridať priateľa"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a C_hat"
 msgstr "Pridať chat"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1239
 msgid "_Delete Group"
 msgstr "Odstrániť skupinu"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1241
 msgid "_Rename"
 msgstr "Premenovať"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1260 ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
-msgstr "Vstúpiť"
+msgstr "Pripo_jiť"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1262
 msgid "Auto-Join"
 msgstr "Automatické prihlasovanie"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1300 ../pidgin/gtkblist.c:1324
 msgid "_Collapse"
-msgstr "_Zabaliť"
+msgstr "_Zbaliť"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1329
 msgid "_Expand"
 msgstr "_Rozbaliť"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4572 ../pidgin/gtkblist.c:4582
+#: ../pidgin/gtkblist.c:1574 ../pidgin/gtkblist.c:1586
+#: ../pidgin/gtkblist.c:4576 ../pidgin/gtkblist.c:4586
 msgid "/Tools/Mute Sounds"
 msgstr "/Nástroje/Vypnúť zvuky"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4731
+#: ../pidgin/gtkblist.c:2046 ../pidgin/gtkconv.c:4731
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -12353,126 +12467,126 @@
 "priateľa."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2852
 msgid "/_Buddies"
 msgstr "/_Priatelia"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Priatelia/Nová _správa..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Priatelia/Pripojiť sa k _chatu..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/Get User _Info..."
 msgstr "/Priatelia/_Podrobnosti o používateľovi..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/View User _Log..."
 msgstr "/Priatelia/_Záznam používateľa..."
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Priatelia/Zobraziť _nepripojených priateľov"
 
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Priateliai/Zobraziť prázdne s_kupiny"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Priatelia/Zobraziť _detaily priateľov"
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2861
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Priatelia/Zobraziť č_asy nečinnosti"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Priatelia/Zo_radiť priateľov"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Priatelia/Pridať priat_eľa..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2865
 msgid "/Buddies/Add C_hat..."
 msgstr "/Priatelia/Pridať cha_t..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/Add _Group..."
 msgstr "/Priatelia/Pridať sk_upinu..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/_Quit"
 msgstr "/Priatelia/_Ukončiť"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2871
 msgid "/_Accounts"
 msgstr "/Úč_ty"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6542
+#: ../pidgin/gtkblist.c:2872 ../pidgin/gtkblist.c:6546
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Účty/Pri_dať a upraviť"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2875
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Nástroje/_Sledovanie priateľov"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Plu_gins"
 msgstr "/Nástroje/_Moduly"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2878
 msgid "/Tools/Pr_eferences"
 msgstr "/Nástroje/_Nastavenia"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Súkromie"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Prenosy súborov"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2882
 msgid "/Tools/R_oom List"
 msgstr "/Nástroje/Zoznam _miestností"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/System _Log"
 msgstr "/Nástroje/Systémový _záznam"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2885
 msgid "/Tools/Mute _Sounds"
 msgstr "/Nástroje/Vypnúť _zvuky"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Help"
 msgstr "/_Pomocník"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2888
 msgid "/Help/Online _Help"
 msgstr "/Pomoc/Online _pomocník"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2889
 msgid "/Help/_Debug Window"
 msgstr "/Pomoc/_Ladiace okno"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:2893
 msgid "/Help/_About"
 msgstr "/Pomoc/O _programe"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2922
 #, c-format
 msgid ""
 "\n"
@@ -12481,78 +12595,78 @@
 "\n"
 "<b>Účet:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3000
 msgid "Buddy Alias"
 msgstr "Prezývka priateľa"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3029
 msgid "Logged In"
 msgstr "Prihlásený"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3075
 msgid "Last Seen"
-msgstr "Naposledy tu"
+msgstr "Naposledy videný"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3095
 msgid "Spooky"
 msgstr "Strašidelné"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3097
 msgid "Awesome"
 msgstr "Hrozné"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3099
 msgid "Rockin'"
 msgstr "Super"
 
-#: ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkblist.c:3438
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nečinný %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3438
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nečinný %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3442
 #, c-format
 msgid "Idle %dm"
 msgstr "Nečinný %dm"
 
-#: ../pidgin/gtkblist.c:3585
+#: ../pidgin/gtkblist.c:3587
 msgid "/Buddies/New Instant Message..."
 msgstr "/Priatelia/Nová _správa..."
 
-#: ../pidgin/gtkblist.c:3586 ../pidgin/gtkblist.c:3619
+#: ../pidgin/gtkblist.c:3588 ../pidgin/gtkblist.c:3621
 msgid "/Buddies/Join a Chat..."
 msgstr "/Priatelia/Pripojiť sa k _chatu..."
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3589
 msgid "/Buddies/Get User Info..."
 msgstr "/Priatelia/Zobraziť podrobnosti..."
 
-#: ../pidgin/gtkblist.c:3588
+#: ../pidgin/gtkblist.c:3590
 msgid "/Buddies/Add Buddy..."
 msgstr "/Priatelia/Pridať priateľa..."
 
-#: ../pidgin/gtkblist.c:3589 ../pidgin/gtkblist.c:3622
+#: ../pidgin/gtkblist.c:3591 ../pidgin/gtkblist.c:3624
 msgid "/Buddies/Add Chat..."
 msgstr "/Priatelia/Pridať chat..."
 
-#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3592
 msgid "/Buddies/Add Group..."
 msgstr "/Priatelia/Pridať skupinu..."
 
-#: ../pidgin/gtkblist.c:3625
+#: ../pidgin/gtkblist.c:3627
 msgid "/Tools/Privacy"
 msgstr "/Nástroje/_Súkromie"
 
-#: ../pidgin/gtkblist.c:3628
+#: ../pidgin/gtkblist.c:3630
 msgid "/Tools/Room List"
 msgstr "/Nástroje/Zoznam _miestností"
 
-#: ../pidgin/gtkblist.c:3725 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3727 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -12560,61 +12674,66 @@
 msgstr[1] "%d neprečítaná správa od používateľa %s\n"
 msgstr[2] "%d neprečítané správy od používateľa %s\n"
 
-#: ../pidgin/gtkblist.c:3805
+#: ../pidgin/gtkblist.c:3807
 msgid "Manually"
 msgstr "Ručne"
 
-#: ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkblist.c:3809
 msgid "Alphabetically"
 msgstr "Podľa abecedy"
 
-#: ../pidgin/gtkblist.c:3808
+#: ../pidgin/gtkblist.c:3810
 msgid "By status"
 msgstr "Podľa stavu"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3811
 msgid "By log size"
 msgstr "Podľa veľkosti záznamu"
 
-#: ../pidgin/gtkblist.c:4014 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4016 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bol odpojený"
 
-#: ../pidgin/gtkblist.c:4024
+#: ../pidgin/gtkblist.c:4026
 msgid "Re-enable Account"
 msgstr "Znovu povoliť účet"
 
-#: ../pidgin/gtkblist.c:4050
+#: ../pidgin/gtkblist.c:4052
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bol odpojený: %s</span>"
 
-#: ../pidgin/gtkblist.c:4202
+#: ../pidgin/gtkblist.c:4204
 msgid "<b>Username:</b>"
 msgstr "<b>Prihlasovacie meno:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4211
 msgid "<b>Password:</b>"
 msgstr "<b>Heslo:</b>"
 
-#: ../pidgin/gtkblist.c:4220
+#: ../pidgin/gtkblist.c:4222
 msgid "_Login"
 msgstr "Prihlásiť"
 
-#: ../pidgin/gtkblist.c:4303
+#: ../pidgin/gtkblist.c:4295
+msgid "/Help"
+msgstr "/_Pomocník"
+
+#: ../pidgin/gtkblist.c:4307
 msgid "/Accounts"
 msgstr "/Účty"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4321
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the "
+"<b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable "
+"accounts, you'll be able to sign on, set your status, and talk to your "
+"friends."
 msgstr ""
 "<span weight='bold' size='larger'>Vitajte v programe %s!</span>\n"
 "\n"
@@ -12625,24 +12744,24 @@
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../pidgin/gtkblist.c:4566
+#. 
+#: ../pidgin/gtkblist.c:4570
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Priatelia/Zobraziť _nepripojených priateľov"
 
-#: ../pidgin/gtkblist.c:4569
+#: ../pidgin/gtkblist.c:4573
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Priatelia/Zobraziť prázdne s_kupiny"
 
-#: ../pidgin/gtkblist.c:4575
+#: ../pidgin/gtkblist.c:4579
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Nástroje/Zobraziť _detaily priateľov"
 
-#: ../pidgin/gtkblist.c:4578
+#: ../pidgin/gtkblist.c:4582
 msgid "/Buddies/Show Idle Times"
 msgstr "/Priatelia/Zobraziť č_asy nečinnosti"
 
-#: ../pidgin/gtkblist.c:5455
+#: ../pidgin/gtkblist.c:5459
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12653,25 +12772,25 @@
 "v zozname priateľov namiesto mena používateľa vždy, keď to bude možné.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5490
+#: ../pidgin/gtkblist.c:5494
 msgid "_Screen name:"
 msgstr "_Používateľské meno:"
 
-#: ../pidgin/gtkblist.c:5512 ../pidgin/gtkblist.c:5865
+#: ../pidgin/gtkblist.c:5516 ../pidgin/gtkblist.c:5869
 msgid "A_lias:"
 msgstr "P_rezývka:"
 
-#: ../pidgin/gtkblist.c:5777
+#: ../pidgin/gtkblist.c:5781
 msgid "This protocol does not support chat rooms."
 msgstr "Tento protokol nepodporuje miestnosti chatu."
 
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5797
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Momentálne nie ste pripojený na protokole, ktorý by podporoval chat."
 
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:5838
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12679,39 +12798,39 @@
 "Prosím, zadajte prezývku a príslušné informácie o chate, ktorý chcete pridať "
 "do vášho zoznamu priateľov.\n"
 
-#: ../pidgin/gtkblist.c:5922
+#: ../pidgin/gtkblist.c:5926
 msgid "Please enter the name of the group to be added."
 msgstr "Prosím, zadajte názov skupiny ktorú chcete pridať."
 
-#: ../pidgin/gtkblist.c:6562
+#: ../pidgin/gtkblist.c:6566
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Účty/"
 
-#: ../pidgin/gtkblist.c:6586
+#: ../pidgin/gtkblist.c:6590
 msgid "_Edit Account"
 msgstr "_Upraviť účet"
 
-#: ../pidgin/gtkblist.c:6599 ../pidgin/gtkconv.c:3037
+#: ../pidgin/gtkblist.c:6603 ../pidgin/gtkconv.c:3037
 msgid "No actions available"
 msgstr "Nie sú dostupné žiadne akcie"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6611
 msgid "_Disable"
 msgstr "_Vypnúť"
 
-#: ../pidgin/gtkblist.c:6619
+#: ../pidgin/gtkblist.c:6623
 msgid "Enable Account"
 msgstr "Povoliť účet"
 
-#: ../pidgin/gtkblist.c:6625
+#: ../pidgin/gtkblist.c:6629
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Účty/Povoliť účet"
 
-#: ../pidgin/gtkblist.c:6674
+#: ../pidgin/gtkblist.c:6678
 msgid "/Tools"
 msgstr "/Nástroje"
 
-#: ../pidgin/gtkblist.c:6744
+#: ../pidgin/gtkblist.c:6748
 msgid "/Buddies/Sort Buddies"
 msgstr "/Priatelia/Zoradiť priateľov"
 
@@ -13000,7 +13119,7 @@
 
 #: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Remove..."
-msgstr "/Conversation/Remove..."
+msgstr "/Rozhovor/Odstrániť..."
 
 #: ../pidgin/gtkconv.c:3204
 msgid "/Conversation/Insert Link..."
@@ -13118,11 +13237,11 @@
 
 #: ../pidgin/gtkconv.c:9263
 msgid "Separate IM and Chat windows"
-msgstr "Oddeľovať okná pre IM a Chat"
+msgstr "Oddeľovať okná správ a chatov"
 
 #: ../pidgin/gtkconv.c:9265 ../pidgin/gtkprefs.c:1412
 msgid "New window"
-msgstr "Nové okno"
+msgstr "V novom okne"
 
 #: ../pidgin/gtkconv.c:9267
 msgid "By group"
@@ -13134,7 +13253,7 @@
 
 #: ../pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
-msgstr "Uložiť ladiaci denník"
+msgstr "Uložiť ladiaci záznam"
 
 #: ../pidgin/gtkdebug.c:581
 msgid "Invert"
@@ -13142,19 +13261,19 @@
 
 #: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
-msgstr "Zvýrazniť výskyty"
+msgstr "Zvýraznenie súhlasí"
 
 #: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
-msgstr "Iba _ikona"
+msgstr "Len _ikony"
 
 #: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
-msgstr "Iba _text"
+msgstr "Len _text"
 
 #: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
-msgstr "Ikona _aj text"
+msgstr "O_boje, ikony aj text"
 
 #: ../pidgin/gtkdebug.c:774
 msgid "Filter"
@@ -13162,7 +13281,7 @@
 
 #: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
-msgstr "Možnosti zobratíte kliknutím pravým tlačidlom myši."
+msgstr "Pravý klik pre viac možností."
 
 #: ../pidgin/gtkdebug.c:823
 msgid "Level "
@@ -13186,7 +13305,7 @@
 
 #: ../pidgin/gtkdebug.c:836
 msgid "Error "
-msgstr "Chyba"
+msgstr "Chyba "
 
 #: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
@@ -13230,7 +13349,7 @@
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "developer & webmaster"
-msgstr "vývojár & webmaster"
+msgstr "vývojár a webmaster"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 #: ../pidgin/gtkdialogs.c:110
@@ -13247,283 +13366,283 @@
 
 #: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
-msgstr "Afrikánsky"
+msgstr "afrikánčina"
 
 #: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
-msgstr "Arabsky"
+msgstr "arabčina"
 
 #: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
 #: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
-msgstr "Bulharsky"
+msgstr "bulharčina"
 
 #: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
 #: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
-msgstr "Bengálsky"
+msgstr "bengálčina"
 
 #: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
-msgstr "Bosniansky"
+msgstr "bosniačtina"
 
 #: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
 #: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
-msgstr "Katalánsky"
+msgstr "katalánčina"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
-msgstr "Valencijsky-Katalánsky"
+msgstr "katalánčina (Valencia)"
 
 #: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
 msgid "Czech"
-msgstr "Česky"
+msgstr "čeština"
 
 #: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Danish"
-msgstr "Dánsky"
+msgstr "dánčina"
 
 #: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 #: ../pidgin/gtkdialogs.c:222
 msgid "German"
-msgstr "Nemecky"
+msgstr "nemčina"
 
 #: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 #: ../pidgin/gtkdialogs.c:147
 msgid "Dzongkha"
-msgstr "Jazyk Dzonka"
+msgstr "dzongkä"
 
 #: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Greek"
-msgstr "Grécky"
+msgstr "gréčtina"
 
 #: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
-msgstr "Austrálska angličtina"
+msgstr "austrálska angličtina"
 
 #: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
-msgstr "Kanadská angličtina"
+msgstr "kanadská angličtina"
 
 #: ../pidgin/gtkdialogs.c:152
 msgid "British English"
-msgstr "Britská angličtina"
+msgstr "britská angličtina"
 
 #: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
-msgstr "Esperanto"
+msgstr "esperanto"
 
 #: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
 #: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
 #: ../pidgin/gtkdialogs.c:226
 msgid "Spanish"
-msgstr "Španielsky"
+msgstr "španielčina"
 
 #: ../pidgin/gtkdialogs.c:155
 msgid "Estonian"
-msgstr "Estónsky"
+msgstr "estónčina"
 
 #: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Euskera(Basque)"
-msgstr "Euskera(Baskitsky)"
+msgstr "euskera (baskičtina)"
 
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 #: ../pidgin/gtkdialogs.c:160
 msgid "Persian"
-msgstr "Perzsky"
+msgstr "perzština"
 
 #: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:227
 #: ../pidgin/gtkdialogs.c:228
 msgid "Finnish"
-msgstr "Fínsky"
+msgstr "fínčina"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:229
 #: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
 msgid "French"
-msgstr "Francúzsky"
+msgstr "francúzština"
 
 #: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 #: ../pidgin/gtkdialogs.c:233
 msgid "Galician"
-msgstr "Galícijsky"
+msgstr "Galícky"
 
 #: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
 msgid "Gujarati"
-msgstr "Guraratsky"
+msgstr "Gudžarati"
 
 #: ../pidgin/gtkdialogs.c:166
 msgid "Gujarati Language Team"
-msgstr "Jazykový tým Gujarati"
+msgstr "gudžarátsky jazykový tím"
 
 #: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:234
 msgid "Hebrew"
-msgstr "Hebrejsky"
+msgstr "hebrejčina"
 
 #: ../pidgin/gtkdialogs.c:168
 msgid "Hindi"
-msgstr "Hindsky"
+msgstr "hindčina"
 
 #: ../pidgin/gtkdialogs.c:169
 msgid "Hungarian"
-msgstr "Maďarsky"
+msgstr "Maďarčina"
 
 #: ../pidgin/gtkdialogs.c:170
 msgid "Indonesian"
-msgstr "Indonézsky"
+msgstr "indonézština"
 
 #: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
 msgid "Italian"
-msgstr "Taliansky"
+msgstr "taliančina"
 
 #: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:236
 #: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
 msgid "Japanese"
-msgstr "Japonsky"
+msgstr "japončina"
 
 #: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
 msgid "Georgian"
-msgstr "Gruzínsky"
+msgstr "gruzínčina"
 
 #: ../pidgin/gtkdialogs.c:173
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu Gruzínsky prekladatelia"
+msgstr "Ubuntu gruzínsky prekladatelia"
 
 #: ../pidgin/gtkdialogs.c:174
 msgid "Kannada"
-msgstr "Kanada"
+msgstr "kannadčina"
 
 #: ../pidgin/gtkdialogs.c:174
 msgid "Kannada Translation team"
-msgstr "Kanadský prekladateľský tým"
+msgstr "kanaadsky prekladateľký tím"
 
 #: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
 #: ../pidgin/gtkdialogs.c:241
 msgid "Korean"
-msgstr "Kórejsky"
+msgstr "kórejčina"
 
 #: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
 #: ../pidgin/gtkdialogs.c:178
 msgid "Kurdish"
-msgstr "Kurdsky"
+msgstr "kurdčina"
 
 #: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:242
 #: ../pidgin/gtkdialogs.c:243
 msgid "Lithuanian"
-msgstr "Litovsky"
+msgstr "litovčina"
 
 #: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
 #: ../pidgin/gtkdialogs.c:244
 msgid "Macedonian"
-msgstr "Macedónsky"
+msgstr "macedónčina"
 
 #: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:245
 msgid "Bokmål Norwegian"
-msgstr "Nórsky"
+msgstr "nórsky bokmål"
 
 #: ../pidgin/gtkdialogs.c:183
 msgid "Nepali"
-msgstr "Nepálsky"
+msgstr "nepálčina"
 
 #: ../pidgin/gtkdialogs.c:184
 msgid "Dutch, Flemish"
-msgstr "Holandsky, Flámsky"
+msgstr "holandšina, flámska"
 
 #: ../pidgin/gtkdialogs.c:185
 msgid "Norwegian Nynorsk"
-msgstr "Nórsky"
+msgstr "nórsky nynorsk"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
 #: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:246
 msgid "Polish"
-msgstr "Poľsky"
+msgstr "poľština"
 
 #: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
-msgstr "Portugalsky"
+msgstr "portugalčina"
 
 #: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
-msgstr "Portugalsky-Brazília"
+msgstr "portugalčina (Brazília)"
 
 #: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
-msgstr "Pashto"
+msgstr "paštčina"
 
 #: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
-msgstr "Rumunsky"
+msgstr "rumunčina"
 
 #: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:247
 #: ../pidgin/gtkdialogs.c:248
 msgid "Russian"
-msgstr "Rusky"
+msgstr "ruština"
 
 #: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
 #: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 #: ../pidgin/gtkdialogs.c:251
 msgid "Slovak"
-msgstr "Slovensky"
+msgstr "slovenčina"
 
 #: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:252
 msgid "Slovenian"
-msgstr "Slovinsky"
+msgstr "slovinčina"
 
 #: ../pidgin/gtkdialogs.c:197
 msgid "Albanian"
-msgstr "Albánsky"
+msgstr "albánčina"
 
 #: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
 msgid "Serbian"
-msgstr "Srbsky"
+msgstr "srbčina"
 
 #: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:253
 #: ../pidgin/gtkdialogs.c:254
 msgid "Swedish"
-msgstr "Švédsky"
+msgstr "švédčina"
 
 #: ../pidgin/gtkdialogs.c:201
 msgid "Tamil"
-msgstr "Tamilsky"
+msgstr "tamilčina"
 
 #: ../pidgin/gtkdialogs.c:202
 msgid "Telugu"
-msgstr "Telugština"
+msgstr "telugčina"
 
 #: ../pidgin/gtkdialogs.c:203
 msgid "Thai"
-msgstr "Thajština"
+msgstr "thajčina"
 
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:255
 msgid "Turkish"
-msgstr "Turecký"
+msgstr "turečtina"
 
 #: ../pidgin/gtkdialogs.c:205
 msgid "Vietnamese"
-msgstr "Vietnamský"
+msgstr "vietnamčina"
 
 #: ../pidgin/gtkdialogs.c:205
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh a Gnome-Vi tým"
+msgstr "T.M.Thanh a Gnome-Vi tím"
 
 #: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:256
 msgid "Simplified Chinese"
-msgstr "Zjednodušená Čínština"
+msgstr "zjednodušená čínština"
 
 #: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
 #: ../pidgin/gtkdialogs.c:209
 msgid "Hong Kong Chinese"
-msgstr "Hongkongská Čínština"
+msgstr "hongkongská čínština"
 
 #: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
 #: ../pidgin/gtkdialogs.c:257
 msgid "Traditional Chinese"
-msgstr "Tradičná Čínština"
+msgstr "tradičná čínština"
 
 #: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
-msgstr "Amharsky"
+msgstr "amharčina"
 
 #: ../pidgin/gtkdialogs.c:342
 #, c-format
@@ -13553,6 +13672,7 @@
 "program vám neposkytujeme žiadnu záruku.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:395
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
@@ -13562,7 +13682,7 @@
 
 #: ../pidgin/gtkdialogs.c:415
 msgid "Crazy Patch Writers"
-msgstr "Blázniví autori patchov"
+msgstr "Blázniví autori záplat"
 
 #: ../pidgin/gtkdialogs.c:430
 msgid "Retired Developers"
@@ -13904,7 +14024,7 @@
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Chyba počas ukladania obrázku</span>\n"
+"<span size='larger' weight='bold'>Chyba počas ukladania obrázka</span>\n"
 "\n"
 "%s"
 
@@ -13915,7 +14035,7 @@
 "\n"
 "%s"
 msgstr ""
-"Chyba počas ukladania obrázku\n"
+"Chyba počas ukladania obrázka\n"
 "\n"
 "%s"
 
@@ -13924,6 +14044,7 @@
 msgstr "Uložiť obrázok"
 
 #: ../pidgin/gtkimhtml.c:3518
+#, c-format
 msgid "_Save Image..."
 msgstr "_Uložiť obrázok..."
 
@@ -14016,7 +14137,7 @@
 #. * no updating nor nothin'
 #: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Font face"
-msgstr "Rez písma"
+msgstr "_Rez písma"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1136
 msgid "Foreground _color"
@@ -14032,11 +14153,11 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
-msgstr "Obrázok"
+msgstr "O_brázok"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
-msgstr "Odkaz"
+msgstr "_Odkaz"
 
 #: ../pidgin/gtklog.c:292
 #, c-format
@@ -14050,16 +14171,16 @@
 #: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Naozaj chcete natrvalo odstrániť záznam konverzácie na %s, ktorá začala %s?"
 
 #: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Naozaj chcete natrvalo odstrániť systémový záznam, ktorý začal %s?"
 
 #: ../pidgin/gtklog.c:452
@@ -14082,7 +14203,7 @@
 "log\" preference is enabled."
 msgstr ""
 "Systémové udalosti sa budú zaznamenávať iba v prípade, že v nastaveniach "
-"zapnete voľbu \"Zaznamenávať všetky zmeny stavu do systémového záznamu\"."
+"zapnete voľbu „Zaznamenávať všetky zmeny stavu do systémového záznamu“."
 
 #: ../pidgin/gtklog.c:553
 msgid ""
@@ -14090,14 +14211,14 @@
 "preference is enabled."
 msgstr ""
 "Správy sa budú zaznamenávať iba v prípade, že v nastaveniach zapnete voľbu "
-"\"Zaznamenávať všetky správy\"."
+"„Zaznamenávať všetky správy“."
 
 #: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chaty sa budú zaznamenávať iba v prípade, že v nastaveniach zapnete voľbu "
-"\"Zaznamenávať všetky chaty\"."
+"„Zaznamenávať všetky chaty“."
 
 #: ../pidgin/gtklog.c:560
 msgid "No logs were found"
@@ -14126,12 +14247,12 @@
 msgid "System Log"
 msgstr "Systémový záznam"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. `%s -h' zobrazí viac informácií.\n"
+msgstr "%s %s. „%s -h“ zobrazí viac informácií.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14158,7 +14279,7 @@
 "                      účty oddeľované čiarkami)\n"
 "  -v, --version       zobrazí verziu programu a skončí\n"
 
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14198,7 +14319,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:698 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -14229,7 +14350,7 @@
 #: ../pidgin/gtknotify.c:972
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Príkaz prehliadača \"%s\" je chybný."
+msgstr "Príkaz prehliadača „%s“ je chybný."
 
 #: ../pidgin/gtknotify.c:974 ../pidgin/gtknotify.c:986
 #: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1127
@@ -14239,12 +14360,12 @@
 #: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:997
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Chyba počas spúšťania \"%s\": %s"
+msgstr "Chyba počas spúšťania „%s“: %s"
 
 #: ../pidgin/gtknotify.c:1128
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Vybrali ste možnosť 'Ručne', ale nenastavili ste príkaz prehliadača."
+msgstr "Vybrali ste možnosť „Ručne“, ale nenastavili ste príkaz prehliadača."
 
 #: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
@@ -14404,8 +14525,8 @@
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 "Z nasledujúceho zoznamu vyberte tému smajlíkov, ktorú chcete používať. Nové "
-"témy je možné nainštalovať pridaním témy do tohto zoznamu metódou \"ťahaj a "
-"pusti\"."
+"témy je možné nainštalovať pridaním témy do tohto zoznamu metódou „ťahaj a "
+"pusti“."
 
 #: ../pidgin/gtkprefs.c:731
 msgid "Icon"
@@ -14566,15 +14687,15 @@
 
 #: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
-msgstr "_Prvý port:"
+msgstr "_Počiatočný port:"
 
 #: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
-msgstr "Po_sledný port:"
+msgstr "_Konečný port:"
 
 #: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
-msgstr "Proxy Server"
+msgstr "Proxy server"
 
 #: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
@@ -14606,7 +14727,7 @@
 
 #: ../pidgin/gtkprefs.c:1330
 msgid "GNOME Default"
-msgstr "GNOME Default"
+msgstr "GNOME štandard"
 
 #: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
@@ -14626,7 +14747,7 @@
 
 #: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
-msgstr "Manual"
+msgstr "Ručné"
 
 #: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
@@ -14682,26 +14803,32 @@
 msgstr "Výber zvuku"
 
 #: ../pidgin/gtkprefs.c:1632
+#, c-format
 msgid "Quietest"
 msgstr "Najtichšia"
 
 #: ../pidgin/gtkprefs.c:1634
+#, c-format
 msgid "Quieter"
 msgstr "Tichšia"
 
 #: ../pidgin/gtkprefs.c:1636
+#, c-format
 msgid "Quiet"
 msgstr "Tichá"
 
 #: ../pidgin/gtkprefs.c:1640
+#, c-format
 msgid "Loud"
 msgstr "Hlasná"
 
 #: ../pidgin/gtkprefs.c:1642
+#, c-format
 msgid "Louder"
 msgstr "Hlasnejšia"
 
 #: ../pidgin/gtkprefs.c:1644
+#, c-format
 msgid "Loudest"
 msgstr "Najhlasnejšia"
 
@@ -14918,7 +15045,7 @@
 #. list button
 #: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
-msgstr "Získať zoznam"
+msgstr "_Získať zoznam"
 
 #. add button
 #: ../pidgin/gtkroomlist.c:450
@@ -14932,7 +15059,7 @@
 #. Use button
 #: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
-msgstr "Použiť"
+msgstr "_Použiť"
 
 #: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
@@ -14958,7 +15085,7 @@
 #. Save & Use button
 #: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
-msgstr "Uložiť a použiť"
+msgstr "Ul_ožiť a Použiť"
 
 #: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
@@ -14973,35 +15100,35 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Počas načítavania %s sa vyskytla nasledujúca chyba: %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Nepodarilo sa načítať obrázok"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Nepodarilo sa odoslať priečinok %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 "Program %s nedokáže odoslať priečinok. Skúste posielať súbory v priečinku po "
-"jednom. "
+"jednom."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "Vložili ste obrázok"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15009,23 +15136,23 @@
 "Tento obrázok môžete odoslať cez prenos súborov, vložiť ho do správy alebo "
 "použiť ako ikonu priateľa pre tohto používateľa."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Nastaviť ako ikonu priateľa"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Odoslať obrázok ako súbor"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Vložiť do správy"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Chcete nastaviť obrázok ako ikonu priateľa?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15033,7 +15160,7 @@
 "Tento obrázok môžete odoslať cez prenos súborov alebo ho použiť ako ikonu "
 "pre tohto priateľa."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15046,11 +15173,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "Nepodarilo sa odoslať spúšťač"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15058,7 +15185,7 @@
 "Vložili ste spúšťač. Pravdepodobne ste chceli odoslať súbor, na ktorý tento "
 "spúšťač odkazuje, namiesto samotného spúšťača."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15067,32 +15194,32 @@
 msgstr ""
 "<b>Súbor:</b> %s\n"
 "<b>Veľkosť súboru:</b> %s\n"
-"<b>Veľkosť obrázku:</b> %dx%d"
+"<b>Veľkosť obrázka:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Súbor '%s' je príliš veľký na %s.  Prosím, skúste menší obrázok.\n"
+msgstr "Súbor „%s“ je príliš veľký na %s. Prosím, skúste menší obrázok.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "Chyba ikony"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "Nepodarilo sa odoslať ikonu"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Nepodarilo sa otvoriť súbor '%s': %s"
+msgstr "Nepodarilo sa otvoriť súbor „%s“: %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Nepodarilo sa načítať obrázok '%s': dôvod je neznámy, pravdepodobne je "
+"Nepodarilo sa načítať obrázok „%s“: dôvod je neznámy, pravdepodobne je "
 "poškodený súbor"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
@@ -15113,15 +15240,15 @@
 
 #: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
-msgstr "Zobraziť podrobnosti"
+msgstr "_Získať informácie"
 
 #: ../pidgin/pidginstock.c:86
 msgid "_Invite"
-msgstr "Pozvať"
+msgstr "_Pozvať"
 
 #: ../pidgin/pidginstock.c:87
 msgid "_Modify"
-msgstr "Upraviť"
+msgstr "_Upraviť"
 
 #: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
@@ -15210,7 +15337,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "Priateľ je dlhodobo neprítomný"
+msgstr "Priateľ je nedostupný"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
@@ -15219,17 +15346,19 @@
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
-msgstr "Priateľ je odpojený"
+msgstr "Priateľ je odhlásený"
 
 #: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
-msgstr "Hodnoty bodov, ktoré používať, keď..."
+msgstr "Používať hodnoty bodov v prípade..."
 
 #: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr "Priateľ s <i>najvyšším hodnotením</i> bude mať v kontakte prioritu.\n"
+msgstr ""
+"Priateľ s <i>najväčším skóre</i> je taký, čo bude mať prioritu pri "
+"kontakte.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -15255,8 +15384,7 @@
 #: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Umožňuje ovládanie hodnôt, ktoré sú priradené ku jednotlivým stavom priateľa."
+msgstr "Umožnuje kontrolu hodnôt spojených s rôznymi stavmi kamarátov."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:192
@@ -15264,7 +15392,8 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Umožňuje ovládanie hodnôt, ktoré sú priradené ku jednotlivým stavom priateľa."
+"Povoľuje zmeny stavov, nečinný/preč/odpojený, podľa dôležitosti kamarátov v "
+"zozname."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
@@ -15272,7 +15401,7 @@
 
 #: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
-msgstr "Prispôsobiť farby v konverzačnom okne"
+msgstr "Prispôsobiť farby v okne konverzácie"
 
 #: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
@@ -15337,7 +15466,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Poznámka: Možnosť \"New conversations\" musí byť nastavená na \"Podľa počtu konverzácií\"."
+"Poznámka: Možnosť „Nové konverzácie“ musí byť nastavená na „Podľa počtu "
+"konverzácií“."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -15431,7 +15561,7 @@
 #. Add the label.
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Vyberte osobu z vášho adresára, alebo pridajte novú osobu."
+msgstr "Vyberte osobu z vášho adresára nižšie alebo pridajte novú osobu."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:303
@@ -15498,7 +15628,8 @@
 #. Label
 #: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Vyberte všetky účty, ku ktorým sa majú automaticky pridávať priatelia."
+msgstr ""
+"Vyberte všetky účty, ku ktorým sa majú automaticky pridávať priatelia."
 
 #. *< type
 #. *< ui_requirement
@@ -15534,11 +15665,11 @@
 #. Optional Information section
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
-msgstr "Voliteľné informácie:"
+msgstr "Nepovinné informácie:"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
-msgstr "Krstné meno:"
+msgstr "Krstné meno"
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
@@ -15565,7 +15696,7 @@
 #. *< id
 #: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
-msgstr "Test signálov GTK"
+msgstr "Test GTK signálov"
 
 #. *< name
 #. *< version
@@ -15574,7 +15705,9 @@
 #: ../pidgin/plugins/gtk-signals-test.c:163
 #: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
-msgstr "Test pre zistenie, či všetky \"ui\" signály fungujú správne."
+msgstr ""
+"Test pre zistenie, či všetky signály používateľského rozhrania fungujú "
+"správne."
 
 #: ../pidgin/plugins/history.c:188
 msgid "History"
@@ -15627,7 +15760,7 @@
 
 #: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
-msgstr "Okná správ"
+msgstr "Okná _správ"
 
 #: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
@@ -15638,12 +15771,12 @@
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Boli ste požiadaní o sedenie Music Messaging. Ak súhlasíte, kliknite na "
+"Boli ste požiadaní o reláciu Music Messaging. Ak súhlasíte, kliknite na "
 "ikonu MM."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr "Sedenie Music Messaging bolo potvrdené."
+msgstr "Relácia Music Messaging bolo potvrdené."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
 msgid "Music Messaging"
@@ -15655,7 +15788,7 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
-msgstr "Chyba pri spúšťaní editoru"
+msgstr "Chyba pri spúšťaní editora"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
@@ -15668,7 +15801,7 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
 msgid "Score Editor Path"
-msgstr "Umiestnenie editoru hodnotenia"
+msgstr "Umiestnenie editora hodnotenia"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
 msgid "_Apply"
@@ -15730,7 +15863,7 @@
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Nastavať správcovi okien príznak \"_URGENT\""
+msgstr "Nastavať správcovi okien príznak „_URGENT“"
 
 #. Raise window method button
 #: ../pidgin/plugins/notify.c:761
@@ -15856,6 +15989,7 @@
 msgstr "Vyberte farbu"
 
 #: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "Vyberte písmo rozhrania"
 
@@ -15872,15 +16006,15 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Textová téma odkazov GTK+"
 
-#.
+#. 
 #. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 #. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 #. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
+#. 
 #. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
 #. widget_bool_prefs_set[i], hbox);
 #. gtk_size_group_add_widget(labelsg, check);
-#.
+#. 
 #. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
 #. *
 #. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
@@ -15891,14 +16025,14 @@
 #. G_CALLBACK(pidgin_toggle_sensitive),
 #. widget_bool_widgets[i]);
 #. }
-#.
+#. 
 #: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Farby rozhrania"
 
 #: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
-msgstr "Veľkosti widgetov"
+msgstr "Veľkosti ovládacích prvkov"
 
 #: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
@@ -15939,7 +16073,7 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Umožní vám odoslať priamy vstup v textovo-založených protokoloch (Jabber, "
-"MSN, IRC, TOC). Pre odoslanie stlačte Enter vo vstupnom poli. Sledujte "
+"MSN, IRC, TOC). Pre odoslanie stlačte „Enter“ vo vstupnom poli. Sledujte "
 "ladiace okno."
 
 #: ../pidgin/plugins/relnot.c:71
@@ -16016,7 +16150,7 @@
 
 #: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
-msgstr "Pridanie novej náhrady"
+msgstr "Pridať novú náhradu textu"
 
 #: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
@@ -16103,6 +16237,7 @@
 msgstr "Voľby formátu časovej značky"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Vynútiť 24-hodinový formát času"
 
@@ -16167,7 +16302,7 @@
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
 msgid "_IM window transparency"
-msgstr "Priehľadnosť okna správ"
+msgstr "Priesvitnosť okna správ"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
 msgid "_Show slider bar in IM window"
@@ -16175,7 +16310,7 @@
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
 msgid "Remove IM window transparency on focus"
-msgstr "Odstrániť priehľadnosť okna správ pri fokuse"
+msgstr "Odstrániť priesvitnosť okna správ pri aktivácii"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
@@ -16189,7 +16324,7 @@
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
 msgid "_Buddy List window transparency"
-msgstr "Priehľadnosť okna _zoznamu priateľov"
+msgstr "Priesvitnosť okna _zoznamu priateľov"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
 msgid "Remove Buddy List window transparency on focus"
@@ -16210,7 +16345,7 @@
 #. *  summary
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Premenlivá priehľadnosť zoznamu priateľov a konverzácií."
+msgstr "Premenlivá priesvitnosť zoznamu priateľov a konverzácií."
 
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
@@ -16223,7 +16358,7 @@
 "Tento modul povoľuje premenlivú priesvitnosť okien konverzácie a zoznamu "
 "priateľov.\n"
 "\n"
-"* Poznámka: Tento plugin vyžaduje Win2000 alebo novší."
+"* Poznámka: Tento modul vyžaduje Win2000 alebo novší."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
@@ -16312,480 +16447,288 @@
 #. *  summary
 #: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Prijímať a odosielať raw XMPP stanzy"
+msgstr "Odosielať a prijímať nespracované XMPP stanzy."
 
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Tento modul sa hodí na odlaďovanie XMPP serverov alebo klientov."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Z neznámeho dôvodu ste boli odhlásení."
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "Naozaj chcete opustiť toto Qun?"
-
-#~ msgid "Go ahead"
-#~ msgstr "Pokračovať"
-
-#~ msgid "Server ACK"
-#~ msgstr "Server ACK"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "Chyba spojenia, asi padlo spojenie!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "Vyžiadaná chyba pri prihlasovaní do tokenu!"
-
-#~ msgid "%s Address"
-#~ msgstr "%s Adresa"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: Prítomný"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: Neprítomný"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: Neviditeľný"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: Odpojený"
-
-#~ msgid "Modify My Information"
-#~ msgstr "Upraviť moje podrobnosti"
-
-#~ msgid "Login in TCP"
-#~ msgstr "Prihlásenie v TCP"
-
-#~ msgid "Login Hidden"
-#~ msgstr "Prihlasenie skryté"
-
-#~ msgid "Socket send error"
-#~ msgstr "Chyba odoslania soketu"
-
-#~ msgid "Connection refused"
-#~ msgstr "Spojenie odmietnuté"
+msgstr "Tento plugin je vhodný pre ladenie XMPP serverov alebo klientov."
 
-#~ msgid "%s has added you [%s]"
-#~ msgstr "%s vás pridal [%s]"
+#~ msgid "Message was not sent, because you are not signed on."
+#~ msgstr "Správu sa nepodarilo odoslať, pretože nie ste prihlásený."
 
-#~ msgid "Norwegian"
-#~ msgstr "Nórsky"
-
-#~ msgid "_Bold"
-#~ msgstr "_Tučné"
-
-#~ msgid "_Larger"
-#~ msgstr "_Väčšie"
-
-#~ msgid "_Smaller"
-#~ msgstr "_Menšie"
-
-#~ msgid "_Reset font"
-#~ msgstr "Vymazať formátovanie"
+#~ msgid "Enable Logging"
+#~ msgstr "Zapnúť zaznamenávanie"
 
-#~ msgid "Show buddy _icons"
-#~ msgstr "Zobrazovať _ikony priateľov"
+#~ msgid "Enable Sounds"
+#~ msgstr "Zapnúť zvuky"
 
-#~ msgid "Gaim Internet Messenger"
-#~ msgstr "Gaim, IM klient"
+#~ msgid "The file was saved as %s."
+#~ msgstr "Súbor bol uložený ako %s."
 
-#~ msgid "Nickname: %s\n"
-#~ msgstr "Prezývka: %s\n"
+#~ msgid "Cannot create pounce"
+#~ msgstr "Nebolo možné vytvoriť sledovanie"
 
-#~ msgid ""
-#~ "\n"
-#~ "Idle: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Nečinný: %s"
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "Zobraziť odpojených kamarátov"
+#~ msgid "You do not have any accounts."
+#~ msgstr "Nemáte žiadne účty."
 
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Používateľ %s bol odpojený, pretože sa vyskytla chyba:\n"
-#~ "%s"
+#~ msgid "You must create an account first before you can create a pounce."
+#~ msgstr "Pred tým než spustíte sledovanie si musíte pridať účet."
 
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "Príkazy momentálne nie sú podporované. Správa NEBOLA odoslaná."
+#~ msgid "Certificates"
+#~ msgstr "Certifikáty"
 
-#~ msgid "Timestamps"
-#~ msgstr "Časové značky"
+#~ msgid "X.509 Certificates"
+#~ msgstr "X.509 certifikáty"
 
-#~ msgid "..."
-#~ msgstr "..."
+#~ msgid "nudge"
+#~ msgstr "štuchanec"
 
-#~ msgid "Still need to do something about this."
-#~ msgstr "Stále tu treba niečo urobiť."
-
-#~ msgid "Alias..."
-#~ msgstr "Prezývka..."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Prezývka:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Prihlásený:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Nečinný:</b> %s"
+#~ msgid "nudged"
+#~ msgstr "štuchnutý"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Last Seen:</b> %s ago"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Naposledy pripojený pred:</b> %s"
+#~ msgid "Nudging"
+#~ msgstr "Štuchanec"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Stav:</b> Odpojený"
+#~ msgid "Missing Cipher"
+#~ msgstr "Chýba šifra"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Popis:</b> Vystrašený"
+#~ msgid "The RC4 cipher could not be found"
+#~ msgstr "RC4 šifra nebola nájdená"
 
 #~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
+#~ "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+#~ "not be loaded."
 #~ msgstr ""
-#~ "\n"
-#~ "<b>Stav:</b> Skvelý"
+#~ "Aktualizujte na libpurple s podporou RC4 (>= 2.0.1). Modul MySpaceIM nebude "
+#~ "načítaný."
 
 #~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
+#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
+#~ "supported by MySpace."
 #~ msgstr ""
-#~ "\n"
-#~ "<b>Stav:</b> Žúžo"
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/Nástroje/Sledovanie priateľov"
-
-#~ msgid "Jabber developer"
-#~ msgstr "Jabber vývojár"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
+#~ "Prepáčte, ale heslá ktoré sú dlhšie ako %d znakov (vaše má %d znakov) nie sú "
+#~ "podporované na MySpace."
 
-#~ msgid "Larger font size"
-#~ msgstr "Väčšia veľkosť písma"
+#~ msgid "MySpaceIM Error"
+#~ msgstr "Chyba MySpaceIM"
 
-#~ msgid "Smaller font size"
-#~ msgstr "Menšia veľkosť písma"
+#~ msgid "Reading challenge"
+#~ msgstr "Číta sa výzva"
 
-#~ msgid "Reset formatting"
-#~ msgstr "Vymazať formátovanie"
+#~ msgid "Unexpected challenge length from server"
+#~ msgstr "Neočakávaná dĺžka výzvy zo servera"
 
-#~ msgid "Insert link"
-#~ msgstr "Vložiť odkaz"
+#~ msgid "Logging in"
+#~ msgstr "Prihlasuje sa"
 
-#~ msgid "Insert image"
-#~ msgstr "Vložiť obrázok"
-
-#~ msgid "Insert smiley"
-#~ msgstr "Vložiť smajlík"
-
-#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
-#~ msgstr "Gaim %s. Pre viac informacií skúste `%s -h'.\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
+#~ msgid "Connection to server lost (no data received within %d seconds)"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>\n"
-#~ "\n"
-#~ "%s"
+#~ "Pripojenie ku serveru prerušené (neboli prijaté žiadné údaje počas %d sekúnd)"
 
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "Tento obrázok môžete odoslať cez prenos súborov, vložiť ho do správy "
-#~ "alebo použiť ako ikonu priateľa pre tohto používateľa."
+#~ msgid "New mail messages"
+#~ msgstr "Nové poštové správy"
 
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Veľkosť rozbalovača GtkTreeView"
+#~ msgid "New blog comments"
+#~ msgstr "Nové komentáre na blogu"
 
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "Osadenie rozbaľovačov GtkTreeView"
+#~ msgid "New profile comments"
+#~ msgstr "Nové komentáre v profile"
 
-#~ msgid "Tools"
-#~ msgstr "Nástroje"
+#~ msgid "New friend requests!"
+#~ msgstr "Nové pozvánky priateľov!"
 
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-#~ msgstr ""
-#~ "Verziu %s môžete ziskať z: <br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
+#~ msgid "New picture comments"
+#~ msgstr "Nové komentáre ku obrázkom"
 
-#~ msgid "Delay"
-#~ msgstr "Oneskorenie"
+#~ msgid "MySpace"
+#~ msgstr "MySpace"
 
-#~ msgid "minutes."
-#~ msgstr "minút."
+#~ msgid "Protocol error, code %d: %s"
+#~ msgstr "Chyba protokolu, kód %d: %s"
 
-#~ msgid "WinGaim Options"
-#~ msgstr "Možosti WinGaim"
+#~ msgid "Failed to add buddy"
+#~ msgstr "Nebolo možné pridať priateľa."
 
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d priateľov zo skupiny %s nebolo odstránených, pretože sú priradení ku "
-#~ "vypnutým alebo nepripojeným účtom.  Títo priatelia a skupina neboli "
-#~ "odstránení.\n"
-#~ msgstr[1] ""
-#~ "%d priateľ zo skupiny %s nebol odstránený, pretože je priradený ku "
-#~ "vypnutému alebo nepripojenému účtu.  Tento priateľ a skupina neboli "
-#~ "odstránení.\n"
-#~ msgstr[2] ""
-#~ "%d priatelia zo skupiny %s neboli odstránení, pretože sú priradení ku "
-#~ "vypnutým alebo nepripojeným účtom.  Títo priatelia a skupina neboli "
-#~ "odstránení.\n"
+#~ msgid "'addbuddy' command failed."
+#~ msgstr "príkaz 'addbuddy' zlyhal."
 
-#~ msgid "Group not removed"
-#~ msgstr "Skupina nebola odstránená"
+#~ msgid "persist command failed"
+#~ msgstr "príkaz persist zlyhal"
 
-#~ msgid "Old Gaim"
-#~ msgstr "Starý Gaim"
+#~ msgid "No such user: %s"
+#~ msgstr "Neexistujúci používateľ: %s"
 
-#~ msgid "Gaim encountered errors loading the plugin."
-#~ msgstr "Pri načítavaní modulu program Gaim narazil na chybu."
+#~ msgid "User lookup"
+#~ msgstr "Vyhľadanie používateľov"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Stav:</b> %s"
+#~ msgid "Failed to remove buddy"
+#~ msgstr "Odstránenie priateľa zlyhalo"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Správa:</b> %s"
+#~ msgid "'delbuddy' command failed"
+#~ msgstr "príkaz 'delbuddy' zlyhal"
 
-#~ msgid "Gaim User"
-#~ msgstr "Používateľ programu Gaim"
+#~ msgid "blocklist command failed"
+#~ msgstr "príkaz blocklist zlyhal"
 
-#~ msgid "HostnameČi má zadaný príkaz ovládať adresy \"aim\""
-#~ msgstr "Meno hostiteľa"
+#~ msgid "Invalid input condition"
+#~ msgstr "Chybná podmienka vstupu"
 
-#~ msgid "Jabber Account"
-#~ msgstr "Jabber účet"
+#~ msgid "Read buffer full"
+#~ msgstr "Zásobník čítania plný"
 
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
+#~ msgid "Unparseable message"
+#~ msgstr "Nespracovateľná správa"
 
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)"
 
-#~ msgid "<b>Idle for:</b> %s<br>"
-#~ msgstr "<b>Nečinný:</b> %s<br>"
+#~ msgid "IM Friends"
+#~ msgstr "IM Priateľov"
 
-#~ msgid "Cannot join %s:"
-#~ msgstr "Nepodarilo sa pripojiť na %s:"
+#~ msgid "%d buddies were added or updated"
+#~ msgstr "%d priatelia boli pridaní alebo aktualizovaní"
 
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "Server vás nedokáže overiť bez zadania hesla"
+#~ msgid "Add contacts from server"
+#~ msgstr "Pridať kontakty zo serveru"
 
-#~ msgid "Client:"
-#~ msgstr "Klient:"
+#~ msgid "Add friends from MySpace.com"
+#~ msgstr "Pridať priateľov z MySpace.com"
 
-#~ msgid "Search for Jabber users"
-#~ msgstr "Vyhľadávať používateľov Jabber"
+#~ msgid "Importing friends failed"
+#~ msgstr "Importovanie priateľov zlyhalo"
 
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "Nesprávne Jabber ID"
+#~ msgid "Find people..."
+#~ msgstr "Hľadať ľudí..."
 
-#~ msgid "Change Jabber Password"
-#~ msgstr "Zmeniť Jabber heslo"
+#~ msgid "Change IM name..."
+#~ msgstr "Zmeniť IM meno..."
 
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Modul protokolu Jabber"
+#~ msgid "myim URL handler"
+#~ msgstr "myim URL handler"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
+#~ msgid "No suitable MySpaceIM account could be found to open this myim URL."
 #~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "<b>Alias:</b> %s<br>"
-#~ msgstr "<b>Prezývka:</b> %s<br>"
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "%s<b>Všeobecné</b><br>%s"
-
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "%s<b>Sociálne</b><br>%s"
-
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>Osobné</b><br>%s"
+#~ "Nebol nájdený žiadny vyhovujúci MySpaceIM účet na otvorenie tejto myim "
+#~ "adresy."
 
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>Obchod</b><br>%s"
+#~ msgid "Enable the proper MySpaceIM account and try again."
+#~ msgstr "Povoľte správny MySpaceIM účet a skúste znovu."
 
-#~ msgid "<hr><b>Contact Info</b>%s%s"
-#~ msgstr "<hr><b>Kontaktné informácie</b>%s%s"
+#~ msgid "Show display name in status text"
+#~ msgstr "Zobraziť používateľské meno v texte stavu"
 
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<hr><b>%s:</b> "
+#~ msgid "Show headline in status text"
+#~ msgstr "Zobraziť nadpis v texte stavu"
 
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>Stav:</B> %s<HR>%s"
+#~ msgid "Send emoticons"
+#~ msgstr "Poslať emotikony"
 
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "Chyba SNAC threw: %s\n"
+#~ msgid "Screen resolution (dots per inch)"
+#~ msgstr "Rozlíšenie obrazovky (bodov na palec)"
 
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Podrobnosti o používateľovi %s sú nedostupné:"
+#~ msgid "Base font size (points)"
+#~ msgstr "Základná veľkosť písma (body)"
 
-#~ msgid "Rate limiting error."
-#~ msgstr "Chyba limitu hodnotenia."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
+#~ msgid "%s has sent you a webcam invite, which is not yet supported."
 #~ msgstr ""
-#~ "Vaše používateľské meno je momentálne formátované takto:\n"
-#~ "%s"
+#~ "%s vám poslal pozvánku na webkameru, ktorá zatiaľ nie je podporovaná."
 
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "Nebolo možné pridať kamarát %s z neznámeho dôvodu.  Možný dôvod je ten, "
-#~ "že vo vašom zozname kamarátov máte maximálny počet kamarátov."
+#~ msgid "buzz"
+#~ msgstr "bzzz"
 
-#~ msgid "_Connect"
-#~ msgstr "Pripojiť"
+#~ msgid "buzzed"
+#~ msgstr "vyrušený"
 
-#~ msgid "New screen name formatting:"
-#~ msgstr "Nové formátovanie používateľského mena:"
+#~ msgid "Buzzing"
+#~ msgstr "Poslané bzzz"
 
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formátovať používateľské meno..."
+#~ msgid "Attention! %s %s."
+#~ msgstr "Pozor! %s %s."
 
-#~ msgid "Invalid QQ Facea"
-#~ msgstr "Neplatný QQ obrázok"
+#~ msgid "Attention!"
+#~ msgstr "Pozor!"
 
-#~ msgid "Send IM fail\n"
-#~ msgstr "Poslanie správy IM zlyhalo\n"
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Pozor! Boli ste %s"
 
-#~ msgid "User info is not updated"
-#~ msgstr "Informácie o používateľovi nie sú aktualizované"
+#~ msgid "Unable to save new account"
+#~ msgstr "Nebolo možné uložiť nový účet"
 
-#~ msgid "Send packet"
-#~ msgstr "Odoslať paket"
+#~ msgid "An account already exists with the specified criteria."
+#~ msgstr "Už existuje účet so zadanými kritériami."
 
-#~ msgid "Packets lost, send again?"
-#~ msgstr "Pakety sa stratili, odoslať znovu?"
+#~ msgid "Create this new account on the server"
+#~ msgstr "Vytvoriť takýto účet na serveri"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Podporuje:</b> %s"
+#~ msgid "/Buddies/Show"
+#~ msgstr "/Priatelia/Zobraziť"
 
-#~ msgid "<b>External User</b><br>"
-#~ msgstr "<b>Externý používateľ</b><br>"
+#~ msgid "/Buddies/Show/Show _Offline Buddies"
+#~ msgstr "/Priatelia/Zobraziť/_Nepripojených priateľov"
 
-#~ msgid "<b>User ID:</b> %s<br>"
-#~ msgstr "<b>Používateľské ID:</b> %s<br>"
+#~ msgid "/Buddies/Show/Show _Empty Groups"
+#~ msgstr "/Priatelia/Zobraziť/Prázdne s_kupiny"
 
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Celé meno:</b> %s<br>"
+#~ msgid "/Buddies/Show/Show Buddy _Details"
+#~ msgstr "/Priatelia/Zobraziť/_Detaily priateľov"
 
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Podporuje:</b> %s<br>"
+#~ msgid "/Buddies/Show/Show Idle _Times"
+#~ msgstr "/Priatelia/Zobraziť/Č_asy nečinnosti"
 
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Stav:</b> %s"
+#~ msgid "/Buddies/Show/Show _Protocol Icons"
+#~ msgstr "/Priatelia/Zobraziť/_Ikony protokolov"
 
-#~ msgid "Reject watching by other users"
-#~ msgstr "Neumožnoiť ostatným používateľom sledovať vás"
+#~ msgid "/Tools/_Certificates"
+#~ msgstr "/Nástroje/_Certifikáty"
 
-#~ msgid "Block invites"
-#~ msgstr "Blokovať pozvánky"
+#~ msgid "/Buddies/Show/Show Offline Buddies"
+#~ msgstr "/Priatelia/Zobraziť/Nepripojených priateľov"
 
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Zamietnuť požidavky o atribút stavu pripojenia"
+#~ msgid "/Buddies/Show/Show Empty Groups"
+#~ msgstr "/Priatelia/Zobraziť/Prázdne skupiny"
 
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC poslal príkaz PAUSE."
+#~ msgid "/Buddies/Show/Show Buddy Details"
+#~ msgstr "/Priatelia/Zobraziť/Detaily priateľov"
 
-#~ msgid ""
-#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Gaim will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
-#~ msgstr ""
-#~ "Keď sa toto stane, TOC ignoruje všetky správy ktoré prijme, a môže vás "
-#~ "vykopnúť ak odošlete správu. Program Gaim napriek tomu zabráni prechodu. "
-#~ "Je to iba dočasné, prosím, buďte trpezliví. "
+#~ msgid "/Buddies/Show/Show Idle Times"
+#~ msgstr "/Priatelia/Zobraziť/Časy nečinnosti"
 
-#~ msgid "Gaim - Save As..."
-#~ msgstr "Gaim - Uložiť ako..."
+#~ msgid "/Buddies/Show/Show Protocol Icons"
+#~ msgstr "/Priatelia/Zobraziť/Ikony protokolov"
 
-#~ msgid "Buzz!!"
-#~ msgstr "Bzzz!"
+#~ msgid "/Conversation/_Hide"
+#~ msgstr "/Rozhovor/_Skryť"
 
-#~ msgid "Normal authentication failed!"
-#~ msgstr "Normálna autentifikácia zlyhala!"
+#~ msgid "Senior Contributor/QA"
+#~ msgstr "Bývalý prispievateľ/QA"
 
 #~ msgid ""
-#~ "The normal authentication method has failed. This means either your "
-#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Gaim will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "%s is a graphical modular messaging client based on libpurple which is "
+#~ "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+#~ "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+#~ "QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+#~ "redistribute the program under the terms of the GPL (version 2 or later).  A "
+#~ "copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+#~ "is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+#~ "complete list of contributors.  We provide no warranty for this "
+#~ "program.<BR><BR>"
 #~ msgstr ""
-#~ "Štandardný spôsob autentifikácie zlyhal. To znamená, že je heslo "
-#~ "nesprávne, alebo sa zmenila schéma autentifikácie na Yahoo!. Program Gaim "
-#~ "sa teraz pokúsi prihlásiť pomocou autentifikácie Web Messenger, ktorá "
-#~ "zapríčiní menší počet funkcií v programe."
+#~ "%s je modulárny IM klient založený na knižnici libpurple, ktorý podporuje "
+#~ "protokoly AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+#~ "GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, a QQ.  Je "
+#~ "vytvorený pomocou knižnice GTK+.<BR><BR>Tento program môžete upravovať a "
+#~ "distribuovať podľa podmienok licencie GPL (vo verzii 2 alebo novšej).  Kópia "
+#~ "licencie GPL sa nachádza v súbore „COPYING“, ktorý je dodávaný spolu s "
+#~ "programom %s.  Vlastníkmi autorských práv programu %s sú jeho "
+#~ "prispievatelia. Kompletný zoznam prispievateľov si môžete pozrieť v súbore "
+#~ "„COPYRIGHT“. Na tento program vám neposkytujeme žiadnu záruku.<BR><BR>"
 
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>IP adresa:</b> %s<br>"
+#~ msgid "<span strikethrough='true'>Strikethrough</span>"
+#~ msgstr "<span size='larger'>Preškrtnuté</span>"
 
-#~ msgid "<b>User:</b> %s<br>"
-#~ msgstr "<b>Používateľ:</b> %s<br>"
+#~ msgid "_Horizontal rule"
+#~ msgstr "_Vodorovná čiara"
 
-#~ msgid "Unavailable"
-#~ msgstr "Nedostupný"
+#~ msgid "Norwegian"
+#~ msgstr "nórčina"
\ No newline at end of file
diff -ru pidgin-2.1.1/po/sl.po pidgin-2.2.0/po/sl.po
--- pidgin-2.1.1/po/sl.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sl.po	2007-09-14 00:45:44.000000000 -0400
@@ -6,12 +6,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.1.1\n"
+"Project-Id-Version: Pidgin 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2007-08-13 10:29+0100\n"
+"PO-Revision-Date: 2007-09-10 21:26+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
-"Language-Team: Martin Srebotnjak <users@sl.openoffice.org>\n"
+"Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@
 #: ../finch/finch.c:64
 #: ../finch/finch.c:300
 #: ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -62,18 +62,21 @@
 msgstr "%s je naletel na napake pri migraciji vaših nastavitev iz %s v %s. Prosimo, raziščite in dokončajte migracijo ročno (s kopiranjem ustreznih datotek). Prosimo, da to napako javite na naslov http://developer.pidgin.im."
 
 #: ../finch/gntaccount.c:123
-#: ../finch/gntaccount.c:478
+#: ../finch/gntaccount.c:483
 #: ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432
 #: ../finch/gntblist.c:445
 #: ../finch/gntplugin.c:185
 #: ../finch/gntplugin.c:233
 #: ../finch/gntstatus.c:300
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576
 #: ../libpurple/protocols/silc/ops.c:57
@@ -90,74 +93,74 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Pojavno ime računa ne sme biti prazno."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Vtičniki protokolov niso nameščeni."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Najverjetneje ste pozabili na 'make install'.)"
 
-#: ../finch/gntaccount.c:490
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495
+#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nov račun"
 
-#: ../finch/gntaccount.c:515
+#: ../finch/gntaccount.c:520
 #: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Psevdonim:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569
-#: ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878
+#: ../finch/gntaccount.c:574
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883
 #: ../finch/gntblist.c:343
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntblist.c:802
 #: ../finch/gntblist.c:1004
 #: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:2209
+#: ../finch/gntblist.c:2221
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:458
-#: ../finch/gntpounce.c:656
+#: ../finch/gntpounce.c:666
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045
+#: ../finch/gntsound.c:1057
 #: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606
+#: ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609
 #: ../libpurple/account.c:984
 #: ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173
+#: ../libpurple/conversation.c:1219
 #: ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661
@@ -167,17 +170,17 @@
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259
-#: ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293
-#: ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/msn/msn.c:296
+#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -189,12 +192,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -211,46 +214,46 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
-#: ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511
-#: ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747
-#: ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091
-#: ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188
-#: ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896
+#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238
+#: ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434
 #: ../pidgin/gtklog.c:327
 #: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562
 #: ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
 #: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573
+#: ../finch/gntaccount.c:578
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:464
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1042
-#: ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594
+#: ../finch/gntsound.c:1054
+#: ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597
 #: ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587
@@ -259,111 +262,111 @@
 msgid "Save"
 msgstr "Shrani"
 
-#: ../finch/gntaccount.c:626
-#: ../pidgin/gtkaccount.c:1909
+#: ../finch/gntaccount.c:631
+#: ../pidgin/gtkaccount.c:1900
 #: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1566
+#: ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Izbriši račun"
 
 #. Delete button
-#: ../finch/gntaccount.c:631
-#: ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655
-#: ../finch/gntpounce.c:718
+#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665
+#: ../finch/gntpounce.c:728
 #: ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:1907
 #: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114
+#: ../pidgin/gtkpounce.c:1099
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1571
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../finch/gntaccount.c:663
-#: ../finch/gntblist.c:2115
-#: ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334
+#: ../finch/gntaccount.c:668
+#: ../finch/gntblist.c:2118
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Računi"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Račune lahko omogočite ali onemogočite na naslednjem seznamu."
 
 #. Add button
-#: ../finch/gntaccount.c:692
-#: ../finch/gntaccount.c:877
+#: ../finch/gntaccount.c:697
+#: ../finch/gntaccount.c:882
 #: ../finch/gntblist.c:342
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702
+#: ../finch/gntpounce.c:712
 #: ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878
 #: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970
+#: ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Dodaj"
 
 #. Modify button
-#: ../finch/gntaccount.c:697
-#: ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702
+#: ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Spremeni"
 
-#: ../finch/gntaccount.c:800
-#: ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805
+#: ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s je nastavil %s za svojega prijatelja%s%s"
 
-#: ../finch/gntaccount.c:873
-#: ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878
+#: ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938
+#: ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "Uporabnik %s%s%s%s želi dodati %s na svoj seznam prijateljev%s%s."
 
-#: ../finch/gntaccount.c:958
-#: ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988
-#: ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Želite pooblastiti prijatelja?"
 
-#: ../finch/gntaccount.c:965
-#: ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591
-#: ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592
-#: ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Zavrni"
 
@@ -388,8 +391,8 @@
 msgstr "Napaka pri dodajanju prijatelja"
 
 #: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990
+#: ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981
 #: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Ime"
@@ -397,15 +400,15 @@
 #: ../finch/gntblist.c:327
 #: ../finch/gntblist.c:409
 #: ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
 #: ../libpurple/protocols/zephyr/zephyr.c:1207
-#: ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031
+#: ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Psevdonim"
@@ -417,14 +420,14 @@
 
 #: ../finch/gntblist.c:334
 #: ../finch/gntblist.c:400
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173
-#: ../finch/gntstatus.c:572
+#: ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986
-#: ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282
+#: ../pidgin/gtkblist.c:3005
+#: ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267
 #: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Račun"
@@ -439,8 +442,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182
-#: ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
@@ -456,10 +459,10 @@
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:406
-#: ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44
 #: ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
@@ -475,7 +478,7 @@
 
 #: ../finch/gntblist.c:418
 #: ../finch/gntblist.c:853
-#: ../pidgin/gtkblist.c:5814
+#: ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
@@ -498,9 +501,9 @@
 
 #: ../finch/gntblist.c:453
 #: ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485
-#: ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
@@ -536,7 +539,7 @@
 msgstr "Pridobivanje poteka ..."
 
 #: ../finch/gntblist.c:903
-#: ../finch/gntconv.c:407
+#: ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -548,11 +551,11 @@
 
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../finch/gntblist.c:914
-#: ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653
 #: ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
@@ -598,8 +601,8 @@
 
 #: ../finch/gntblist.c:1099
 #: ../finch/gntblist.c:1251
-#: ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650
+#: ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641
 #: ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
@@ -607,11 +610,12 @@
 
 #. Buddy List
 #: ../finch/gntblist.c:1225
-#: ../finch/gntblist.c:2294
+#: ../finch/gntblist.c:2306
 #: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2685
+#: ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
@@ -624,7 +628,7 @@
 msgstr "Pokaži/skrij oznako"
 
 #. General
-#: ../finch/gntblist.c:1296
+#: ../finch/gntblist.c:1297
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045
 #: ../libpurple/protocols/gg/gg.c:1118
@@ -633,9 +637,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409
+#: ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -646,33 +650,33 @@
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3010
+#: ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316
+#: ../finch/gntblist.c:1319
 #: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/msn.c:553
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Na mobilcu"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -681,12 +685,12 @@
 "Povezanih: %d\n"
 "Skupaj: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Račun: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -695,64 +699,64 @@
 "\n"
 "Zadnjič viden: pred %s leti"
 
-#: ../finch/gntblist.c:1698
+#: ../finch/gntblist.c:1701
 #: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Novo ..."
 
-#: ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:1708
 #: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Datoteka shranjena ..."
 
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2086
 #: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:86
+#: ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
-msgstr "Vstavki"
+msgstr "Vtičniki"
 
-#: ../finch/gntblist.c:2190
-#: ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866
-#: ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202
+#: ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877
+#: ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../finch/gntblist.c:2195
-#: ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207
+#: ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882
+#: ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "_Račun"
 
-#: ../finch/gntblist.c:2203
-#: ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215
+#: ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../finch/gntblist.c:2205
-#: ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217
+#: ../pidgin/gtkdialogs.c:753
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, ki ji želite poslati neposredno sporočilo."
 
-#: ../finch/gntblist.c:2208
+#: ../finch/gntblist.c:2220
 #: ../finch/gntnotify.c:79
 #: ../libpurple/account.c:983
 #: ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258
-#: ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292
-#: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -769,45 +773,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347
-#: ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746
-#: ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895
+#: ../pidgin/gtkdialogs.c:987
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "V redu"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228
+#: ../finch/gntblist.c:2240
 #: ../finch/gntpounce.c:446
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Pošllji sporočilo ..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Pokaži prazne skupine"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Prikaži nepovezane prijatelje"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Razvrsti po stanju"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Razvrsti po abecedi"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Razvrsti po obsegu dnevnika"
 
@@ -832,47 +836,51 @@
 "\n"
 "Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: ../finch/gntconv.c:121
-#: ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123
+#: ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
 
-#: ../finch/gntconv.c:126
-#: ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128
+#: ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: ../finch/gntconv.c:131
-#: ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133
+#: ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Ta ukaz deluje samo v klepetih in ne v neposrednih sporočilih."
 
-#: ../finch/gntconv.c:134
-#: ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136
+#: ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Ta ukaz deluje samo v neposrednih sporočilih in ne v klepetih."
 
-#: ../finch/gntconv.c:138
-#: ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140
+#: ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Sporočila ni mogoče poslati, saj niste prijavljeni."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252
-#: ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259
+#: ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -881,52 +889,70 @@
 "\n"
 "%s tipka ..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Ta klepet ste zapustili."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367
+#: ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
+
+#: ../finch/gntconv.c:373
+#: ../pidgin/gtkconv.c:1359
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Pošlji k"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Pogovor"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Počisti pretekle izjave"
 
-#: ../finch/gntconv.c:396
+#: ../finch/gntconv.c:473
 #: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Pokaži časovne žige"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj opozorilo prijatelju ..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Vključi dnevnik"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Vključi zvoke"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Seznam uporabnikov:\n"
 
-#: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997
+#: ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
 
-#: ../finch/gntconv.c:915
-#: ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033
+#: ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: ../finch/gntconv.c:918
-#: ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036
+#: ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -934,61 +960,61 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: ../finch/gntconv.c:976
-#: ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094
+#: ../pidgin/gtkconv.c:7538
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
 
-#: ../finch/gntconv.c:979
-#: ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097
+#: ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: ../finch/gntconv.c:982
-#: ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100
+#: ../pidgin/gtkconv.c:7544
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
 
-#: ../finch/gntconv.c:985
-#: ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103
+#: ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../finch/gntconv.c:988
-#: ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106
+#: ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Pokaži seznam uporabnikov v klepetu."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
-msgstr "plugins: Pokaži okno vstavkov."
+msgstr "plugins: Pokaži okno vtičnikov."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Pokaži seznam prijateljev."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Pokaži okno računov."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Pokaži okno razhroščevanja."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Pokaži okno nastavitev."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pokaži okno savedstatuses."
 
 #: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:86
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
@@ -1020,124 +1046,129 @@
 #. Create the window.
 #: ../finch/gntft.c:122
 #: ../finch/gntft.c:195
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233
 #: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Potek"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Velikost"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Preostanek"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198
-#: ../finch/gntstatus.c:543
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../finch/gntft.c:200
+#: ../finch/gntstatus.c:546
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034
 #: ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095
-#: ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998
 #: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Stanje"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Zapri to okno po zaključku vseh prenosov"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Počisti dokončane prenose"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Ustavi"
 
 #. Close button
-#: ../finch/gntft.c:234
+#: ../finch/gntft.c:236
 #: ../finch/gntnotify.c:181
 #: ../finch/gntplugin.c:209
 #: ../finch/gntplugin.c:309
-#: ../finch/gntpounce.c:727
+#: ../finch/gntpounce.c:737
 #: ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/msn/msn.c:412
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Zapri"
 
-#: ../finch/gntft.c:302
+#: ../finch/gntft.c:304
 #: ../pidgin/gtkft.c:168
 #: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../finch/gntft.c:369
+#: ../finch/gntft.c:371
 #: ../pidgin/gtkft.c:165
 #: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../finch/gntft.c:371
+#: ../finch/gntft.c:373
 #: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: ../finch/gntft.c:417
+#: ../finch/gntft.c:419
 #: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428
-#: ../finch/gntft.c:429
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Datoteka je bila shranjena kot %s."
+
+#: ../finch/gntft.c:431
+#: ../finch/gntft.c:432
 #: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Končano"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:436
 #: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Prenos je v teku"
@@ -1152,12 +1183,12 @@
 msgstr "Dobili ste pošto!"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:490
+#: ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Pošiljatelj"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:497
+#: ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Zadeva"
 
@@ -1171,19 +1202,19 @@
 msgstr[3] "%s (%s) ima %d nova sporočila."
 
 #: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:336
+#: ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
 #: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:918
+#: ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
 #: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
@@ -1193,13 +1224,13 @@
 msgstr "Nadaljuj"
 
 #: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1629
+#: ../pidgin/gtkconv.c:1620
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Informacije"
 
 #: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1590
+#: ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Sporoči"
 
@@ -1208,7 +1239,7 @@
 msgstr "Pridruži se"
 
 #: ../finch/gntnotify.c:391
-#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Povabi"
 
@@ -1260,7 +1291,7 @@
 
 #: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
-msgstr "Prilagodi vstavek"
+msgstr "Prilagodi vtičnik"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1270,9 +1301,9 @@
 #: ../finch/gntplugin.c:370
 #: ../finch/gntplugin.c:377
 #: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88
+#: ../finch/gntui.c:90
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2062
+#: ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Nastavitve"
 
@@ -1281,7 +1312,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327
 #: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
@@ -1298,7 +1328,7 @@
 
 #. Account:
 #: ../finch/gntpounce.c:335
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Račun:"
 
@@ -1308,7 +1338,7 @@
 
 #. Create the "Pounce When Buddy..." frame.
 #: ../finch/gntpounce.c:373
-#: ../pidgin/gtkpounce.c:586
+#: ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
@@ -1354,7 +1384,7 @@
 
 #. Create the "Action" frame.
 #: ../finch/gntpounce.c:413
-#: ../pidgin/gtkpounce.c:647
+#: ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Dejanje"
 
@@ -1383,84 +1413,96 @@
 msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
 
 #: ../finch/gntpounce.c:449
-#: ../pidgin/gtkpounce.c:1295
+#: ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
-#: ../finch/gntpounce.c:651
-#: ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Opozorila ni mogoče ustvariti"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Nimate računa."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Preden lahko ustvarite opozorilo, morate prej ustvariti račun."
+
+#: ../finch/gntpounce.c:661
+#: ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Ste prepričani, da želite izbrisati obvestilo o %s za %s?"
 
-#: ../finch/gntpounce.c:685
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../finch/gntpounce.c:799
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../finch/gntpounce.c:801
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s je zastal, medtem ko vam je pisal (%s)"
 
-#: ../finch/gntpounce.c:803
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../finch/gntpounce.c:805
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815
+#: ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../finch/gntpounce.c:807
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../finch/gntpounce.c:809
-#: ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../finch/gntpounce.c:811
-#: ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../finch/gntpounce.c:815
-#: ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
@@ -1469,16 +1511,16 @@
 msgstr "Glede na uporabo tipkovnice"
 
 #: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
 #: ../finch/gntprefs.c:95
 #: ../pidgin/gtkprefs.c:897
 #: ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924
-#: ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928
+#: ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "nikoli"
 
@@ -1529,14 +1571,14 @@
 #. Conversations
 #: ../finch/gntprefs.c:258
 #: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Pogovori"
 
 #: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1464
-#: ../pidgin/gtkprefs.c:2039
+#: ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
@@ -1545,125 +1587,125 @@
 msgstr "Še ni podprto."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: ../finch/gntsound.c:94
+#: ../finch/gntsound.c:96
 #: ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: ../finch/gntsound.c:95
+#: ../finch/gntsound.c:97
 #: ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
-#: ../finch/gntsound.c:96
+#: ../finch/gntsound.c:98
 #: ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Sporočilo prejeto"
 
-#: ../finch/gntsound.c:97
+#: ../finch/gntsound.c:99
 #: ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Prejeto sporočilo začne pogovor"
 
-#: ../finch/gntsound.c:98
+#: ../finch/gntsound.c:100
 #: ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: ../finch/gntsound.c:99
+#: ../finch/gntsound.c:101
 #: ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Oseba se pridruži pogovorni sobi"
 
-#: ../finch/gntsound.c:100
+#: ../finch/gntsound.c:102
 #: ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Oseba zapusti pogovorno sobo"
 
-#: ../finch/gntsound.c:101
+#: ../finch/gntsound.c:103
 #: ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: ../finch/gntsound.c:102
+#: ../finch/gntsound.c:104
 #: ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: ../finch/gntsound.c:104
+#: ../finch/gntsound.c:106
 #: ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše pojavno ime v sobi"
 
-#: ../finch/gntsound.c:357
+#: ../finch/gntsound.c:360
 #: ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "Napaka GStreamer"
 
-#: ../finch/gntsound.c:358
+#: ../finch/gntsound.c:361
 #: ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer se ni uspel inicializirati."
 
-#: ../finch/gntsound.c:706
-#: ../finch/gntsound.c:791
-#: ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673
-#: ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715
+#: ../finch/gntsound.c:801
+#: ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675
+#: ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(privzeto)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Izberite zvočno datoteko ..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Zvočne nastavitve"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../finch/gntsound.c:943
-#: ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953
+#: ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Pisk konzole"
 
-#: ../finch/gntsound.c:947
-#: ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957
+#: ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Nemo"
 
-#: ../finch/gntsound.c:950
-#: ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960
+#: ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Način:"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1673,66 +1715,66 @@
 "(%s namesto datoteke)"
 
 #. Sound options
-#: ../finch/gntsound.c:970
-#: ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980
+#: ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Zvok, ko pogovorno okno dobi pozornost"
 
-#: ../finch/gntsound.c:979
+#: ../finch/gntsound.c:989
 #: ../pidgin/gtkprefs.c:896
 #: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1762
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "vedno"
 
-#: ../finch/gntsound.c:980
-#: ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Samo ko je na voljo"
 
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Samo ko ni na voljo"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Glasnost (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005
-#: ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017
+#: ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../finch/gntsound.c:1007
-#: ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019
+#: ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Datoteka"
 
-#: ../finch/gntsound.c:1026
-#: ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038
+#: ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Preskus"
 
-#: ../finch/gntsound.c:1029
-#: ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041
+#: ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../finch/gntsound.c:1032
-#: ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044
+#: ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Izberi ..."
 
@@ -1751,7 +1793,7 @@
 msgstr "Shranjena stanja"
 
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1764,12 +1806,20 @@
 msgid "Type"
 msgstr "Vrsta"
 
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:560
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072
 #: ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592
@@ -1778,31 +1828,32 @@
 #: ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622
 #: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525
 #: ../pidgin/gtksavedstatuses.c:1009
@@ -1811,7 +1862,7 @@
 
 #. Use
 #: ../finch/gntstatus.c:193
-#: ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Uporabi"
 
@@ -1823,58 +1874,80 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Prosimo, vnesite neprazen naslov za stanje."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Podvojen naslov"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Vnesite drugačen naslov za stanje."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Podstanje"
 
-#: ../finch/gntstatus.c:460
+#: ../finch/gntstatus.c:463
 #: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Sporočilo:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Uredi stanje"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Za naslednje račune uporabi različno stanje"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Shrani in uporabi"
 
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Digitalna potrdila"
+
+#: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Stanja"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Pri nalaganju vtičnika je prišlo do napake."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Ni mogoče najti zaslona X"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Ni mogoče najti okna"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Vtičnika ni mogoče naložiti, ker ni bil zgrajen s podporo za X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntOdložišče"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Vtičnik za odložišče"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "Ko se spremeni vsebina odložišča gnt, je vsebina na voljo X-u, če je to le mogoče."
 
@@ -1949,7 +2022,7 @@
 #: ../finch/plugins/gnthistory.c:138
 #: ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr "Vstavek za zgodovino zahteva beleženje v dnevnik"
+msgstr "Vtičnik za zgodovino zahteva beleženje v dnevnik"
 
 #: ../finch/plugins/gnthistory.c:139
 #: ../pidgin/plugins/history.c:148
@@ -1974,7 +2047,7 @@
 #: ../finch/plugins/gnthistory.c:182
 #: ../pidgin/plugins/history.c:191
 msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Ko je odprt nov pogovor, ta vstavek vstavi zadnji pogovor v trenuten pogovor."
+msgstr "Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1999,7 +2072,7 @@
 
 #: ../libpurple/account.c:937
 #: ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
@@ -2020,17 +2093,17 @@
 #: ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Manjka vstavek za protokol %s"
+msgstr "Manjka vtičnik za protokol %s"
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
 #: ../libpurple/account.c:1170
 #: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
@@ -2069,7 +2142,7 @@
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
-#: ../libpurple/account.c:1744
+#: ../libpurple/account.c:1735
 #: ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
@@ -2081,10 +2154,11 @@
 msgstr "Neznan"
 
 #: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518
-#: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325
+#: ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243
+#: ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
@@ -2116,60 +2190,60 @@
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "Sporočila ni mogoče poslati, ker je preveliko."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Sporočila k %s ni mogoče poslati."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Sporočilo je preveliko."
 
-#: ../libpurple/conversation.c:183
+#: ../libpurple/conversation.c:184
 #: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Sporočila ni mogoče poslati."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridružuje."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridružuje."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
@@ -2571,7 +2645,7 @@
 #: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Neustrezna %d vstavka (potrebuje %d)"
+msgstr "Neustrezna %d vtičnika (potrebuje %d)"
 
 #: ../libpurple/plugin.c:465
 #, c-format
@@ -2580,12 +2654,12 @@
 
 #: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
-msgstr "Vstavek ne vsebuje implementacije vseh potrebnih funkcij"
+msgstr "Vtičnik ne vsebuje implementacije vseh potrebnih funkcij"
 
 #: ../libpurple/plugin.c:547
 #, c-format
 msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Zahtevani dodatek %s ni bil najden. Prosim namestite dodatek in poskusite ponovno."
+msgstr "Zahtevani dodatek %s ni bil najden. Prosim, namestite vtičnik in poskusite znova."
 
 #: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
@@ -2594,7 +2668,7 @@
 #: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "Zahtevanega dodatka %s se ni dalo naložiti."
+msgstr "Zahtevanega vtičnika %s ni mogoče naložiti."
 
 #: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
@@ -2603,7 +2677,7 @@
 #: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
-msgstr "Odvisnega vstavka %s ni bilo mogoče odložiti."
+msgstr "Odvisnega vtičnika %s ni bilo mogoče odložiti."
 
 #: ../libpurple/plugin.c:681
 msgid "There were errors unloading the plugin."
@@ -2645,12 +2719,12 @@
 #: ../libpurple/plugins/idle.c:204
 #: ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221
 #: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2694,8 +2768,8 @@
 "(le če ni pomenka s pošiljateljem)"
 
 #: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Opombe"
 
@@ -2769,7 +2843,7 @@
 #: ../libpurple/plugins/dbus-example.c:158
 #: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
-msgstr "Primer vstavka DBus"
+msgstr "Primer vtičnika DBus"
 
 #. *< type
 #. *< ui_requirement
@@ -2866,12 +2940,12 @@
 #. *  summary
 #: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "Preskusite vstavek s podporo IPC, kot odjemalec."
+msgstr "Preskusite vtičnik s podporo IPC, kot odjemalec."
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
 msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Preskusite vstavek s podporo IPC, kot odjemalec. Poišče strežniški vstavek in kliče registrirane ukaze."
+msgstr "Preskusite vtičnik s podporo IPC, kot odjemalec. Poišče strežniški vtičnik in kliče registrirane ukaze."
 
 #  *< api_version
 #  *< type
@@ -2898,12 +2972,12 @@
 #. *  summary
 #: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "Preskusite vstavek s podporo IPC, kot strežnik."
+msgstr "Preskusite vtičnik s podporo IPC, kot strežnik."
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Preskusite vstavek s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
+msgstr "Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -3072,18 +3146,18 @@
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Pri ogledovanju dnevnikov bo ta vstavek vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
+"Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
 "\n"
-"OPOZORILO: Ta vstavek je še vedno v fazi alfa in se lahko pogosto sesuje. Uporaba na lastno odgovornost!"
+"OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. Uporaba na lastno odgovornost!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
-msgstr "Nalaganje vstavkov Mono"
+msgstr "Nalaganje vtičnikov Mono"
 
 #: ../libpurple/plugins/mono/loader/mono.c:219
 #: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
-msgstr "Naloži vstavke .NET skupaj z Mono."
+msgstr "Naloži vtičnike .NET skupaj z Mono."
 
 #. *< magic
 #. *< major version
@@ -3122,23 +3196,23 @@
 msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
 msgstr "Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/izbrišete s pogovornim oknom `Opozorilo prijatelja'."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
 msgstr "\"%s\" trenutno ni povezan. Želite shraniti preostanek sporočil v opozorilo in jih samodejno poslati, ko se \"%s\" znova prijavi?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Brezpovezavno sporočilo"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Opozorilo lahko uredite/izbrišete v pogovornem oknu `Opozorila prijateljev'"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113
@@ -3150,10 +3224,10 @@
 msgid "Yes"
 msgstr "Da"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114
@@ -3165,11 +3239,11 @@
 msgid "No"
 msgstr "Ne"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Shrani brezpovezavna sporočila v opozorilo"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne sprašuj. Vedno shrani v opozorilo."
 
@@ -3181,7 +3255,7 @@
 #. *< id
 #: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
-msgstr "Nalagalnik vstavkov Perl"
+msgstr "Nalagalnik vtičnikov Perl"
 
 #. *< name
 #. *< version
@@ -3189,7 +3263,7 @@
 #: ../libpurple/plugins/perl/perl.c:603
 #: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
-msgstr "Doda podporo nalaganja vstavkov v programskem jeziku perl."
+msgstr "Doda podporo nalaganja vtičnikov v programskem jeziku perl."
 
 #: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
@@ -3250,7 +3324,7 @@
 #. *< id
 #: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
-msgstr "Enostavni vstavek"
+msgstr "Enostavni vtičnik"
 
 #. *< name
 #. *< version
@@ -3280,13 +3354,19 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogoča ovojnico za knjižnice s podporo SSL."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "Digitalna potrdila X.509"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3294,8 +3374,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogoča podporo SSL preko GNUTLS."
 
@@ -3305,7 +3385,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
 msgid "NSS"
 msgstr "NSS"
 
@@ -3313,8 +3393,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogoča podporo SSL preko Mozilla NSS."
 
@@ -3380,16 +3460,16 @@
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
-msgstr "Nalaganje vstavkov Tcl"
+msgstr "Nalaganje vtičnikov Tcl"
 
 #: ../libpurple/plugins/tcl/tcl.c:423
 #: ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
-msgstr "Omogoča podporo nalaganja vstavkov Tcl"
+msgstr "Omogoča podporo nalaganja vtičnikov Tcl"
 
 #: ../libpurple/plugins/tcl/tcl.c:507
 msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vstavke TCL, namestite ActiveTCL z naslova http://www.activestate.com\n"
+msgstr "Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vtičnike TCL, namestite ActiveTCL z naslova http://www.activestate.com\n"
 
 #. Send a message about the connection error
 #: ../libpurple/protocols/bonjour/bonjour.c:112
@@ -3401,21 +3481,21 @@
 msgstr "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/jabber/jabber.c:819
 msgid "First name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "Last name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:940
 #: ../libpurple/protocols/jabber/buddy.c:948
@@ -3428,13 +3508,13 @@
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Račun AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Račun XMPP"
 
@@ -3448,27 +3528,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
-msgstr "Dodatek za protokol Bonjour"
+msgstr "Vtičnik za protokol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Vijolična oseba"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3480,30 +3558,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s je zaprl pomenek."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-#: ../libpurple/protocols/bonjour/jabber.c:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Napaka pri nastavljanju možnosti vtičnice"
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Poslušanje vtičnice ni možno"
 
@@ -3586,8 +3664,8 @@
 
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Geslo"
 
@@ -3618,9 +3696,9 @@
 #: ../libpurple/protocols/gg/gg.c:637
 #: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Kraj"
@@ -3630,8 +3708,8 @@
 msgstr "Leto rojstva"
 
 #: ../libpurple/protocols/gg/gg.c:645
-#: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226
 #: ../libpurple/protocols/qq/qq.c:229
@@ -3646,14 +3724,14 @@
 msgstr "Moški ali ženska"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Moški"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3719,16 +3797,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3423
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3433
 #: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Brez povezave"
 
@@ -3740,10 +3818,10 @@
 #: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1055
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Na voljo"
 
@@ -3751,30 +3829,30 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180
 #: ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
 #: ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Odsoten"
 
 #: ../libpurple/protocols/gg/gg.c:1038
 #: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
@@ -3782,7 +3860,7 @@
 #: ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3795,7 +3873,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1106
 #: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
@@ -3842,7 +3920,7 @@
 msgstr "Povezava ni uspela."
 
 #: ../libpurple/protocols/gg/gg.c:1616
-#: ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
@@ -3915,7 +3993,7 @@
 #. version
 #: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Dodatek za protokol Gadu-Gadu"
+msgstr "Vtičnik za protokol Gadu-Gadu"
 
 #. summary
 #: ../libpurple/protocols/gg/gg.c:2149
@@ -3980,8 +4058,9 @@
 
 #: ../libpurple/protocols/irc/irc.c:127
 #: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614
-#: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612
+#: ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Strežnik ni več povezan"
 
@@ -3997,7 +4076,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:267
 #: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:526
+#: ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -4005,67 +4084,64 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
 #: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Povezovanje"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Povezava do gostitelja ni uspela"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Povezava ni uspela"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Rokovanje SSL ni uspelo"
-
-#: ../libpurple/protocols/irc/irc.c:611
-#: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609
+#: ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Napaka pri branju"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Tema"
 
@@ -4077,50 +4153,50 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
-msgstr "Vstavek za protokol IRC"
+msgstr "Vtičnik za protokol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Vstavek za protokol IRC, ki je manj beden"
+msgstr "Vtičnik za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942
+#: ../libpurple/protocols/irc/irc.c:940
 #: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Strežnik"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945
-#: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943
+#: ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: ../libpurple/protocols/irc/irc.c:951
+#: ../libpurple/protocols/irc/irc.c:949
 #: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4136,7 +4212,7 @@
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/irc/irc.c:954
+#: ../libpurple/protocols/irc/irc.c:952
 #: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
@@ -4147,7 +4223,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
@@ -4178,7 +4254,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4411,7 +4487,7 @@
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
@@ -4517,54 +4593,54 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "%s zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor strežnika."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "Napaka SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4583,7 +4659,7 @@
 msgstr "Ime"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "URL"
 
@@ -4642,15 +4718,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Rojstni dan"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Opis"
@@ -4676,16 +4752,16 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:669
 #: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Vir"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Prednost stika"
 
@@ -4696,9 +4772,9 @@
 msgstr "Drugo ime"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4742,7 +4818,7 @@
 msgstr "Odjavi"
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Pomenek"
 
@@ -4751,10 +4827,10 @@
 msgstr "Odsotnost - Napredno"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
@@ -4764,7 +4840,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Priimek"
 
@@ -4798,8 +4874,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
@@ -4815,7 +4891,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4838,8 +4914,8 @@
 msgstr "Imenik iskanja"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Soba:"
 
@@ -4946,8 +5022,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4956,55 +5032,55 @@
 "Povezave s strežnikom ni mogoče vzpostaviti:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnice"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Neveljaven ID za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti določena."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Že registriran"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Zvezna država"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -5014,398 +5090,396 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega računa morate izpolniti spodnja polja."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Registriraj nov račun za XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Registriraj se"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Oboje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Od"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr "Za"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "brez"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "Spremeni geslo XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Spor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Nepravilno oblikovan ID za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprta vrsta vrstice"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogoče včlaniti kot \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Neznana vloga: \"%s\""
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1817
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
 msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
 
@@ -5426,7 +5500,7 @@
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 #: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../pidgin/gtkaccount.c:508
+#: ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domena"
 
@@ -5439,12 +5513,16 @@
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/myspace/myspace.c:3276
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Poveži vrata"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857
 #: ../pidgin/gtkaccount.c:837
@@ -5520,38 +5598,38 @@
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Pošiljanje datoteke ni uspelo"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Sporočila k %s ni mogoče poslati, neveljaven JID"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Datoteke %s ni mogoče poslati, ker uporabnik ni povezan"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "Datoteke %s ni mogoče poslati, ker nimate dostopa do stanja uporabnikove prisotnosti"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "Izberite, kateremu viru %s bi radi poslali datoteko"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Izberite vir"
 
@@ -5801,74 +5879,86 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN napaka: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "mežik"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "pomežiknjeno"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Mežikanje"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Ravnokar ste poslali mežik!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "To je ime, pod katerim vas bodo videli vaši MSN prijatelji."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Nastavite številko vašega domačega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Nastavite številko vašega službenega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Nastavite številko vašega mobilnega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr "Dovoli MSN strani za mobilnike?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
 msgstr "Ali želite dovoliti oz. prepovedati prijateljem na vašem seznamu, da vam pošiljajo MSN strani za mobilnike na vaš mobilni telefon?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Dovoli"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Prepovej"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr "Pošlji sporočilo na mobilnik."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Vas ima med prijatelji"
 
-#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/msn.c:588
 #: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: ../libpurple/protocols/msn/msn.c:555
+#: ../libpurple/protocols/msn/msn.c:592
 #: ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
@@ -5876,95 +5966,95 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi št. mobilnega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: ../libpurple/protocols/msn/msn.c:1479
-#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/msn/msn.c:1864
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Splošno"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Starost"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5972,204 +6062,204 @@
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../libpurple/protocols/msn/msn.c:1565
-#: ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: ../libpurple/protocols/msn/msn.c:1571
-#: ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697
-#: ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712
-#: ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr "Družabno"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Zanimanja"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Domači ljubljenčki"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Domači kraj"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
 msgstr "Dosedanji kraji bivanja"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Glasba"
 
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Podatki o stiku"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Zasebno"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr "Boljša polovica"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Domači telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Domači telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Osebni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Osebni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Osebni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Obletnica"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Službeno"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv službe"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Podjetje"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Poklic"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Službeni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "Službeni telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Službeni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Službeni pager"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Službeni faks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "Službeni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr "Službeni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
 msgstr "MSN ne more najti uporabnikovega profila. To lahko pomeni, da uporabnik ne obstaja, ali pa še ni ustvaril javnega profila."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 msgid "Could not find any information in the user's profile. The user most likely does not exist."
 msgstr "V uporabnikovem profilu ni mogoče najti nobenih informacij. Uporabnik verjetno ne obstaja."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1878
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL profila"
@@ -6184,20 +6274,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169
+#: ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
-msgstr "Vstavek za protokol MSN"
+msgstr "Vtičnik za protokol MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -6216,8 +6306,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
@@ -6415,7 +6505,7 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Sporočila morda ni bilo poslano, ker je prišlo do neznane napake:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vam je ravnokar poslal mežik!"
@@ -6439,6 +6529,212 @@
 msgid "The screen name specified is invalid."
 msgstr "Navedeno pojavno ime ni veljavno."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Cifra manjka"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Cifre RC4 ni mogoče najti"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Nadgradite libpurple za podporo RC4 (>= 2.0.1). Vtičnik MySpaceIM se ne bo naložil."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
+msgstr "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "Napaka MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Branje izziva"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Nepričakovana dolžina izziva strežnika"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Prijavljanje"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih podatkov)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Nova prejeta sporočila"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Novi komentarji na blogu"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Novi komentarji profila"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nove zahteve prijateljev!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Novi komentarji slike"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Povezano"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Uporabniško ime ni določeno"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+msgstr "Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile.username in izberite uporabniško ime ter se znova poskusite prijaviti."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Napaka protokola, koda %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Prijatelja ni bilo mogoče dodati"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "Ukaz 'addbuddy' ni uspel."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "ukaz persist ni uspel"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Uporabnik ne obstaja: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Ogled uporabnika"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Prijatelja ni bilo mogoče odstraniti"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "ukaz 'delbuddy' ni uspel"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "ukaz blocklist ni uspel"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Neveljaven vnosni pogoj"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Bralni predpomnilnik je poln"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Sporočila ni mogoče razčleniti"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Prijatelji za klepet"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr "%d prijateljev je bilo dodanih ali posodobljenih s strežnika (vključno s prijatelji, ki so že strežniškem seznamu)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Dodaj stike s strežnika"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Dodaj prijatelje z MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Uvoz prijateljev ni uspel"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Poišči prijatelje ..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Spremeni pojavno ime ..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "Upravljač za URL-je \"myim\""
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Za odpiranje tega URL-ja myim ni mogoče najti ustreznega računa MySpaceIM."
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Omogoči pravi račun MySpaceIM in poskusi znova."
+
+#: ../libpurple/protocols/myspace/myspace.c:3280
+msgid "Show display name in status text"
+msgstr "Pokaži zaslonsko ime v besedilu stanja"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Pokaži naslov v besedilu stanja"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Pošlji smejčke"
+
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Ločljivost zaslona (točk na palec)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Osnovna velikost pisave (točke)"
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Zahtevani parametri niso podani"
@@ -6662,7 +6958,7 @@
 msgstr "StojPošta"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Uporabniška št."
 
@@ -6760,7 +7056,7 @@
 #: ../libpurple/protocols/novell/novell.c:3518
 #: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Vstavek za protokol Novell GroupWise Messenger"
+msgstr "Vtičnik za protokol Novell GroupWise Messenger"
 
 #: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
@@ -6771,8 +7067,8 @@
 msgstr "Vrata strežnika"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481
 #: ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099
@@ -6783,8 +7079,8 @@
 msgstr "Strežnik je zaprl povezavo."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632
 #: ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111
 #: ../libpurple/proxy.c:1220
@@ -6820,7 +7116,7 @@
 #: ../libpurple/protocols/oscar/libaim.c:118
 #: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
-msgstr "Vstavek za protokol AIM"
+msgstr "Vtičnik za protokol AIM"
 
 #. *< type
 #. *< ui_requirement
@@ -6835,10 +7131,10 @@
 #: ../libpurple/protocols/oscar/libicq.c:118
 #: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
-msgstr "Vstavek za protokol ICQ"
+msgstr "Vtičnik za protokol ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodiranje"
@@ -6868,7 +7164,7 @@
 msgid "Direct IM established"
 msgstr "Vzpostavljeno neposredno sporočanje"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datoteka %s je %s, kar je več od največje velikosti za %s."
@@ -6980,8 +7276,8 @@
 
 #. Label
 #: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
@@ -7003,7 +7299,7 @@
 msgstr "Pomenek"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
@@ -7076,17 +7372,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Zaseden"
 
@@ -7097,10 +7393,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:736
 #: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Neviden"
 
@@ -7109,14 +7405,14 @@
 msgstr "Prisoten"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "Naslov IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
@@ -7161,14 +7457,14 @@
 msgstr "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je pojavno ime neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti s črko in lahko vsebujejo le črke, številke in presledke ali pa so sestavljena zgolj iz števil."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Neveljavno pojavno ime."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
@@ -7215,10 +7511,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150
 #: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "V _redu"
@@ -7251,31 +7547,31 @@
 msgid "Unable to initialize connection"
 msgstr "Povezave ni mogoče inicializirati"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -7284,17 +7580,17 @@
 "Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Uporabik %u vam je dovolil, da ga dodate na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7307,7 +7603,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7320,7 +7616,7 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7333,25 +7629,25 @@
 "Sporočilo se glasi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Uporabnik ICQ %u vam je poslal vizitko: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ali želite dodati prijatelja s to vizitko na vaš seznam prijateljev?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../libpurple/protocols/oscar/oscar.c:2464
 #: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -7360,7 +7656,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -7369,7 +7665,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -7378,7 +7674,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -7387,7 +7683,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -7396,7 +7692,7 @@
 msgstr[2] "Spregledali ste %hu sporočili od %s, ker sta bili neveljavni."
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7407,109 +7703,109 @@
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Član od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2899
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne znake.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "Zadnjega dejanja, ki ste ga želeli izvesti, ni bilo mogoče izvesti, ker ste prekoračili dovoljeno pogostost. Prosim počakajte 10 sekund in poskusite znova."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Povezava do pogovorne sobe %s je bila prekinjena."
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -7518,85 +7814,85 @@
 msgstr[2] "Naslednji pojavni imeni sta povezani z %s"
 msgstr[3] "Naslednja pojavna imena so povezana z %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Pojavno ime"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Prejeti bi morali e-pošto, da potrdite %s. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Napaka pri spreminjanju podatkov o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati poimenovanja, ker se zahtevano pojavno ime razlikuje od izvirnega."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je neveljavno."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "Napaka 0x%04x: Ni bilo mogoče oblikovati pojavnega imena, ker je zahtevano pojavno ime predolgo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to pojavno ime že en zahtevek."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že preveč računov."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je podani naslov neveljaven."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "Vaša slika IM ni bila poslana. Za pošiljanje slik IM morate biti \"neposredno povezani\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
 msgstr "Verjetno ste zahtevali, da spremenite svoj profil preden je bila prijava dokončana. Za zdaj je vaš profil nespremenjen; poskusite ponovno, ko boste zagotovo prijavljeni."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
@@ -7605,11 +7901,11 @@
 msgstr[2] "Največja dolžina profila %d bajta je bila presežena, zato je bil skrajšan."
 msgstr[3] "Največja dolžina profila %d bajte je bila presežena, zato je bil skrajšan."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
@@ -7618,73 +7914,73 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena, zato je bilo sporočilo skrajšano."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena, zato je bilo sporočilo skrajšano."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogoče dodati prijatelja %s, ker pojavno ime ni veljavno. Imena so lahko veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Vašega seznama prijateljev z AIM strežnikov trenutno ni mogoče pridobiti. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7693,182 +7989,182 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem pojavnega imena lahko spreminjate samo velike črke in presledke."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Najdi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7876,26 +8172,26 @@
 "Vedno uporabi strežnik prehoda AIM/ICQ za prenos datotek\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Poskus povezave na %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Poskus povezave prek strežnika-prehoda."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s vas je ravnokar prosil za neposredno povezavo na %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
 msgstr "To zahteva neposredno povezavo med dvema računalnikoma in je nujno potrebno za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med tveganja zasebnosti."
 
@@ -8461,7 +8757,7 @@
 #: ../libpurple/protocols/qq/qq.c:725
 #: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
-msgstr "Protokol QQ\tVstavek"
+msgstr "Protokol QQ\tVtičnik"
 
 #: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
@@ -8510,7 +8806,8 @@
 msgstr "Uporabnik %s vas je dodal"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Ga želite dodati?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8544,10 +8841,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s ni na vašem seznamu prijateljev."
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Ga želite dodati?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
@@ -8611,10 +8904,6 @@
 msgid "Starting Services"
 msgstr "Zagon storitev"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Povezano"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
@@ -8635,7 +8924,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
@@ -8657,151 +8946,151 @@
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Zvočniki"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "podpira"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Zunanji uporabnik"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Ustvari konferenčni pogovor z uporabnikom"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "Vnesite temo za nov konferenčni pogovor in sporočilo vabila za %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nov konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Ustvari"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Konferenčni pogovori na voljo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferenčni pogovor ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3467
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "Iz spodnjega seznama izberite konferenco in pošljite povabilo uporabniku %s. Izberite \"Ustvari novo konferenco\", če bi želeli ustvariti novo konferenco in k njej povabili uporabnika."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Povabi na konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Povabi na konferenčni pogovor ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Pošlji obvestilo TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587
-#: ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr "Za račun Meanwhile %s ni bil nastavljen noben gostitelj ali naslov IP. Za nadaljevanje prijave vnesite spodaj potrebne podatke. "
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Nazadnje znani odjemalec"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabniški ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na vse naštete uporabnike. Izberite ustreznega in ga dodajte na seznam prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Ni moč dodati uporabnika: ni ga mogoče najti"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom v vaši skupnosti Sametime. Ta vnos je bil odstranjen iz vašega seznama prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8810,151 +9099,150 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Način hrambe seznama prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s strežnikovim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s strežnikovim in ga shrani"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s strežnikom"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za račun %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za račun %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogoče dodati: že obstaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina z imenom '%s' že obstaja v vašem seznamu prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Skupine ni mogoče dodati"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Možni zadetki"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
 msgstr "Imenovalec '%s' se morda nanaša na eno od naslednjih skupin adresarjev zapiskov. Izberite pravo skupino s spodnjega seznama in ga dodajte v svoj seznam prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobeno skupino adresarjev zapiskov v vaši skupnosti Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Vnesite ime skupine opomb adresarja v spodnje polje, s čimer boste lahko v seznam prijateljev vnesli skupino in njene člane."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
 msgstr "Imenovalec '%s' se lahko nanaša na katerega koli od naštetih uporabnikov. Izberite ustreznega in ga dodajte na seznam prijateljev ali pa jim pošljite sporočila s spodnjimi gumbi."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539
-#: ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Išči uporabnike"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Vnesite ime ali delni ID v spodnje polje za iskanje zadetkov v svoji skupnosti Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri strežniške preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
@@ -10166,7 +10454,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Navadno"
 
@@ -10525,7 +10813,7 @@
 #: ../libpurple/protocols/silc/silc.c:1876
 #: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
-msgstr "Vstavek za protokol SILC"
+msgstr "Vtičnik za protokol SILC"
 
 #. *  description
 #: ../libpurple/protocols/silc/silc.c:1878
@@ -10535,7 +10823,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2031
+#: ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Omrežje"
 
@@ -10794,26 +11082,26 @@
 msgstr "Ni mogoče pisati"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Imena strežnika ni mogoče razločiti"
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Pojavna imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -10825,36 +11113,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Vstavek za protokol SIP/SIMPLE"
+msgstr "Vtičnik za protokol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Vstavek za protokol SIP/SIMPLE"
+msgstr "Vtičnik za protokol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Uporabi prehod (proxy)"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Avtoriziraj uporabnika"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
@@ -11010,8 +11298,8 @@
 msgstr "Sprememba gesla uspešna"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Skupina:"
 
@@ -11074,96 +11362,101 @@
 #: ../libpurple/protocols/toc/toc.c:2306
 #: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
-msgstr "Dodatek za protokol TOC"
+msgstr "Vtičnik za protokol TOC"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s vam je ravnokar poslal tresljaj!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Zavrnjeno sporočilo pooblaščanja:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "%s je (že prej) zavrnil vašo zahtevo, da bi ga dodali na svoj seznam prijateljev zaradi naslednjega razloga: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Strežnik Yahoo je zahteval uporabo neprepoznane metode overovitve. Verjetno se ne boste mogli uspešno prijaviti v Yahoo. Preverite %s za posodobitve."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "Poskusili ste prezreti uporabnika %s, ki je na vašem seznamu prijateljev. Če kliknete \"Da\" boste odstranili prijatelja in ga prezrli."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to odpravi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Prejet neveljaven odgovor HTTP strežnika."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11172,7 +11465,7 @@
 "Izgubljena povezava s strežnikom %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11181,111 +11474,123 @@
 "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Kateri ID naj bo aktiviran?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join whom in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Odpri prejeto pošto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr "Ravnokar ste poslali tresljaj!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr "tresljaj"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr "streseni"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr "Stresanje"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Pozvonite (buzznite) pri prijatelju, da vas bo opazil"
+msgstr "buzz: Stresite prijatelja, da vas bo opazil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -11299,123 +11604,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
-msgstr "Dodatek za protokol Yahoo"
+msgstr "Vtičnik za protokol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr "Strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr "Japonski strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Japonski strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Strežnik klepeta Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Povabilo zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Neznana soba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Morda je soba polna"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "Neznana napaka. Morda se boste morali odjaviti in počakati pet minut, preden se boste lahko ponovno pridružili klepetalnici"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Pogovarjate se v %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Morda niso v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Glasovi"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
@@ -11634,7 +11939,7 @@
 #: ../libpurple/protocols/zephyr/zephyr.c:2946
 #: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
-msgstr "Dodatek za protokol Zephyr"
+msgstr "Vtičnik za protokol Zephyr"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
@@ -11742,7 +12047,22 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Pozor! %s %s."
+
+#: ../libpurple/server.c:295
+#: ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Pozor!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "Pozor! Bili ste %s."
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11751,12 +12071,12 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Uporabnik %s vabi %s na pomenek v sobo %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
@@ -11765,7 +12085,7 @@
 msgstr "Nenastavljeno"
 
 #: ../libpurple/status.c:155
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Ne moti"
 
@@ -11817,25 +12137,25 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11844,7 +12164,7 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11853,7 +12173,7 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11862,7 +12182,7 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11871,7 +12191,7 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11880,7 +12200,7 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11889,33 +12209,33 @@
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Ni mogoče odpreti %s: Prevečkrat preusmerjeno"
 
-#: ../libpurple/util.c:3559
-#: ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587
+#: ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ni se mogoče povezati z %s."
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
 msgstr "Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni strežnik morda poskuša storiti nekaj sovražnega."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Napaka pri branju iz %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Napaka pri pisanju v %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"
@@ -11941,37 +12261,37 @@
 msgstr "Postavitev pladnja."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Možnosti prijave"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tokol:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Pojavno _ime:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "_Krajevni psevdonim:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Zapomni si _geslo"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "_Obveščanje o prispeli pošti"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Za ta račun uporabi to _ikono prijatelja:"
 
@@ -12006,7 +12326,7 @@
 msgstr "SOCKS5"
 
 #: ../pidgin/gtkaccount.c:967
-#: ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -12029,17 +12349,17 @@
 msgstr "Možnosti strežnika proxy"
 
 #: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Vrsta s_trežnika proxy:"
 
 #: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Strežnik:"
 
 #: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Vrata:"
 
@@ -12048,32 +12368,44 @@
 msgstr "_Uporabniško ime:"
 
 #: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Novega računa ni mogoče shraniti"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Račun z navedenimi parametri že obstaja."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Ta nov račun ustvarite na strežniku"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "N_apredno"
 
-#: ../pidgin/gtkaccount.c:1982
+#: ../pidgin/gtkaccount.c:1973
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12088,244 +12420,256 @@
 "\n"
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z <b>Računi->Dodaj/Uredi</b> v oknu seznama prijateljev"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792
-#: ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848
-#: ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797
+#: ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890
+#: ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 #: ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Zavrni"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Prekliči _zavrnitev"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../pidgin/gtkblist.c:1135
-#: ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140
+#: ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: ../pidgin/gtkblist.c:1153
-#: ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262
-#: ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158
+#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-#: ../pidgin/gtkblist.c:1170
-#: ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270
-#: ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275
+#: ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
-#: ../pidgin/gtkblist.c:1173
-#: ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272
-#: ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277
+#: ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "I_zbriši skupino"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkblist.c:1263
 #: ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:459
-#: ../pidgin/pidginstock.c:82
+#: ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303
+#: ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../pidgin/gtkblist.c:1572
-#: ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576
-#: ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../pidgin/gtkblist.c:2044
-#: ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055
+#: ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Po_kaži uporabnikov dnevnik ..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Prijatelji/Pokaži prijatelje, ki niso na z_vezi"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Prijatelji/Pokaži pra_zne skupine"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Prijatelji/Pokaži"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na _zvezi"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Prijatelji/Pokaži/Prazne _skupine"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Prijatelji/Pokaži/P_odrobnosti prijateljev"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Prijatelji/Pokaži/_Časi nedejavnosti"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Prijatelji/Pokaži/_Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../pidgin/gtkblist.c:2870
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Orodja/_Digitalna potrdila"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
-msgstr "/Orodja/Vstav_ki"
+msgstr "/Orodja/Vtični_ki"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../pidgin/gtkblist.c:2889
-#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12334,80 +12678,80 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Prijavljeni"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Zadnjič viden"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Strašljivo"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Noro dobro"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Kulsko"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nedejaven %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:3590
-#: ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600
+#: ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../pidgin/gtkblist.c:3593
-#: ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603
+#: ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../pidgin/gtkblist.c:3729
+#: ../pidgin/gtkblist.c:3739
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12417,55 +12761,55 @@
 msgstr[2] "%d neprebrani sporočili od %s\n"
 msgstr[3] "%d neprebrana sporočila od %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "ročno"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "po stanju"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../pidgin/gtkblist.c:4018
+#: ../pidgin/gtkblist.c:4028
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Uporabniško ime:</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Geslo:</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Prijavi"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12479,82 +12823,86 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Prijatelji/Pokaži prazne skupine"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Prijatelji/Pokaži čase nedejavnosti"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na zvezi"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Prijatelji/Pokaži/Prazne skupine"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Prijatelji/Pokaži/Podrobnosti prijateljev"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Prijatelji/Pokaži/Časi nedejavnosti"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Prijatelji/Pokaži/Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:5501
 msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim, vnesite pojavno ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Pojavno ime:"
 
-#: ../pidgin/gtkblist.c:5516
-#: ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558
+#: ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "Psev_donim:"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5880
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim, vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Računi/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../pidgin/gtkblist.c:6603
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646
+#: ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Računi/Omogoči račun"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
@@ -12569,224 +12917,216 @@
 "\n"
 "%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Neznan ukaz."
 
-#: ../pidgin/gtkconv.c:759
-#: ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734
+#: ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../pidgin/gtkconv.c:779
+#: ../pidgin/gtkconv.c:754
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: ../pidgin/gtkconv.c:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: ../pidgin/gtkconv.c:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../pidgin/gtkconv.c:903
+#: ../pidgin/gtkconv.c:878
 #: ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../pidgin/gtkconv.c:960
-#: ../pidgin/gtkconv.c:2521
+#: ../pidgin/gtkconv.c:936
+#: ../pidgin/gtkconv.c:2581
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../pidgin/gtkconv.c:1151
+#: ../pidgin/gtkconv.c:1129
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Najdi"
 
-#: ../pidgin/gtkconv.c:1177
+#: ../pidgin/gtkconv.c:1155
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
-
-#: ../pidgin/gtkconv.c:1368
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Nastavi ikono po meri ..."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Odstrani ikono po meri"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Pokaži vse"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pokaži _dnevnik ..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Pova_bi ..."
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Pogovor/_Več"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/_Vzdevek ..."
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/Zavr_ni ..."
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Pogovor/Pre_kliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi pove_zavo ..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Možnosti/Pokaži _ikono prijatelja"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za _oblikovanje"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pokaži _časovne žige"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Pogovor/Več"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Možnosti"
 
@@ -12795,105 +13135,101 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3093
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Pogovor"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Pokaži dnevnik"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Pogovor/Prekliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za oblikovanje"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Pokaži časovne žige"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Možnosti/Pokaži ikono prijatelja"
-
-#: ../pidgin/gtkconv.c:3297
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3329
+#: ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525
-#: ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3557
+#: ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
-#: ../pidgin/gtkconv.c:5609
-#: ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5742
+#: ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12902,78 +13238,78 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../pidgin/gtkconv.c:6338
+#: ../pidgin/gtkconv.c:6464
 #: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6474
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Počisti vse izpisane replike pomenka."
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: ../pidgin/gtkconv.c:8111
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../pidgin/gtkconv.c:9213
-#: ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9459
+#: ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "novo okno"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -13039,7 +13375,7 @@
 msgstr "Usodna napaka"
 
 #: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
@@ -13058,8 +13394,8 @@
 #: ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85
 #: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
 #: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "razvijalec"
 
@@ -13071,442 +13407,450 @@
 msgid "support/QA"
 msgstr "podpora/QA"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "razvijalec in oskrbnik spletne strani"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "različica win32"
 
-#: ../pidgin/gtkdialogs.c:105
-#: ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "vzdrževalec"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "vzdrževalec libfaim"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "razvijalec in oskrbnik spletne strani"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "Razvijalec XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "afrikansko"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "arabsko"
 
-#: ../pidgin/gtkdialogs.c:130
-#: ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "bengalsko"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "bosansko"
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "valencijansko-katalonsko"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "češko"
 
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "dansko"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "nemško"
 
-#: ../pidgin/gtkdialogs.c:145
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Džonka"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "grško"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "špansko"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "estonsko"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "baskijsko"
 
-#: ../pidgin/gtkdialogs.c:157
-#: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "perzijsko"
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "finsko"
 
-#: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "francosko"
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "galicijsko"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "gujaratsko"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "prevajalska skupina za Gujarati"
 
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "indonezijsko"
 
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "italijansko"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "japonsko"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "gruzijsko"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "gruzijski prevajalci za Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "kannadsko"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "prevajalska skupina za Kannado"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "korejsko"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "kurdsko"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "nepalsko"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "norveško"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "norveško (Nyorsk)"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "poljsko"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "paštunsko"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "romunsko"
 
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "rusko"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "albansko"
 
-#: ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "srbsko"
 
-#: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "švedsko"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "tamilsko"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "teluško"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "tajsko"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "turško"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "hongkonško kitajsko"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "O programu %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "%s je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s je modularen grafičen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, XMPPr, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu in QQ. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija licence GPL je vključena v datoteko 'COPYING', ki se razširja s programom %s.  %s je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam avtorjev prispevkov.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:452
 msgid "Retired Crazy Patch Writers"
 msgstr "Upokojeni nori pisci obližev"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Oblikovalci"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:892
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri si želite ogledati podatke."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:984
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite pojavno ime ali psevdonim osebe, o kateri želite pridobiti dnevnik."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -13515,63 +13859,63 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "Skupino %s boste spojili v skupino %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
@@ -13681,7 +14025,7 @@
 
 #. Pause button
 #: ../pidgin/gtkft.c:832
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Premor"
 
@@ -13690,44 +14034,44 @@
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: ../pidgin/gtkimhtml.c:831
-#: ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Počisti oblikovanje"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13737,7 +14081,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13747,7 +14091,7 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13758,7 +14102,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13769,127 +14113,195 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476
-#: ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Nastavi barvo besedila"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Nastavi barvo ozadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Opis"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "Vnesite URL in opis povezave, ki jo želite vstaviti. Opis ni obvezen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433
+#: ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519
-#: ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539
+#: ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820
-#: ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "_Pisava"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Združi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Razdruži"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Krepko"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Ležeče"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Podčrtano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Prečrtano"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Povečaj pisavo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Pomanjšaj pisavo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Vrsta pisave"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Barva ozadja"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Barva ospredja"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Ponastavi oblikovanje"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Vstavi sliko IM"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Vstavi smejčka"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Krepko</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Ležeče</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>Pod_črtano</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Prečrtano</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">_Večje</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Navadna"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Manjše</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "V_rsta pisave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "Barva o_spredja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Barva o_zadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "S_mejček"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "Sl_ika"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "P_ovezava"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Vodoravna črta"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
@@ -14036,15 +14448,15 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -14053,7 +14465,7 @@
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
@@ -14062,39 +14474,39 @@
 msgstr[2] "<b>Imate %d novi e-sporočili.</b>"
 msgstr[3] "<b>Imate %d nova e-sporočila.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Ukaz brskalnika \"%s\" ni veljaven."
 
-#: ../pidgin/gtknotify.c:969
-#: ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994
-#: ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959
+#: ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984
+#: ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Napaka pri zagonu \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vašega brskalnika ni bilo mogoče zagnati, ker ste v nastavitvah izbrali poljuben brskalnik, a niste nastavili ukaza."
 
 #: ../pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
-msgstr "Odloženi bodo naslednji vstavki."
+msgstr "Odloženi bodo naslednji vtičniki."
 
 #: ../pidgin/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
-msgstr "Odloženih bo več vstavkov."
+msgstr "Odloženih bo več vtičnikov."
 
 #: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
-msgstr "Odloži vstavke"
+msgstr "Odloži vtičnike"
 
 #: ../pidgin/gtkplugin.c:399
 #, c-format
@@ -14116,121 +14528,121 @@
 msgstr ""
 "%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">Napaka: %s\n"
-"Preverite spletno stran vstavka za posodobitev.</span>"
+"Preverite spletno stran vtičnika za posodobitev.</span>"
 
 #: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
-msgstr "_Nastavi vstavek"
+msgstr "_Nastavi vtičnik"
 
 #: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
-msgstr "<b>Podrobnosti o vstavku</b>"
+msgstr "<b>Podrobnosti o vtičniku</b>"
 
 #: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "Premor med _tipkanjem"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "_Opozori le tedaj, ko nisem na voljo"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Privzeto"
 
 #: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
-msgstr "Teme nasmeškov ni mogoče razpakirati."
+msgstr "Teme smeškov ni mogoče razpakirati."
 
 #: ../pidgin/gtkprefs.c:643
 msgid "Install Theme"
@@ -14265,7 +14677,7 @@
 msgstr "Skrij nove po_govore IM:"
 
 #: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "ob odsotnosti"
 
@@ -14362,127 +14774,127 @@
 msgid "Conversation _font:"
 msgstr "_Pisava pogovora:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Privzeto oblikovanje"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
 msgstr "Tako bo izgledalo besedilo vašega odhodnega sporočila, če uporabljate protokole, ki podpirajo oblikovanje."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Strežnik proxy"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Brez strežnika proxy"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14491,63 +14903,63 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "glasno"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14556,81 +14968,81 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Omogoči zvoke:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "Število _minut pred nedejavnostjo:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Stanje / Nedejaven"
 
@@ -14722,24 +15134,24 @@
 msgid "Apply"
 msgstr "Uporabi"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: ../pidgin/gtkrequest.c:1505
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Izberite novo ime"
 
-#: ../pidgin/gtkrequest.c:1647
-#: ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Izberite mapo ..."
 
@@ -14781,7 +15193,7 @@
 msgstr "_Naziv:"
 
 #: ../pidgin/gtksavedstatuses.c:1177
-#: ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Stanje:"
 
@@ -14795,7 +15207,7 @@
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
@@ -14808,61 +15220,61 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388
-#: ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398
+#: ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Pri odpiranju %s je prišlo do neznane napake: %s"
 
-#: ../pidgin/gtkutils.c:1391
-#: ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati mape %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "Mape %s ni mogoče prenesti. Datoteke boste morali poslati posamično."
 
-#: ../pidgin/gtkutils.c:1520
-#: ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko, jo vključite v to sporočilo ali uporabite kot ikono za tega uporabnika."
 
-#: ../pidgin/gtkutils.c:1527
-#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538
+#: ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: ../pidgin/gtkutils.c:1529
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "To sliko lahko pošljete kot datoteko ali uporabite kot ikono za tega uporabnika."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "To sliko lahko vstavite v to sporočilo ali pa jo uporabite kot ikono prijatelja za tega prijatelja"
 
@@ -14871,15 +15283,15 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "Povlekli ste namizni zaganjalnik. Najverjetneje ste želeli namesto samega zaganjalnika poslati tisto, na kar ta zaganjalnik kaže."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14890,25 +15302,25 @@
 "<b>Velikost:</b> %s\n"
 "<b>Velikost slike:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Datoteka '%s' je prevelika za %s.  Prosimo, poskusite z manjšo sliko.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Napaka ikone"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Ikone ni mogoče nastaviti"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Datoteke '%s' ni mogoče odpreti: %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "Sliko '%s' ni mogoče naložiti: razlog ni znan, najbrž je datoteka okvarjena"
@@ -14922,31 +15334,31 @@
 msgid "Select color"
 msgstr "Izberite barvo"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "Psev_donim"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Zapri _zavihke"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Informacije"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "Povab_i"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Smejčki Pidgin"
 
@@ -15011,12 +15423,12 @@
 #. *< version
 #: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
-msgstr "Vstavek za napovedovanje dosegljivosti stika."
+msgstr "Vtičnik za napovedovanje dosegljivosti stika."
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:939
 msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
-msgstr "Vstavek dosegljivosti stika (cap) se uporablja za prikaz statističnih podatkov o prijateljih v seznamu stikov."
+msgstr "Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih podatkov o prijateljih v seznamu stikov."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -15112,18 +15524,6 @@
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Krepko"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Ležeče"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Podčrtano"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Prezri dohodno obliko"
@@ -15428,12 +15828,12 @@
 msgstr "Nariši označevalno črto v "
 
 #: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "oknih _neposrednih pogovorov"
 
 #: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_pogovornih oknih"
 
@@ -15445,32 +15845,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Seja glasbenega sporočanja potrjena."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Glasbeno sporočanje"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Pri zaganjanju ukaza je prišlo do napake:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Napaka pri uporabi urejevalnika"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Prišlo je do naslednje napake:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Nastavitve glasbe sporočanja"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Pot urejevalnika partiture"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "Upor_abi"
 
@@ -15482,85 +15882,85 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
 msgstr "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Obveščaj o"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Le ko nekdo omeni vaše pojavno ime v sobi"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "Okna, ki imajo _fokus"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Načini obveščanja"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Dodaj _obvestilo v naslov okna:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Prikaži _število novih sporočil v naslovu okna"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Vstavi število novih sporočil v lastnost _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Povzdigni pogovorna okn_a"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Odstranjevanje obvestil"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Odstrani, ko pogovorno okno _dobi fokus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Odstrani, ko _kliknem na pogovorno okno"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Odstrani, ko _tipkam v pogovornem oknu"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Odstrani, ko je _sporočilo poslano"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstrani ob zamenjavi _zavihka pomenka"
 
@@ -15570,7 +15970,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Obvestila o sporočilih"
 
@@ -15578,8 +15978,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904
-#: ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ponuja mnoge načine opozarjanja na nova sporočila."
 
@@ -15598,14 +15998,14 @@
 #. *< id
 #: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
-msgstr "Predstavitveni vstavek Pidgina"
+msgstr "Predstavitveni vtičnik Pidgina"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
-msgstr "Vzorčni vstavek, ki počne razne stvari - oglejte si opis."
+msgstr "Vzorčni vtičnik, ki počne razne stvari - oglejte si opis."
 
 #. *  description
 #: ../pidgin/plugins/pidgininc.c:96
@@ -15615,9 +16015,9 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"To je resnično carski vstavek, ki naredi dosti stvari:\n"
-"- ko se prijavite, pove kdo je napisal ta program;\n"
-"- prikaže vsa prispela sporočila črkovana nazaj;\n"
+"To je resnično carski vtičnik, ki zmore veliko:\n"
+"- ko se prijavite, pove, kdo je spisal ta program;\n"
+"- prikaže vsa prispela sporočila, črkovana nazaj;\n"
 "- pošlje sporočilo prijateljem na vašem seznamu, takoj ko se prijavijo;"
 
 #: ../pidgin/plugins/pidginrc.c:41
@@ -15944,44 +16344,44 @@
 msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in dnevniških sporočil."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Neprosojnost:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Pogovorna okna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Pro_sojnost pogovornega okna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Prikaži drsno vrstico v pogovornem oknu"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Odstrani prosojnost pogovornega okna v ospredju"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Vedno na vrhu"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Seznam prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Prosojnost seznama prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
 
@@ -15991,69 +16391,69 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Prosojnost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Poljubna prosojnost seznama prijateljev in pomenkov."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ta vstavek omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
+"Ta vtičnik omogoči poljubno nastavitev prosojnosti pogovornih oken in seznama prijateljev.\n"
 "\n"
-"* Pozor: Ta vstavek zahteva Win2000 ali novejše."
+"* Pozor: Ta vtičnik zahteva Win2000 ali novejše."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Nastavitve GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Zagon"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Zaženi %s ob zagonu sistema"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Le_pljiv seznam prijateljev"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Ohrani seznam prijateljev nad vrhu:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "samo, ko je lepljiv"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "Utrip_aj z oknom, ko prispejo nova sporočila"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Možnosti Pidgin za okolje Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Nastavitve, specifične za %s v okolju Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje seznama prijateljev."
 
@@ -16103,5 +16503,5 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Ta vstavek je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
+msgstr "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
diff -ru pidgin-2.1.1/po/sq.po pidgin-2.2.0/po/sq.po
--- pidgin-2.1.1/po/sq.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sq.po	2007-09-14 00:45:44.000000000 -0400
@@ -10811,7 +10811,7 @@
 msgstr "Veprues cili ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "T'i bashkohem kujt në fjalosje?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/sr@Latn.po pidgin-2.2.0/po/sr@Latn.po
--- pidgin-2.1.1/po/sr@Latn.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sr@Latn.po	2007-09-14 00:45:44.000000000 -0400
@@ -10770,7 +10770,7 @@
 msgstr "Aktiviraj ID (koji)?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Priključi se kome razgovoru?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/sr.po pidgin-2.2.0/po/sr.po
--- pidgin-2.1.1/po/sr.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sr.po	2007-09-14 00:45:44.000000000 -0400
@@ -10533,7 +10533,7 @@
 msgstr "Активирај ИД (који)?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Прикључи се коме разговору?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/sv.po pidgin-2.2.0/po/sv.po
--- pidgin-2.1.1/po/sv.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/sv.po	2007-09-14 00:45:44.000000000 -0400
@@ -11233,7 +11233,7 @@
 msgstr "Vilket ID ska aktiveras?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Anslut vem till chatten?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3357
diff -ru pidgin-2.1.1/po/ta.po pidgin-2.2.0/po/ta.po
--- pidgin-2.1.1/po/ta.po	2007-08-20 14:13:05.000000000 -0400
+++ pidgin-2.2.0/po/ta.po	2007-09-14 00:45:44.000000000 -0400
@@ -11877,7 +11877,7 @@
 msgstr "எந்த முகப்பை செயல்படுத்த?"
 
 #: ../src/protocols/yahoo/yahoo.c:3070
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "எந்த அரட்டையில் இருப்பவருடன் சேர ?"
 
 #: ../src/protocols/yahoo/yahoo.c:3080
diff -ru pidgin-2.1.1/po/te.po pidgin-2.2.0/po/te.po
--- pidgin-2.1.1/po/te.po	2007-08-20 14:13:06.000000000 -0400
+++ pidgin-2.2.0/po/te.po	2007-09-14 00:45:44.000000000 -0400
@@ -10983,7 +10983,7 @@
 msgstr "ఏ  IDని యాక్టివ్ చేద్దాం?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "ఎవరితో మాట్లాడుదాం ?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/th.po pidgin-2.2.0/po/th.po
--- pidgin-2.1.1/po/th.po	2007-08-20 14:13:06.000000000 -0400
+++ pidgin-2.2.0/po/th.po	2007-09-14 00:45:44.000000000 -0400
@@ -11710,7 +11710,7 @@
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3070
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr ""
 
 #: ../src/protocols/yahoo/yahoo.c:3080
diff -ru pidgin-2.1.1/po/tr.po pidgin-2.2.0/po/tr.po
--- pidgin-2.1.1/po/tr.po	2007-08-20 14:13:06.000000000 -0400
+++ pidgin-2.2.0/po/tr.po	2007-09-14 00:45:44.000000000 -0400
@@ -1,3 +1,4 @@
+# translation of pigdin-new-tr.po to Turkish
 # translation of tr.new.po to
 # translation of pidgin-new.po to
 # translation of pidgin.po to
@@ -11,33 +12,33 @@
 # Serdar Soytetir <tulliana@gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: tr.new\n"
+"Project-Id-Version: pigdin-new-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-13 03:22-0400\n"
-"PO-Revision-Date: 2007-07-13 19:22+0300\n"
+"POT-Creation-Date: 2007-09-10 03:22-0400\n"
+"PO-Revision-Date: 2007-09-11 01:37+0300\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
-"Language-Team:  <tr@li.org>\n"
+"Language-Team: Turkish <yerellestirme@kde.org.tr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms:  nplurals=1; plural=0;\n"
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: TURKEY\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Daha fazla bilgi için `%s -h' deneyin.\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -58,7 +59,7 @@
 "  -n, --nologin       otomatik olarak bağlanmanızı engeller\n"
 "  -v, --version       geçerli sürümü gösterir ve çıkar\n"
 
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -69,15 +70,18 @@
 "Lütfen taşıma işini araştırarak kendiniz yapın. Lütfen bu hatayı http://"
 "developer.pidgin.im adresine bildirin."
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Hata"
@@ -90,85 +94,85 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Bir hesabın kayıtlı isim kısmı boş olmamalıdır."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Yeni e-posta bildirimleri"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Parolayı hatırla"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Hiç yüklenmiş protokol eklentisi yok."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Muhtemelen'make install' komutunu vermeyi unuttunuz.)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Hesabı Düzenle"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Yeni Hesap"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Kayıtlı İsim:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Görünen İsim:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:666 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1057 ../finch/gntstatus.c:144 ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609 ../libpurple/account.c:984
+#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:588
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330 ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
@@ -191,110 +195,111 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:757 ../pidgin/gtkdialogs.c:896
+#: ../pidgin/gtkdialogs.c:988 ../pidgin/gtkdialogs.c:1008
+#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1102 ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1199 ../pidgin/gtkdialogs.c:1238
+#: ../pidgin/gtkdialogs.c:1265 ../pidgin/gtkimhtmltoolbar.c:434
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "İptal"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../finch/gntaccount.c:578 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1054 ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597 ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Kaydet"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%s hesabını silmek istediğinize emin misiniz?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Hesabı Sil"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665 ../finch/gntpounce.c:728 ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Sil"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2104 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 "Aşağıdaki listede bulunan hesapları etkinleştirebilir ya da "
 "pasifleştirebilirsiniz."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Ekle"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Düzenle"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Kişiyi listenize eklemek istiyor musunuz?"
 
-#: ../finch/gntaccount.c:927
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
-msgid "%s%s%s%s wants to add %s%s%s%s to his or her buddy list%s%s"
-msgstr "%s%s%s%s kullanıcısı %s%s%s%s kişisini kişi listesine eklemek istiyor %s%s"
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor %s%s"
 
-#: ../finch/gntaccount.c:955 ../finch/gntaccount.c:958
-#: ../finch/gntaccount.c:985 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
 #: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "İzin vermek istiyor musunuz?"
 
-#: ../finch/gntaccount.c:962 ../finch/gntaccount.c:989
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
 #: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "İzin Ver"
 
-#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:990
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
 #: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "İzin Verme"
@@ -319,36 +324,36 @@
 msgid "Error adding buddy"
 msgstr "Kişi ekleme hatası"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Kayıtlı İsim"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Görünen İsim"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Grup"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Hesap"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -357,7 +362,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Kişi Ekle"
@@ -366,14 +371,14 @@
 msgid "Please enter buddy information."
 msgstr "Lütfen kişi bilgilerini girin."
 
-#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Sohbetler"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590 ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -381,154 +386,154 @@
 msgid "Name"
 msgstr "İsim"
 
-#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Otomatik-katıl"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Sohbet Ekle"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Daha sonra menüden başka bilgiler ekleyebilirsiniz."
 
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Grup ekleme hatası"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Lütfen eklemek istediğiniz grup için bir isim girin."
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Bu adı taşıyan bir grup zaten var."
 
-#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Grup Ekle"
 
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Lütfen grubun ismini girin"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Sohbet Düzenle"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Lütfen gerekli alanları Güncelleyin."
 
-#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Düzenle"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "Otomatik-katıl"
-
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Ayarları Düzenle"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Kullanıcı Bilgileri"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Alınıyor..."
 
-#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Kişi Bilgilerini Al"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Kişi için Uyarıcı Ekle"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Kişiye Dosya Gönder"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Kayıtları Göster"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Lütfen %s için yeni ismi girin"
 
-#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Görünen İsmi Ayarla"
 
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "İsmi yeniden ayarlamak için boş bırakın."
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "Bu bağlantıyı silmek aynı zamanda bu bağlantı içerisindeki tüm kişileri de "
 "silecektir"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Bu grubu silmek aynı zamanda bu grup içerisindeki tüm kişileri de silecektir"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "%s ögesini kaldırmak istediğinizden emin misiniz ?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Kaldırmayı Onayla"
 
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Kaldır"
 
 #. Buddy List
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Pidgin - Kişi Listesi"
 
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
-msgstr ""
+msgstr "Etiketlenmişlere yerleştir"
 
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Etiketi Değiştir"
 
 #. General
-#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
 #: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409 ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -538,29 +543,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Takma ad"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:553 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Boşta"
 
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Cep Telefonunda"
 
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -569,12 +574,12 @@
 "Çevrimiçi: %d\n"
 "Toplam: %d"
 
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Hesap: %s (%s)"
 
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -583,49 +588,49 @@
 "\n"
 "Son Görülme Zamanı: %s önce"
 
-#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Yeni..."
 
-#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Kaydedilmiş..."
 
-#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_İsim"
 
-#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "_Hesap"
 
-#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Yeni Anlık İleti"
 
-#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Lütfen anlık ileti göndermek istediğiniz kişinin görünen adını veya takma "
 "adını giriniz."
 
-#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2220 ../finch/gntnotify.c:79 ../libpurple/account.c:983
 #: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/msn/msn.c:295 ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329 ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -642,40 +647,40 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:756 ../pidgin/gtkdialogs.c:895
+#: ../pidgin/gtkdialogs.c:987 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Tamam"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Anlık İleti Gönder..."
 
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Boş grupları göster"
 
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Çevrimdışı kişileri göster"
 
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Duruma göre sırala"
 
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Alfabetik olarak sırala"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Kayıt büyüklüğüne göre sırala"
 
@@ -702,41 +707,45 @@
 "Finch, siz hatayı düzeltip hesabınızı yeniden etkinleştirene kadar yeniden "
 "bağlanmayacak."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Böyle bir komut yok."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Söz Dizimi Hatası: Komut için yanlış sayıda parametre verdiniz."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı verdiğiniz komut başarısız oldu."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Bu komut anlık iletiler için değildir, sadece sohbetlerde çalışır."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Bu komut sohbet için değildir, sadece anlık iletilerde çalışır."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Bu komut, bu protokol üzerinde çalışmaz."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "İleti gönderilmedi, çünkü oturum açmamışsınız."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -745,48 +754,64 @@
 "\n"
 "%s ileti yazıyor..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Sobetten ayrıldınız."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Kayıt tutma başlatıldı. Bundan sonraki iletiler kaydedilecek."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Kayıt tutma durduruldu. Bundan sonraki iletiler kaydedilmeyecek."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Gönder"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Yazışma"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Yazışma/Temi_zle"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Zaman Etiketlerini Göster"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Kişi için Uyarıcı Ekle..."
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Kayıt Tutmayı Etkinleştir"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Sesleri Etkinleştir"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<OTOMATİK-YANIT> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Kullanıcı listesi:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Desteklenen hata ayıklama seçenekleri:  versiyon"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Böyle bir komut yok (burada)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -795,59 +820,59 @@
 "alabilirsiniz.\n"
 "Aşağıdakiler burada geçerli olan komutlardır:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;mesaj&gt;:  Komut kullanmıyormuşunuz gibi ileti göndermenizi sağlar."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Kişiye ya da sohbet odasına IRC stili hareket gönder."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  Bu konuşmaya çeşitli hata ayıklama bilgileri yolla."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Konuşma ekranını temizler."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komut&gt;:  Belirtilen komutla ilgili yardım almanızı sağlar."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Sohbete katılan kullanıcıların listesini göster."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Eklentiler penceresini gösterir."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Kişi Listesini gösterir."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Hesaplar penceresini gösterir."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Hata ayıklama penceresini gösterir."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: Tercihler penceresini gösterir."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Kaydedilmiş durumlar penceresini gösterir."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
@@ -873,99 +898,104 @@
 msgstr "Dosya Aktarımı - %d%% - %d dosya"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Dosya Aktarımları"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "İlerleme"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Dosya adı"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Boyut"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Hız"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Kalan"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Durum"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Tüm aktarımlar bitince pencereyi kapat."
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Tamamlanan aktarımları temizle"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Dur"
 
 #. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../finch/gntft.c:236 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:737 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:412 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Kapat"
 
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Aktarımın başlaması bekleniyor"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "İptal Edildi"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Başarısız Oldu"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Dosya %s olarak kaydedildi."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Bitti"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Aktarılıyor"
 
@@ -977,11 +1007,11 @@
 msgid "You have mail!"
 msgstr "E-postanız var!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Gönderen"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Konu"
 
@@ -991,29 +1021,29 @@
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) %d yeni ileti."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Yeni E-Posta"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "%s için Bilgi"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Kişi Bilgileri"
 
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Devam Et"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Bilgi"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Anında Mesajlaşma"
 
@@ -1080,7 +1110,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -1088,7 +1118,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Lütfen uyarmak istediğiniz kişiyi girin."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Yeni Kişi Uyarıcı"
@@ -1102,7 +1131,7 @@
 msgstr "Kimi Uyarsın"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Hesap:"
 
@@ -1111,7 +1140,7 @@
 msgstr "Kişi ismi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Uyarılma Nedenleri"
 
@@ -1156,7 +1185,7 @@
 msgstr "Bir ileti gönderince"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Davranışlar"
 
@@ -1184,70 +1213,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Sadece erişilebilir olmadığımda uyar"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Tekrarlayan"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Uyarıcı oluşturulamadı"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Bir hesabınız yok."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Bir uyarıcı oluşturmadan önce bir hesap oluşturmalısınız."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "%s için %s uyarıcısını silmek istediğinize emin misiniz ?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Kişi Uyarıcıları"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s yazmaya başladı (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s yazmayı kesti (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s bağlandı (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s boşta durumuna geçti (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s uzakta durumuna geçti (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s yazmayı bıraktı (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s çıktı (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s boşta durumuna geçti (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s uzakta durumuna geçti (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s size bir ileti göndermek istiyor, (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
 
@@ -1255,13 +1296,13 @@
 msgid "Based on keyboard use"
 msgstr "Klavye kullanımına göre"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Gönderilen son iletiden"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Asla"
 
@@ -1310,12 +1351,12 @@
 msgstr "Durumu değiştir"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Yazışmalar"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Kayıtlar"
 
@@ -1323,16 +1364,167 @@
 msgid "Not implemented yet."
 msgstr "Özellik henüz eklenmedi."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Dosyayı Kaydet..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Dosya Aç..."
 
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Arkadaşınız giriş yaptığında"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Arkadaşınız çıkış yaptığında"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Mesaj alındığında"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Alınan mesaj yazışmayı başlatır"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Mesaj gönderildiğinde"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Kişi sohbete katıldıldığında"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Kişi sohbetten ayrıldığında"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Siz sohbette konuştuğunuzda"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Diğerleri sohbet ederken"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Birisi sohbette takma adınızı söylediğinde"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer Başarısız"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer başlatılırken hata oluştu."
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(öntanımlı)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "Ses Dosyasını Seç ..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "Ses Tercihleri"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "Profiller"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "Otomatik"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "Konsol Bip Sesi"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "Komut"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "Ses Yok"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "Ses Davranışları"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "_Davranış: "
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Ses Komutu\n"
+"(dosya ismi için %s)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "Ses Seçenekleri"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "Sohbet odaklandığında ses çıkarır"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "Her zaman"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "Sadece erişilebilir olduğumda"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "Sadece erişilebilir olmadığımda"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "Ses Düzeyi (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "Ses Olayları"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "Olay"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "Dosya"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "Test Et"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "Seç..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1346,7 +1538,7 @@
 msgid "Saved Statuses"
 msgstr "Kaydedilmiş Durumlar"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1358,30 +1550,39 @@
 msgid "Type"
 msgstr "Tip"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
 #: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1389,15 +1590,15 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "İleti"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Kullan"
 
@@ -1409,52 +1610,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Lütfen durum için boş olmayan bir başlık girin."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Başlığı ikile"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Lütfen durum için farklı bir başlık girin."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Alt-durum"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Durum:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "İleti:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Durumu Düzenle"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Farklı hesaplar için farklı durumlar kullan"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Kaydet & Kullan"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Sertifikalar"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "Sesler"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Durumlar"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Eklenti yüklenirken hata oluştu."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "X ekranı bulunamadı"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Pencere bulunamadı"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Bu eklenti yüklenemez çünkü X11 desteği olmadan inşa edilmiş."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Pano eklentisi"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1580,7 +1806,7 @@
 msgstr "hesaplar"
 
 #: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Oturum açmak için parola gerekli"
 
@@ -1603,12 +1829,12 @@
 msgstr "%s eklentisi için eksik protokol"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Bağlantı Hatası"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Yeni şifreler çelişiyor."
 
@@ -1646,18 +1872,19 @@
 msgid "Set User Info"
 msgstr "Kullanıcı Bilgisini Değiştir"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/account.c:1735 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243 ../pidgin/gtkblist.c:5367
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Kişiler"
@@ -1687,58 +1914,58 @@
 msgid "Unknown error"
 msgstr "Bilinmeyen Hata"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 msgid "Unable to send message: The message is too large."
 msgstr "İleti gönderilemedi: İleti çok uzun."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:174 ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "İleti %s kişisine gönderilemedi."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Mesajınız çok uzun."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:184 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Mesaj gönderilemedi."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "İleti Gönder"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_İleti Gönder"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s odaya giriş yaptı."
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] odaya giriş yaptı."
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "Şimdi %s olarak biliniyorsunuz"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s şimdi %s olarak biliniyor"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s odadan ayrıldı."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s odadan ayrıldı (%s)."
@@ -2012,86 +2239,104 @@
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"aim\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"gg\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"icq\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"irc\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"msnim\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"sip\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"xmpp\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"\"komut\" içerisinde belirtilen komut kısayolu \"ymsgr\" adreslerini yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Bu komut bir uçbirimde çalıştırılabilen adresleri yakalayabiliyorsa "
+"doğru."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"aim\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"gg\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"icq\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"irc\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"msnim\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"sip\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"xmpp\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Belirtilen komut \"ymsgr\" adreslerini yakalayabiliyor mu"
 
 #: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -2109,15 +2354,15 @@
 msgid "Old flat format"
 msgstr "Eski düz biçem"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Konuşmanın kaydı yapılamadı."
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2126,7 +2371,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-"
 "CEVAPLA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2135,16 +2380,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-"
 "CEVAPLA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kayıt dosyası yolu bulunamadı!</b></font>"
 
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Dosya okunamıyor: %s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Otomatik-cevap>: %s\n"
@@ -2237,13 +2482,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "İp_tal"
@@ -2284,9 +2529,11 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"Otomatik olarak kabul edilen bir dosya aktarımı bittiğinde uyar\n"
+"(sadece kullanıcı ile bir sohbet yoksa)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Notlar"
 
@@ -2306,20 +2553,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Kişi Notları"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Farklı kişiler için not kaydet"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
+msgstr "Kişi listenizdeki kişilere not ekleme seçeneğini sağlar."
 
 #. *< type
 #. *< ui_requirement
@@ -2475,7 +2722,7 @@
 
 #: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "Kullanıcı Hareketsizliği Zamanaşımı (dakika olarak)"
 
 #. *< type
 #. *< ui_requirement
@@ -2505,110 +2752,110 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "Kullanıcı çevrimdışı."
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Otomatik-yanıt gönderildi:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s şimdi çıkış yaptı."
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Bir ya da daha fazla ileti gönderilebilir değil."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Sunucuyla bağlantınız koptu."
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "Şuanda çevrimdışısınız. Oturum açana kadar ileti alamayacaksınız."
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "İleti gönderilemedi çünkü ileti uzunluğu aşıldı."
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "İleti gönderilemedi."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Genel Kayıt Okuma Yapılandırması"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Hızlı boyut hesaplama"
 
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Sezgisel isim kullan"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Kayıt Dizini"
 
@@ -2618,19 +2865,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Kayıt Okuyucu"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2688,24 +2935,24 @@
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Çevrimdışı İletisi"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2715,9 +2962,9 @@
 msgid "Yes"
 msgstr "Evet"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2727,11 +2974,11 @@
 msgid "No"
 msgstr "Hayır"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Çevrimdışı iletileri uyarıcı içine kaydet"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Sorma. Herzaman uyarıcıya kaydet."
 
@@ -2758,7 +3005,7 @@
 
 #: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "Gelen sohbetler için ruhsal durum"
 
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
@@ -2792,7 +3039,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Sinyal Testi"
 
@@ -2800,8 +3047,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Tüm sinyallerin doğru çalışıp çalışmadığını görmek için test edin."
 
@@ -2839,7 +3086,13 @@
 #. *  description
 #: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
+msgstr "SSL destek kütüphaneleri için bir sarıcı sağlar."
+
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "X.509 Sertifikaları"
 
 #. *< type
 #. *< ui_requirement
@@ -2847,7 +3100,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2855,8 +3108,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS üzerinden SSL desteği sağlar."
 
@@ -2866,7 +3119,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
 msgid "NSS"
 msgstr "NSS"
 
@@ -2874,8 +3127,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Mozilla NSS üzerinden SSL desteği sağlar."
 
@@ -2949,7 +3202,7 @@
 
 #: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
-msgstr ""
+msgstr "Tcl eklentilerini yükleme desteği sağlar"
 
 #: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
@@ -2966,25 +3219,43 @@
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "Uzakta"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:819
+msgid "First name"
+msgstr "Ad"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:824
+msgid "Last name"
+msgstr "Soyad"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-Posta"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM Hesabı"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP Hesabı"
 
 #. *< type
 #. *< ui_requirement
@@ -2996,40 +3267,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protokolü Eklentisi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Mor Kişi"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Barındırıcı adı"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Ad"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Soyad"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3037,42 +3293,34 @@
 msgid "E-mail"
 msgstr "E-posta"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM Hesabı"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP Hesabı"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s yazışmayı kapattı."
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "İletiniz gönderilemedi, yazışma başlatılamadı."
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Soket açılamıyor"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Soket seçenekleri ayarlanırken hata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
-msgstr ""
+msgstr "Soket porta yönlendirilemedi"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Soketten okunamıyor"
 
@@ -3151,8 +3399,8 @@
 msgstr "Kayıt başarıyla tamamlandı!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Parola"
 
@@ -3178,9 +3426,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Şehir"
@@ -3189,12 +3437,12 @@
 msgid "Year of birth"
 msgstr "Doğum Yılı"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Cinsiyet"
 
@@ -3203,16 +3451,16 @@
 msgstr "Bay veya Bayan"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr " Bay"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Bayan"
 
@@ -3272,12 +3520,13 @@
 #: ../libpurple/protocols/gg/gg.c:1003
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Çevrimdışı"
 
@@ -3286,21 +3535,42 @@
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Çevrimiçi"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "Uzakta"
+
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3311,7 +3581,7 @@
 msgstr "Doğum Yılı"
 
 #: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Arama sonuçları gösterilemedi."
 
@@ -3355,7 +3625,7 @@
 msgid "Connection failed."
 msgstr "Bağlantı kurulamadı."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Engellenmiş"
 
@@ -3433,7 +3703,7 @@
 #. summary
 #: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
-msgstr ""
+msgstr "Polonyalı popüler Hızlı Mesajlaşma"
 
 #: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
@@ -3492,7 +3762,8 @@
 msgstr "%s için MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Sunucu bağlantısı kesildi"
 
@@ -3506,7 +3777,7 @@
 msgstr "_Kanal"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "Ş_ifre"
 
@@ -3514,65 +3785,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC isimler boşluk karakteri içeremez"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Bağlanılıyor"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 msgid "SSL support unavailable"
 msgstr "SSL desteği mevcut değil"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Soket yaratılamadı"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Ana bilgisayara bağlanılamadı"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Bağlantı Kurulamıyor"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Başarısız"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Okuma hatası"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Konu"
 
@@ -3584,34 +3852,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol Eklentisi"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Daha az Hatası Olan IRC Eklentisi"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Sunucu"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
@@ -3619,12 +3887,12 @@
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodlamalar"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3640,7 +3908,7 @@
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3650,7 +3918,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "SSL Kullan"
 
@@ -3681,7 +3949,7 @@
 msgstr "<i>(tanımlandı)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3953,7 +4221,7 @@
 msgstr "names [channel]: Kanaldaki kullanıcıları listeler"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Nick (takma adınızı) değiştirir."
 
@@ -4091,41 +4359,41 @@
 "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
 "doğrulama istiyor"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Şifresiz Metin Yetkilendirmesi"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Hata: sunucudan geçersiz cevap"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4134,12 +4402,12 @@
 "doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek istiyor "
 "musunuz?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Sunucudan geçersiz yanıt"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL hatası"
 
@@ -4164,7 +4432,7 @@
 msgstr "Görünen İsim"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "URL"
 
@@ -4206,18 +4474,6 @@
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "E-Posta"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
 #: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
@@ -4235,14 +4491,14 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Doğum Günü"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Açıklama"
@@ -4257,6 +4513,8 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
+"Aşağıdaki tüm ögeler seçimlik. Kendinizi rahat hissedeceğiniz bilgileri "
+"girin."
 
 #: ../libpurple/protocols/jabber/buddy.c:655
 #: ../libpurple/protocols/jabber/buddy.c:696
@@ -4270,19 +4528,19 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:669
 #: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Kaynak"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
-msgid "Priority"
-msgstr "Öncelik"
-
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+msgid "Priority"
+msgstr "Öncelik"
+
 #: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
@@ -4290,9 +4548,9 @@
 msgstr "İkinci İsim"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4336,7 +4594,7 @@
 msgstr "Üyelikten Çık"
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Konuşkan"
 
@@ -4345,9 +4603,9 @@
 msgstr "Uzun Süreli Uzakta"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Rahatsız Etme"
@@ -4358,7 +4616,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Soyad"
 
@@ -4390,12 +4648,12 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
+msgstr "Eşleşen bir XMPP kullanıcısını arama için en az bir alanı doldurun."
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "E-Posta Adresi"
 
@@ -4408,9 +4666,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4434,8 +4692,8 @@
 msgstr "Arama Dizini"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Oda:"
 
@@ -4500,7 +4758,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
+msgstr "Takma ad değiştirmek MUC olmayan sohbet odalarında desteklenmiyor"
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
@@ -4541,9 +4799,9 @@
 msgstr "Okuma hatası"
 
 #: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4552,55 +4810,55 @@
 "Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Soket oluşturulamadı"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Geçersiz XMPP Kimliği"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Geçersiz XMPP Kimliği. Alan adı ayarlanmalı."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s kaydı başarılı oldu"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
 msgid "Registration Successful"
 msgstr "Kayıt Başarılı"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
 msgid "Unknown Error"
 msgstr "Bilinmeyen Hata"
 
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Failed"
 msgstr "Kayıt Başarısız Oldu"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Zaten Kayıtlı"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "Durum"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Posta kodu"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4610,378 +4868,377 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Tarih"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 msgid "Please fill out the information below to register your new account."
 msgstr "Kaydolmak için aşağıdaki bilgileri tamamlayın."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Yeni XMPP Hesabına Kayıt Ol"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Kayıt Ol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
-msgstr ""
+msgstr "Yayın Başlatılıyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Kimlik Doğrulaması Yapılıyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
-msgstr ""
+msgstr "Yayın Yeniden Başlatılıyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Yetki Verilmemiş"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "İkisi de"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr "Kimden (bekletiliyor)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Kimden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr "Kime"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr "Hiçbiri (bekletiliyor)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr "Üyelik"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Parola Değişti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Parolanız değiştirildi."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Parola değiştirilirken hata"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Yeni parola (tekrar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "XMPP Parolası Değiştir"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Lütfen yeni parolanızı girin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Kullanıcı Bilgisi Ayarla..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Parola Değiştir..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Kullanıcı Ara..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Kötü İstek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Çakışma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr "Özellik Eklenmedi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Yasak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr "Gitti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "İç Sunucu Hatası"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Öge Bulunamadı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Bozuk XMPP Kimliği"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr "Kabul Edilebilir Değil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "İzin Verilmemiş"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr "Ödeme Gerekli"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr "Geçersiz Alıcı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr "Kayıt Gerekli"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Uzak Sunucu Bulunamadı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Uzak Sunucu Zamanaşımına Uğradı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Sunucuya Aşırı Yüklenme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Geçersiz Sunucu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr "Kayıt Gerekli"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
 msgstr "Beklenmeyen İstek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
 msgstr "Yetkilendirmeden Vazgeçildi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr "Kimlik Doğrulamada yanlış kodlama"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr "Geçersiz izin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
 msgstr "Geçersiz Kimlik Doğrulama mekanizması"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
 msgstr "Kimlik Doğrulama mekanizması çok zayıf"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr "Geçici Olarak Kimlik Denetimi Başarısız"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Kimlik Denetimi Başarısız"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Kötü Biçem"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr "Yanlış İsimlendirme Öneki"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Kaynak Çakışması"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Bağlantı Zamanaşımına Uğradı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr "Sunucu Gitti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Sunucu Bilinmiyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr "Uygunsuz Adresleme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Geçersiz Kimlik"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Geçersiz İsimlendirme (Namespace)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Geçersiz XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
 msgstr "Uyuşmayan Host'lar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr "Politika İhlâli"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
 msgstr "Uzak Bağlantı Başarısız"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Kaynak Kısıtlaması"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr "Kısıtlanmış XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr "Diğer Host'u Gör"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr "Sistem Kapanıyor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr "Tanımlanmamış Koşul"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Geçersiz Kodlama"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr "Desteklenmeyen Stranza Türü"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Desteklenmeyen Sürüm"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "XML Doğru Biçimlendirilmemiş"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Akış Hatası"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "%s kullanıcısına yasak konulamadı"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Bilinmeyen ilişkilendirme: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kullanıcı %s , \"%s\" olarak yetkilendirilemedi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Bilinmeyen rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "\"%s\" rolü şu kullanıcı için ayarlanamadı: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "%s kullanıcısı tekmelenemedi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
 msgstr "config:  Sohbet odasını düzenle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1817
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Sohbet odasını düzenle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "part [room]:  Leave the room."
 msgstr "part [oda]:  Sohbetten ayrıl"
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr "register:  Sohbet odasına kayıt ol"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [yeni konu]:  Konuyu değiştir veya görüntüle"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;user&gt; [room]:  Kullanıcıyı odadan uzun süreli uzaklaştırır "
 "(banlar)."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4989,7 +5246,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir "
 "kullanıcının odayla ilişkisini ayarlar."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4997,19 +5254,19 @@
 "role &lt;kullanıcı&gt; &lt;yönetici|katılımcı|ziyaretçi|hiçbiri&gt;: Bir "
 "kullanıcının odadaki rolünü ayarla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Bir kullanıcıyı odaya davet eder"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;oda&gt; [sunucu]:  Ağdaki sohbete katıl"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Birini odadan atar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:1878
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullanıcıya özel mesaj gönder"
 
@@ -5029,7 +5286,7 @@
 msgstr "XMPP Protokol Eklentisi"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Alan Adı"
 
@@ -5042,12 +5299,16 @@
 msgstr "Şifrelenmemiş sistemlerden gelen düzyazılara (plain text) izin ver."
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/myspace/myspace.c:3276
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Bağlantı portu"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
@@ -5091,16 +5352,16 @@
 msgid "XML Parse error"
 msgstr "XML ayrıştırma hatası"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Bilinmeyen Hata"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
 msgid "Create New Room"
 msgstr "Yeni Oda Oluştur"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5108,56 +5369,56 @@
 "Yeni bir oda oluşturuyorsunuz.  Odayı yapılandırmak mı öntanımlı ayarları "
 "kullaanmak mı istersiniz?"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "_Odayı Düzenle"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "Varsayılanları _Kabul Et"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "%s sohbetinde hata"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "%s sohbetine katılırken hata"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "%s dosyası gönderilemedi, kullanıcı dosya aktarımlarını desteklemiyor"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Dosya Gönderimi Başarısız"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "İleti %s kişisine gönderilemedi, geçersiz JID"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Dosya %s kişisine gönderilemedi, kullanıcı bağlı değil"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
+msgstr "%s kullanıcısına dosya gönderilemedi, kullanıcı bağlı değil"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Bir Kaynak Seçin"
 
@@ -5373,7 +5634,7 @@
 msgstr "Sunucu çok yoğun"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5410,357 +5671,369 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Hatası: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "uyarı"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "uyarıldı"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Uyarılıyor"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Şimdi bir Titreşim gönderdiniz!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Yeni MSN arkadaşlık isminiz çok uzun."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Arkadaşlık adınızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Bu isim MSN arkadaşlarınıza görünen isminizdir."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Ev telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "İş telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Mobil telefon numaranızı ayarlayın."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN Mobil Sayfalarına izin verilsin mi ?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "İzin ver"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "İzin verme"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "Bu Hotmail hesabı aktif olmayabilir."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr "Bir SMS gönder."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr "Sayfa"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Sizi eklemiş mi ?"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:588 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Hemen Dönecek"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:592 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Meşgul"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Telefonda"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Yemekte"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Arkadaşlık İsmi Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Ev Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "İş Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Cep Telefonu Numarası Ayarla..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobil Aygıtları Etkinleştir/Pasifleştir"
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobil Sayfalarına İzin Ver/Reddet"
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail Gelen Kutusunu Aç"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr "Cebine Gönder"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Kişiyle Sohbete _Başla"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN için SSL desteği gereklidir. Lütfen geçerli bir SSL kütüphanesi yükleyin."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Sunucuya bağlanılamadı"
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1516 ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Profil alınırken hata"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1587 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Genel"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Yaş"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Meslek"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Konum"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800 ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Hobiler ve İlgi Alanları"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749 ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Benim Hakkımda Birkaç Şey"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr "Sosyal"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Medeni Hali"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "İlgiler"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Evcil hayvanlar"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Memleket"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
 msgstr "yaşadığı Yerler"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Mizah"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Müzik"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1635 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "En Sevdiği Söz"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Bağlantı Bilgileri"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Kişisel"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr "Önemli Diğerleri"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Ev Telefonu2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Ev Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Kişisel Cep Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Ev Faksı"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Kişisel E-posta"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Kişisel Anında Mesajlaşma Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Yıldönümü"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "İş"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "İşi"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Şirket"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departman"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Uzmanlık"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "İş Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "İş Telefonu2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "İş Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "İş Cep Telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "İş Çağrı Cihazı"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "İş Faksı"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "İş E-Postası"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr "İş Anında Mesajlaşma Adresi"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Başlama Tarihi"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765 ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778 ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Sevdiği Şeyler"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Son Güncelleme"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Anasayfa"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Kullanıcı genel bir profil oluşturmamış."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5769,14 +6042,14 @@
 "MSN kulllanıcının profilini bulamıyor. Bu durumda kullanıcı mevcut değildir, "
 "ya da genel bir profil oluşturmamıştır."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil URL"
 
@@ -5790,19 +6063,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169 ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protokol Eklentisi"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "HTTP Metodunu Kullan"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Özel gülenyüzleri göster"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : kullanıcıların sizi farketmesi için dürtme uyarısı"
 
@@ -5821,8 +6094,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Bağlanılamıyor"
 
@@ -5927,8 +6200,8 @@
 msgstr "HTTP ayrıştırma hatası"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Başka bir programla oturum açtınız."
 
@@ -6018,33 +6291,247 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s size bir titreşim gönderdi!"
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s sizi kişi listesine ekledi."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s sizi kişi listesinden sildi."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" eklenemiyor."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Belirlenen görüntü adı geçersiz."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM Hatası"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Giriş yapılıyor"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Sunucuya yapılan bağlantı kapandı (%d saniyedir veri alınamıyor)"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Yeni e-posta iletisi"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Yeni günlük yorumları"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Yeni profil yorumları"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Yeni arkadaşlık isteği!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Yeni resim yorumları"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Bağlandı"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Kullanıcı adı ayarlanmadı"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokol hatası, kod: %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Kişi eklenemedi"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy' komutu başarısız oldu."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Böyle bir kullanıcı yok: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Kişi silinemedi"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy' komutu başarısız oldu"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Geçersiz girdi durumu"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Okuma ara belleği dolu"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Ayrıştırılamayan ileti"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Bilgisayara bağlanılamadı: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Hızlı Mesajlaşma Arkadaşları"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Sunucudan kişileri ekle"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "MySpace.com adresinden yeni arkadaşlar ekle"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Arkadaşları içeri aktarma işlemi başarısız oldu"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Kişi bul..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Hızlı Mesajlaşma adını değiştir..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "myim adres yakalayıcı"
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3280
+msgid "Show display name in status text"
+msgstr "Durum metninde görünen ismi göster"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Durum metninde başlığı göster"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Duygu simgeleri gönder"
+
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Ekran Çözünürlüğü (her inç için nokta)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Temel yazıtipi boyutu (pt)"
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
-msgstr ""
+msgstr "Zorunlu parametreler geçerli sayılmadı"
 
 #: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
@@ -6056,7 +6543,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
-msgstr "Sunucu ile iletişim hatası"
+msgstr "Sunucu ile iletişim kurma hatası"
 
 #: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
@@ -6389,18 +6876,18 @@
 msgid "Server port"
 msgstr "Sunucu portu"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Sunucu bağlantıyı kapattı."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6411,7 +6898,7 @@
 "Sunucu ile bağlantı kesildi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
 #: ../libpurple/proxy.c:1461
@@ -6449,7 +6936,7 @@
 msgstr "ICQ Protokolü Eklentisi"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodlama"
@@ -6465,24 +6952,24 @@
 #: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+msgstr "Uzak kullanıcı ile bağlantı koptu:<br>%s"
 
 #: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "Uzak kullanıcı ile yapılan bağlantı üzerinden geçersiz veri alındı."
 
 #: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr ""
+msgstr "Uzak kullanıcı ile bağlantı kurulamıyor."
 
 #: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Doğrudan Anında Mesajlaşma sağlandı"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgstr "%s dosyasının boyutu %s, bu boyut en yüksek boyut olan %s boyutunundan büyük."
 
 #: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
@@ -6546,7 +7033,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
-msgstr ""
+msgstr "Yerelde izin ver/izin verme"
 
 #: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
@@ -6580,7 +7067,7 @@
 msgid "Not while on AOL"
 msgstr "AOL'de değil"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6588,7 +7075,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6596,21 +7083,21 @@
 msgstr ""
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Kişi Simgesi"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Ses"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM Doğrudan IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6618,124 +7105,125 @@
 msgid "Chat"
 msgstr "Sohbet"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Dosyayı Al"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Oyunlar"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Eklentiler"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Kişi Listesi Gönder"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ Doğrudan Bağlantı"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP Kullanıcısı"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Eski ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian Şifrelemesi"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Güvenlik Aktif"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Görüntülü Sohbet"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Canlı Görüntü"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Sohbet için Hazır"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Erişilebilir Değil"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Meşgul"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
-msgstr "Web Aware"
+msgstr "Web'e Açık"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Görünmez"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP Adresi"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Uyarı Seviyesi"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Kişi Hakkında Yorum"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6744,7 +7232,7 @@
 "Kimlik doğrulaması için sunucuya bağlanılamıyor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6753,52 +7241,53 @@
 "BOS sunucuya bağlanılamadı:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Kayıtlı isim gönderildi"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Bağlantı kuruldu, çerezler yollandı"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Bağlantı sonlandırılıyor"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
-"Oturum açılamadı: %s olarak bağlanılamadı, çünkü görünen adınız geçerli değil. "
-"Takma adlar bir harfle başlamalı ve harfler, rakamlar, boşluk ile devam etmelidir."
+"Oturum açılamadı: %s olarak bağlanılamadı, çünkü görünen adınız geçerli "
+"değil. Takma adlar bir harfle başlamalı ve harfler, rakamlar, boşluk ile "
+"devam etmelidir."
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Geçersiz kullanıcı adı"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Yanlış parola."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Hesabınız şuan için durdurulmuştur."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger (Anlık İleti) Servisi geçici olarak servis dışı."
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6807,44 +7296,44 @@
 "deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
 "kalacaksınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "İstemci sürümünüz çok eski. Lütfen şuadan güncelleyin: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Bağlanılamadı"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "İzin alındı."
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "Girilen SecurID anahtarı geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "SecurID (güvenlik nosu) Giriniz"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Dijital görünümden 6 rakamı giriniz."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_Tamam"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6853,53 +7342,53 @@
 "Kısa bir süreliğine bağlantı kopmuş olabilir. Bu onarılana kadar TOC "
 "kullanmalısınız. Güncellemeler için ziyaret edin : %s "
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Geçerli AIM giriş hash'i alınamadı."
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Kısa bir süreliğine bağlantı koptu.  Güncellemeler için %s adresine bakın."
 
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Geçerli bir giriş hash'i alınamadı."
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Parola gönderildi"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Bağlantı başlatılamadı"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "İzin İsteme İletisi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Lütfen sizi eklememe izin verin!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Sebep yazılmamış."
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "İzin Reddetme İletisi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6910,17 +7399,17 @@
 "vermiyor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ izni (yetkisi) reddedildi."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u kullanıcısı onu kişi listenize eklemenize izin verdi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6933,7 +7422,7 @@
 "Kimden: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6946,7 +7435,7 @@
 "Kimden: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6959,109 +7448,109 @@
 "Mesaj:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ kullanıcısı %u size bir arkadaş yolladı: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Ekle"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Reddet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "%hu mesajı %s gönderinden geçersiz olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "%hu mesajı %s gönderinden çok uzun olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "%hu mesajı %s gönderinden limiti aştığınız için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "%hu mesajı %s gönderinden, o çok günahkar olduğu için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2608
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "%hu mesajı %s gönderinden çok günahkar olduğunuz için kaçırdınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:2617
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "%hu mesajı %s gönderinden bilinmeyen bir sebepten dolayı kaçırdınız."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesaj gönderilemedi: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Bilinmeyen Sebep."
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Mesaj %s e gönderilemedi:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "%s kullanıcı bilgisi mevcut değil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "Bağlı olduğu süre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Üye olduğu süre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/oscar/oscar.c:2899
 msgid "Capabilities"
 msgstr "Yetenekler"
 
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Erişilebilir İletisi"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "AIM bağlantınız kaybolmuş olabilir."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7069,7 +7558,7 @@
 "[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
 "gösterilemiyor.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7077,97 +7566,93 @@
 "Yaptığınız son işlem gerçekleştirilemiyor çünkü deneme limitini aştınız. "
 "Lütfen 10 saniye daha bekleyin ve tekrar deneyin."
 
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "Bilinmeyen bir sebepten dolayı oturumunuz kapandı."
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s sohbet odasından bağlantınız koptu."
 
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Kişisel Web Sayfası"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Ek Bilgi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Posta Kodu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Bölüm"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Pozisyon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Web Sayfası"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "İş Bilgileri"
 
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Açılır Pencere Mesajı"
 
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Katyıtlı olan şu isimler %s ile ilişkilendirilmiş"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Kayıtlı isim"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "%s e-posta adresi için sonuç bulunamadı"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s onayı soracak bir e-posta almalısınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Hesap Doğrulama İstendi"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Hesap Bilgileri Değiştirilirken Hata"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "Hata 0x%04x: Görüntü adı biçimlendirilemiyor. Çünkü orjinal addan farklı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7176,7 +7661,7 @@
 "Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü istediğiniz isim çok "
 "uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7185,7 +7670,7 @@
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü zaten bir görüntü adı "
 "değiştirmesi bekleniyor."
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7194,38 +7679,38 @@
 "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü birden fazla görüntü "
 "adı bu adresle eşleştirilmiş."
 
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hata 0x%04x: Bilinöeyen hata"
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s için e-posta adresi %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Hesap Bilgileri"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "IM Resminiz gönderilemedi. Anlık ileti resminizi gönderebilmeniz için Direkt "
 "Bağlanmış olmanız gerekmektedir."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "AIM profili belirlenemiyor"
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7235,7 +7720,7 @@
 "çalıştınız. Profiliniz belirsizleştirildi, tamamen bağlandığınızda tekrar "
 "ayarlamayı deneyin."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7245,11 +7730,11 @@
 "truncated for you."
 msgstr[0] "Maksimum profil uzunluğu olan %d bayt aşıldığından profiliniz kısaltıldı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profil çok uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7259,11 +7744,11 @@
 "truncated for you."
 msgstr[0] "Maksimum uzakta iletisi uzunluğu %d bayt aşıldığından iletiniz kısaltıldı."
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Uzakta iletiniz çok uzun."
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7273,9 +7758,9 @@
 "%s kişisi eklenemiyor çünkü görünen adı geçersiz. Görüntü adı bir harfle "
 "başlamalı ve sadece harf, rakam, boşluk ve numaralarla devam etmelidir."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Eklenemiyor"
 
@@ -7292,16 +7777,15 @@
 "erişilemez durumda.  Kişi listeniz kaybolmadı, muhtemelen birkaç saat içinde "
 "yeniden aktif olacaktır."
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
 #: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
-msgstr ""
+msgstr "Kimsesizler"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7310,39 +7794,39 @@
 "%s kişisi eklenemedi çünkü kişi listenizde çok kişi var. Bir tanesini silin "
 "ve işlemi tekrarlayın."
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı %s kişisi eklenemedi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Yetki Verildi"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s kullanıcısı onu listenize ekleme iznini sağladı."
 
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "İzin Sağlandı"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7350,53 +7834,53 @@
 "%s"
 msgstr "%s kullanıcısı onu listenize ekleme iznini vermiyor. Şu sebepten: n%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "İzin Verilmedi"
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Değişim:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Geçersiz sohbet adı belirlendi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Anlık İletici (IM) resminiz yollanmadı. AIM sohbetlerinde kişisel "
 "görüntüleri yollayamazsınız."
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
 #: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Uzakta İletisi"
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(alınıyor)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes Müzik Deposu Bağlantısı"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s kişisi için açıklama"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Kişi Açıklaması:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s ile direkt anlık mesajllaşma bağlantısını açmayı seçtiniz."
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7404,64 +7888,64 @@
 "Çünkü bu IP adresinizi gösterir ve bu bir güvenlik tehdidi içerir.  Devam "
 "etmek istiyor musunuz?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "_Bağlan"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "AIM Bilgilerini Al"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Kişi Açıklaması Düzenle"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Durum İletisi Al"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Doğrudan IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Yeniden İzin İste"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "İzin gereksin"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "Web'e açık (SPAM iletiler almanıza neden olabilir!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ Gizlilik Seçenekleri"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Yeni biçimlendirme geçersiz."
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Adresi Şöyle Değiştir:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>izin için beklemiyorsunuz</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Şu kullanıcılardan izin bekliyorsunuz"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7469,73 +7953,73 @@
 "Kullanıcıya sağ tıklayıp \"Yeniden İzin İste\" ye tıklayarak yeniden bu "
 "kullanıcıdan izin isteyebilirsiniz."
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "E-Posta ile Arkadaş Bul"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "E-Posta adresiyle bir arkadaş ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Aradığınız arkadaşın e-posta adresini yazın."
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Kullanıcı Bilgisini Ayarla (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Parola değiştir (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM Yönlendirmeyi yapılandır (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Gizlilik Seçeneklerini Ayarla..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Hesabı Doğrula"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Şimdiki Katıtlı Olunan E-posta Adresini Değiştir..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "İzin Bekleyen Kişileri Göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "E-Posta Adresine Göre Kişi Ara..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Kişi Bilgilerine Göre Kişi Ara"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "En son kişi grubunu kullan"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Ne kadar süredir bağlı olduğunuzu göster"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7543,26 +8027,26 @@
 "Dosya aktarımları için herzaman ICQ proxy sunucularını kullan\n"
 "(yavaştır ama IP adresinizi göstermez)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s kullanıcısına anlık mesajlaşma için bağlanma isteği soruldu. (%s:%hu)"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "%s kullanıcısına bağlantı sağlanmaya çalışılıyor:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Bir proxy sunucu üzerinden bağlanmaya çalışılıyor."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s direkt olarak %s ögesine bağlanmak için izin istedi"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -7594,11 +8078,11 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
-msgstr ""
+msgstr "Burç Sembolü"
 
 #: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
-msgstr ""
+msgstr "Zodyak İmzası"
 
 #: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
@@ -7756,7 +8240,6 @@
 msgstr "%d kişisinin isteğini kabul etmediniz"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Sebbinizi girin:"
 
@@ -7773,35 +8256,37 @@
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Reddet"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
-msgstr ""
+msgid "Add buddy with auth request failed"
+msgstr "Eklenme isteği ile kişi ekleme başarısız oldu"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
-msgstr ""
+msgstr "Bir kişiyi başarılı şekilde sildiniz"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr ""
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Kendinizi bir kişinin kişi listesinden başarılı şekilde sildiniz"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "%d kullanıcısı kimlik doğrulamaya gereksinim duyuyor"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "İsteğinizi buraya girin"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Arkadaşım olmak ister misiniz?"
@@ -7809,22 +8294,22 @@
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Gönder"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
+msgid "You have added %d to buddy list"
 msgstr "%d kişisini kişi listenize eklediniz"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQ Kimlik Hatası"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Geçersiz QQ Kimliği"
 
@@ -7853,8 +8338,8 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
-msgstr ""
+msgid "Please enter external group ID"
+msgstr "LÜtfen dış grup Kimliğini girin"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
@@ -7862,12 +8347,12 @@
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
 msgstr "%d kullanıcısı %d grubuna katılmak istedi"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Sebep: %s"
@@ -7887,37 +8372,37 @@
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Onayla"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
+msgid "You [%d] have left group \"%d\""
+msgstr "Siz [%d] \"%d\" grubundan çıktınız"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
+msgid "You [%d] have been added to group \"%d\""
+msgstr "Siz [%d] \"%d\" grubuna eklendiniz"
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Bu grup kişi listenize eklendi"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "Ben bir üye değilim"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -7941,24 +8426,24 @@
 msgstr "Bu grup diğerlerinin katılmasına izin vermiyor"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
-msgstr ""
+msgid "You have successfully left the group"
+msgstr "Gruptan başarılı bir şekilde ayrıldınız"
 
 #: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "Bu Qun'dan çıkmak istediğinizden emin misiniz?"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "Bu Qun hesabından ayrılmak istediğinizden emin misiniz?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -7966,10 +8451,6 @@
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Doğru git"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -7979,27 +8460,31 @@
 msgid "Group Operation Error"
 msgstr "Grup İşlemi Hatası"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
-msgstr ""
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
+msgstr "İsteği kabul etmek istiyor musunuz?"
+
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Sebebinizi girin:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
-msgstr ""
+msgid "You have successfully modified Qun member"
+msgstr "Qun üyesini başarılı şekilde düzenlediniz"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
-msgstr ""
+msgid "You have successfully modified Qun information"
+msgstr "Qun bilgisini başarılı şekilde düzenlediniz"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "Başarılı şekilde Qun oluşturdunuz"
 
 #: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
-msgstr ""
+msgstr "Şimdi Qun detaylarını ayarlamak ister misiniz?"
 
 #: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
@@ -8010,19 +8495,15 @@
 msgstr "Sistem İletisi"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "Sunucu ACK"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Anlık ileti gönderimi başarısız oldu."
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
+msgid "Keep alive error"
 msgstr ""
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
+msgid "Error requesting login token"
 msgstr ""
 
 #: ../libpurple/protocols/qq/login_logout.c:486
@@ -8042,96 +8523,83 @@
 msgid "Unknown-%d"
 msgstr "Bilinmeyen-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s Adres"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP Adresi"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP Adresi"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Seviye"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Uygun"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Uzakta"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Görünmez"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Çevrimdışı"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Geçersiz ad"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Şimdi Çevrimiçi</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Son Yenileme:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Bağlantı Kipi</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Sunucunun IP numarası</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Benim Görünen IP numaram</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Giriş Zamanı</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Son Girişin IP numarası</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Son Görülme Zamanı</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Giriş Bilgileri"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Bilgilerimi Düzenle"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Bilgilerimi Yapılandır"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Parola Değiştir"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Giriş Bilgilerini Göster"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr ""
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Bu QQ Qun'dan ayrıl"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Bu kişiyi engelle"
 
@@ -8145,25 +8613,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protokolü\t Eklentisi"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "TCP ile giriş yap"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Gizli Bağlan"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Soket gönderme hatası"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Bağlantı reddedildi"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "TCP kullanarak bağlan"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8197,56 +8653,52 @@
 msgid "Login failed, no reply"
 msgstr "Oturum açma işlemi başarısız oldu, yanıt yok"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
 msgstr "Bu kişiyi listenize eklemek istiyor musunuz?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s tarafından eklendiniz"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Onu eklemek ister misiniz?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s sizi ekledi [%s]"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s sizi [%s] kişi listesine ekledi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "%s kullanıcısı isteğinizi reddetti"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
-msgstr "%s kullanıcısı isteğinizi kabul etti."
+msgid "User %s approved your request"
+msgstr "%s kullanıcısı isteğinizi kabul etti"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s sizi [%s] olarak kişi listesine eklemek istiyor"
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s sizi [%s] kişi listesine eklemek istiyor"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "İleti: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s kişi listenizde değil"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "Onu eklemek ister misiniz?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Bağlantı kapandı (yazılıyor)"
@@ -8310,10 +8762,6 @@
 msgid "Starting Services"
 msgstr "Servisler Başlatılıyor"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Bağlandı"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
@@ -8321,7 +8769,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Eşzamanlı Yönetici  Duyurusu"
 
 #: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
@@ -8432,7 +8880,7 @@
 msgid "Send TEST Announcement"
 msgstr "TEST Anonsu Gönder"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Konu:"
 
@@ -8455,7 +8903,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -8535,11 +8983,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
-msgstr ""
+msgstr "Listeyi Birleştir ve Sunucuya Kaydet"
 
 #: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "Listeyi Sunucu İle Eşleştir"
 
 #: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
@@ -8567,7 +9015,7 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
-msgstr "Muhtemel Eşlemeler"
+msgstr "Olası Eşlemeler"
 
 #: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
@@ -8619,8 +9067,7 @@
 "buttons below."
 msgstr ""
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Arama Sonuçları"
 
@@ -9585,7 +10032,7 @@
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Gerçek İsim"
 
@@ -9881,7 +10328,7 @@
 msgstr "Ruh Haliniz"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10272,7 +10719,7 @@
 msgstr "Güvenli Internet Canlı Konferans (SILC) Protokolü"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Ağ"
 
@@ -10294,7 +10741,7 @@
 #: ../libpurple/protocols/silc/silc.c:1945
 #: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 #: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
@@ -10313,12 +10760,12 @@
 #: ../libpurple/protocols/silc/silc.c:1958
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "İletileri beyaz tahtaya gönder"
 
 #: ../libpurple/protocols/silc/silc.c:1961
 #: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
-msgstr ""
+msgstr "Otomatik olarak beyaz tahta aç"
 
 #: ../libpurple/protocols/silc/silc.c:1964
 #: ../libpurple/protocols/silc10/silc.c:1903
@@ -10530,26 +10977,26 @@
 msgstr "Yazılamadı"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Bağlanılamadı"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Dinleme soketi yaratılamadı"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Ana bilgisayar çözümlenemedi"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Makine adı çözümlenemedi"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 
@@ -10561,38 +11008,38 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol Eklentisi"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Durumu Yayımla (not: herkes sizi görebilir)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "UDP Kullan"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Proxy kullan"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
-msgstr ""
+msgstr "Kullanıcı Kimliğini Doğrula"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
-msgstr ""
+msgstr "Makine Kimliğini Doğrula"
 
 #: ../libpurple/protocols/toc/toc.c:139
 #, c-format
@@ -10684,7 +11131,7 @@
 
 #: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
-msgstr "--- İpucu Yok ---"
+msgstr "Anahtar sözcük yok."
 
 #: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
@@ -10752,8 +11199,8 @@
 msgid "Password Change Successful"
 msgstr "Şifreniz  Başarıyla Değiştirildi"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -10812,41 +11259,46 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protokol Eklentisi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! mesajınız yollanamadı."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s size bir titreşim gönderdi!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistem mesajı %s için:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "İzin reddetme iletisi:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Kişi ekleme reddedildi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10854,11 +11306,11 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! Kimlik Denetimi Başarısız"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10868,48 +11320,48 @@
 "listenizde. \"Evet\"e tıkladığınız takdirde bu kullanıcı listenizden "
 "silinecek ve yok sayılacaktır."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Kişiyi yoksay?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Arkadaşınız sunucu listesine eklenemedi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Sesli %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Bağlantı sorunu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -10918,7 +11370,7 @@
 "%s sunucusu ile bağlantı kesildi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -10927,108 +11379,123 @@
 "%s sunucusu ile bağlantı sağlanamadı:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Evde Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Büroda Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Ofiste Değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "Tatilde"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "_Dışarı Çıktı"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Sunucu listesinde değil"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Çevrimiçi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görün"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Bulunma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Çevrimdışı Görün"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Sürekli Çevrimdışı görünme"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Sohbete Katıl"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Konferans Başlat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Bulunma Ayarları"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Karalamaya Başla"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
-msgstr "Hangi ID aktifleştirilecek?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+msgid "Activate which ID?"
+msgstr "Hangi Kimlik etkinleştirilsin?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join whom in chat?"
 msgstr "Kullanıcıyla sohbet et..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "ID'yi aktifleştir..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Kullanıcıyla Sohbet Et..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
+msgid "Open Inbox"
+msgstr "Gelen Kutusunu Aç"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr "Şu anda bir titreşim gönderdiniz!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr "titreşim"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr "titreşim gönderildi"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr "Titreşim gönderiliyor"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Yahoo ağındaki kanalları listele"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Kullanıcının sizi farketmesi için titreşim yollar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -11042,90 +11509,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol Eklentisi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr "Çağrı cihazı sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr "Japon Çağrı cihazı sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr "Çağrı cihazı portu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Dosya aktarım sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Japon dosya aktarım sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Dosya aktarım portu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Sohbet Odası Yereli"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferans ve sohbet odası davetlerini yok say"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Sohbet Odası Listesi URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo Sohbet sunucusu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo Sohbet portu"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s kullanıcısı \"%s\" odasına yaptığınız konferans davetinizi kabul etmedi "
 "çünkü \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Davet Reddedildi"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Sohbete katılım başarısız oldu"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Bilinmeyen oda"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Sohbet odası dolu olabilir"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Erişilebilir değil"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11133,38 +11600,38 @@
 "Bilinmeyen hata. Sohbet odasına yeniden girebilmek için çevrimdışı duruma "
 "geçip beş dakika beklemeniz gerekebilir."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Şimdi %s odasında sohbet ediyorsunuz."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Kişiyle sohbete katılınamadı"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Belki de onlar sohbet etmiyordur?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Oda listesi alımı başarısız oldu."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Sesler"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Web Kameralar"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Oda listesi alınamıyor."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Kullanıcı Odaları"
 
@@ -11182,77 +11649,77 @@
 msgstr "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Yazma Hatası"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japon Profili"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profili"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobiler"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Son Haberler"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Anasayfa"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Bağlantı 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Bağlantı 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Bağlantı 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Son Güncelleme"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s adlı kullanıcının bilgisi mevcut değil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11260,7 +11727,7 @@
 "Kullanıcının profiline erişilemedi. Bu muhtemelen sunucudan kaynaklanan "
 "geçici bir problemdir. Lütfen daha sonra tekrar deneyin."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11270,7 +11737,7 @@
 "olmadığını işaret eder; fakat bazen Yahoo!'nun profillere ulaşamadığı olur."
 "Eğer kullanıcının doğru olduğuna eminseniz, lütfen daha sonra tekrar deneyin."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Kullanıcı profili boş."
 
@@ -11516,7 +11983,21 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s şimdi %s olarak biliniyor.\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "Dikkat! %s %s."
+
+#: ../libpurple/server.c:295 ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "Dikkat!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "Dikkat! %s tarafından eklendiniz."
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11525,12 +12006,12 @@
 "%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Sohbet davetini kabul ediyor musunuz?"
 
@@ -11538,7 +12019,7 @@
 msgid "Unset"
 msgstr "Ayarlanmamış"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Rahatsız etmeyin"
 
@@ -11590,12 +12071,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2691
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s Okuma Hatası"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11604,61 +12085,61 @@
 "%s okunurken bir hata oluştu.  Dosyalar yüklenmedi ve eski dosya %s~ olarak "
 "yeniden adlandırıldı."
 
-#: ../libpurple/util.c:3192
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Hesaplanıyor..."
 
-#: ../libpurple/util.c:3195
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d gün"
 
-#: ../libpurple/util.c:3241
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d saat"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d dakika"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: ../libpurple/util.c:3521
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "%s açılamadı. Birçok kez yeniden yönlendirildi"
 
-#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "%s konumuna bağlanılamadı"
 
-#: ../libpurple/util.c:3681
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11667,17 +12148,17 @@
 "%s içeriğini açmak için yeterli bellek konumlandırılamadı.  Web sunucu "
 "zararlı bir şeyler deniyor olabilir."
 
-#: ../libpurple/util.c:3716
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "%s konumundan okuma hatası: %s"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "%s konumundan yazma hatası: %s"
 
-#: ../libpurple/util.c:3772
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "%s konumuna bağlanılamadı: %s"
@@ -11703,37 +12184,37 @@
 msgstr "Sistem çekmecesi uyumu."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Giriş Seçenekleri"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tokol:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Kayıtlı _isim:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "_Yerel isim:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Par_olayı hatırla"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Kullanıcı Seçenekleri"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Yeni e-posta b_ildirimleri"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Bu hesap için b_u kişi simgesini kullan:"
 
@@ -11767,7 +12248,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Genel Ayarları Kullan"
 
@@ -11778,7 +12259,7 @@
 #. B)You are looking really closely at something that shouldn't matter.
 #: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
-msgstr ""
+msgstr "Eğer gerçekten yakın görüyorsanız"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 #: ../pidgin/gtkaccount.c:1009
@@ -11789,15 +12270,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Seçenekleri"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "Proxy _tipi:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Host"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port"
 
@@ -11805,10 +12286,18 @@
 msgid "_Username:"
 msgstr "_Kullanıcı adı:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "Par_ola:"
 
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Yeni hesap kaydedilemedi"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Belirlenen ölçütleri içeren bir hesap zaten var."
+
 #: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Hesap Ekle"
@@ -11817,19 +12306,23 @@
 msgid "_Basic"
 msgstr "_Temel Yapılandırma"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Bu yeni hesabı sunucu üzerinde oluştur"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Gelişmiş Yapılandırma"
 
-#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
-msgstr "Aktif"
+msgstr "Etkin"
 
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11853,16 +12346,11 @@
 "Bu pencereye daha sonra ulaşmak isterseniz Kişi Listesi Penceresindeki "
 "<b>Hesaplar->Ekle/Düzenle</b> yolunu takip etmelisiniz."
 
-#: ../pidgin/gtkaccount.c:2551
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor %s%s"
-
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Bir Sohbete Katıl"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11871,92 +12359,92 @@
 "şekilde girin.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Hesap:"
 
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Engelle"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Engellemeyi _Kaldır"
 
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Kişi Bilgilerini _Al"
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "Kişiye Anlık _İleti Göner"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Kişiye Dosya Gönder"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Kişi İçin Uyarıcı Ekle"
 
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "_Geçmiş Sohbetleri Göster"
 
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "Kişi İçin _Görünen İsim Ayarla"
 
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Bir Kişi _Ekle"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "_Bir Sohbet Ekle"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Grubu Sil"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Yeniden Adlandır"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Katıl"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Otomatik-Katıl"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Daralt"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Genişlet"
 
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Araçlar/Sesleri Kapat"
 
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -11964,126 +12452,138 @@
 "gerekir."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Kişiler"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kişiler/Yeni _İleti..."
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kişiler/Bir Sohbete Ka_tıl..."
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kişiler/Kullanıcı B_ilgisi Al..."
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Kişiler/Kişi Kayıtlarını Gö_ster..."
 
-#: ../pidgin/gtkblist.c:2844
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Kişiler/_Çevrimdışı Kişileri Göster"
-
-#: ../pidgin/gtkblist.c:2845
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Kişiler/_Boş Grupları Göster"
-
-#: ../pidgin/gtkblist.c:2846
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Kişiler/Kişi _Ayrıntılarını Göster"
-
-#: ../pidgin/gtkblist.c:2847
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Kişiler/Boşta Sürelerini _Göster"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/_Kişiler/Göster"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Kişiler/Göster/_Çevrimdışı Kişileri Göster"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Kişiler/Göster/_Boş Grupları Göster"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Kişiler/Göster/Kişi _Ayrıntılarını Göster"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Kişiler/Göster/Boşta Sürelerini _Göster"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Kişiler/Göster/_Boş Grupları Göster"
+
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kişiler/Kişileri _Sırala"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kişiler/_Kişi Ekle..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kişiler/Sohbet Ekle..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Kişiler/_Grup Ekle..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/_Kişiler/_Çık"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/_Hesaplar"
 
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Hesaplar/Ekle\\/Düzenle"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Araçlar"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Araçlar/Kişi _Uyarıcılar"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Araçlar/_Sertifikalar"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Araçlar/Eklentiler"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Araçlar/_Tercihler"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Araçlar/_Gizlilik"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Araçlar/_Dosya Aktarımları"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Araçlar/Oda Listesi"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Araçlar/Sistem Kayıtlarını Göster"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Araçlar/Sesleri _Kapat"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Yardım/Çevrim_içi Yardım"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Yardım/_Hata Yakalama Penceresi"
 
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Yardım/_Pidgin Hakkında"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12092,131 +12592,131 @@
 "\n"
 "<b>Hesap:</b> %s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Kişi Takma Adı"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Çevrimiçi"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Son Görülme Zamanı"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Korkunç"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Harika"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Sallanan"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Boşta %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Boşta %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Boşta %dm"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kişiler/Yeni Anlık İleti..."
 
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kişiler/Bir Sohbete Katıl..."
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Kişiler/Kullanıcı Bilgisi Al..."
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kişiler/Kişi Ekle..."
 
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Kişiler/Sohbet Ekle..."
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Kişiler/Grup Ekle..."
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Araçlar/Gizlilik"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Araçlar/Oda Listesi"
 
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d okunmamış ileti, gönderen %s\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "El ile ayarla"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alfabetik"
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Duruma göre"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Kayıt büyüklüğüne göre"
 
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bağlantıyı kesti"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Hesabı Yeniden Etkinleştir"
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bağlantı kesildi: %s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Kullanıcı adı:</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Parola:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Giriş yap"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Hesaplar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12238,23 +12738,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Kişiler/Çevrimdışı Kişileri Göster"
-
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Kişiler/Boş Grupları Göster"
-
-#: ../pidgin/gtkblist.c:4564
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Kişiler/Kişi Ayrıntılarını Göster"
-
-#: ../pidgin/gtkblist.c:4567
-msgid "/Buddies/Show Idle Times"
-msgstr "/Kişiler/Boşta Süresini Göster"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Kişiler/Göster/Çevrimdışı Kişileri Göster"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Kişiler/Göster/Boş Grupları Göster"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Kişiler/Göster/Kişi Ayrıntılarını Göster"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Kişiler/Göster/Boşta Süresini Göster"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Kişiler/Göster/Boş Grupları Göster"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12265,25 +12769,25 @@
 "girdiğiniz isim, kişinin kayıtlı ismi yerine listenizde görünecektir.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "Kay_ıtlı isim:"
 
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "G_örünen isim:"
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Bu protokol sohbet odalarını desteklemiyor."
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sohbet etmek için hiçbir sohbet protokolüne giriş yapmadınız."
 
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12291,39 +12795,39 @@
 "Lütfen bir görünen isim ve listeye eklemek istediğiniz sohbet hakkında uygun "
 "bir bilgi girin.\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Lütfen eklemek istediğiniz grubun ismini girin."
 
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Hesaplar/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Hesabı Düzenle"
 
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Kullanılabilir işlem yok"
 
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Hesabı Pasifleştir"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Hesabı Etkinleştir"
 
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Hesaplar/Hesabı Etkinleştir"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Araçlar"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kişiler/Kişileri Sırala"
 
@@ -12340,24 +12844,24 @@
 "%s siz hatayı düzeltip hesabınızı yeniden etkinleştirene kadar yeniden "
 "bağlanmayacak."
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Kişi bu sohbetle aynı protokol üzerinde değil."
 
-#: ../pidgin/gtkconv.c:777
+#: ../pidgin/gtkconv.c:754
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Bu kişiyi davet etmek için henüz geçerli bir hesaptan oturum açmadınız."
 
-#: ../pidgin/gtkconv.c:830
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kişiyi Sohbet Odasına Davet Et"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12365,196 +12869,188 @@
 "İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
 "ismini girin."
 
-#: ../pidgin/gtkconv.c:881
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Kişi:"
 
-#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_İleti:"
 
-#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Dosya açılamıyor."
 
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>%s ile yazışma</h1>\n"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Yazışmayı Kaydet"
 
-#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Bul"
 
-#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Şunu Ara:"
 
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Kayıt tutma başlatıldı. Bundan sonraki iletiler kaydedilecek."
-
-#: ../pidgin/gtkconv.c:1366
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Kayıt tutma durduruldu. Bundan sonraki iletiler kaydedilmeyecek."
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Yoksayma"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Yoksay"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Uzakta İletisi Al"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Son söylenen"
 
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Simge dosyası diske kaydedilemedi."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Simgeyi Kaydet"
 
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Oynat"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Simgeyi Gizle"
 
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Simgeyi Farklı Kaydet..."
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Özel Simge Ayarla..."
 
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Özel Simgeyi Kaldır"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Tümünü Göster"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Yazışma"
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Yazışma/Yeni _Anlık İleti..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Yazışma/_Bul..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Yazışma/_Kayıtları Göster"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Yazışma/_Farklı Kaydet..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Yazışma/Temi_zle"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Yazışma/Kişiye _Dosya Gönder..."
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Yazışma/Kişi _Uyarıcı Ekle..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Yazışma/_Bilgi Al..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Yazışma/Davet Et..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Yazışma/_Daha Fazla"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Yazışma/Görünen İs_im..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Yazışma/En_gelle..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Yazışma/Engellemeyi _Kaldır..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Yazışma/_Ekle..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Yazışma/_Kaldır..."
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Yazışma/Bağlantı Ekl_e..."
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Yazışma/Resim Ekl_e..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Yazışma/_Kapat"
 
 #. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Seçenekler"
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Seçenekler/_Kayıt Tutmayı Etkinleştir"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Seçenekler/Sesleri E_tkinleştir"
 
-#: ../pidgin/gtkconv.c:2839
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Seçenekler/Kişi Simgesini Göster"
-
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Seçenekler/Biçimlendirme Çubuklarını Gös_ter"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Seçenekler/Za_manı Etiketlerini Göster"
 
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Yazışma/Daha Fazla"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Seçenekler"
 
@@ -12563,175 +13059,171 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Yazışma"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Yazışma/Kayıtları Göster"
 
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Yazışma/Kişiye Dosya Gönder..."
 
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Yazışma/Kişi Uyarıcı Ekle..."
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Yazışma/Bilgi Al..."
 
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Yazışma/Davet Et..."
 
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Yazışma/Görünen İsim..."
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Yazışma/Engelle..."
 
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Yazışma/Engellemeyi Kaldır..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Yazışma/Ekle..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Yazışma/Kaldır..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Yazışma/Bağlantı Ekle..."
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Yazışma/Resim Ekle..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Seçenekler/Kayıt Tutmayı Etkinleştir"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Seçenekler/Sesleri Etkinleştir"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Seçenekler/Biçimlendirme Çubuklarını Göster"
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Seçenekler/Zamanı Etiketlerini Göster"
 
-#: ../pidgin/gtkconv.c:3181
-msgid "/Options/Show Buddy Icon"
-msgstr "/Seçenekler/Kişi Simgesini Göster"
-
-#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "Kullanıcı yazıyor..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "Kullanıcı bir şeyler yazdı ve durdu"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Şuna Gönder"
 
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Gönder"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "Odada kimse yok"
 
-#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "Odada %d kişi var"
 
-#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Yazıyor"
 
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "Yazmayı Bıraktı"
 
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Takma Ad Söylüyor"
 
-#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Okunmamış İletiler"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Yeni Olay"
 
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Konuşma ekranını temizler."
 
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Kapatmayı onayla"
 
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Okunmamış iletileriniz var. Pencereyi kapatmak istediğinize emin misiniz?"
 
-#: ../pidgin/gtkconv.c:7967
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Diğer sekmeleri kapat"
 
-#: ../pidgin/gtkconv.c:7973
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Tüm sekmeleri kapat"
 
-#: ../pidgin/gtkconv.c:7981
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Bu sekmeyi ayır"
 
-#: ../pidgin/gtkconv.c:7987
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Bu sekmeyi kapat"
 
-#: ../pidgin/gtkconv.c:8433
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Yazışmayı kapat"
 
-#: ../pidgin/gtkconv.c:8957
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Son açılan pencere"
 
-#: ../pidgin/gtkconv.c:8959
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Mesaj ve sohbet pencerelerini ayır"
 
-#: ../pidgin/gtkconv.c:8961 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Yeni pencere"
 
-#: ../pidgin/gtkconv.c:8963
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Gruba göre"
 
-#: ../pidgin/gtkconv.c:8965
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Hesaba göre"
 
@@ -12795,25 +13287,22 @@
 msgid "Fatal Error"
 msgstr "Ölümcül Hata"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "lider geliştirici"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "geliştirici"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "geliştirici & site yöneticisi"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "destek"
@@ -12822,372 +13311,387 @@
 msgid "support/QA"
 msgstr "destek / Soru Yanıt"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "geliştirici & site yöneticisi"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "Kıdemli Katılımcı/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "win32 portu"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "bakımcı"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim bakımcısı"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker ve belirtilmiş sürücü [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP geliştiricisi"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "asıl yazar"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaanca (Hollanda Lehçesi)"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arapça"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgarca"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
-msgstr ""
+msgstr "Bengal Dili"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Boşnakça"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Katalan dili"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valencian Katalan dili"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Çekçe"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "Danimarka dili"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "Almanca"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Yunanca"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Avusturalya İngilizcesi"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Kanada İngilizcesi"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "İngiliz İngilizcesi"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Esperanto Dili"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonyaca"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
-msgstr ""
+msgstr "Bask Dili"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Farsça"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Fince"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Fransızca"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarati (Hindistanda konuşulan bir dil)"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindu dili"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Endonezya Dili"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japonca"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Gürcü Dili"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada (Hindistanda konuşulan bir dil)"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kanada Çeviri ekibi"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Korece"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kürtçe"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Litvanca"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Makedonca"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norveççe"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepal Dili"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Hollandaca, Flamanca"
 
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "Norveç dili"
-
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norveç Dili"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Polonyaca"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portekizce-Brezilyaca"
 
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Romence"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Rusça"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovak dili"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Sloven dili"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Arnavutça"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "İsveççe"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Tayvan Dili"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnam Dili"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh ve Gnome-Vi Takımı"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Çince (Basit)"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Çincesi"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Çince (Geleneksel)"
 
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Habeşçe (EZ+)"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "%s Hakkında"
 
-#: ../pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
 "Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, ve QQ protokollerini destekleyen "
-"libpurple tabanlı, modüler bir mesajlaşma istemcisidir.  GTK+ kullanılarak "
+"libpurple tabanlı, modüler bir mesajlaşma istemcisidir. GTK+ kullanılarak "
 "yazılmıştır.<BR><BR>GPL (sürüm 2) lisansı altında uygulamayı değiştirebilir "
-"ve dağıtabilirsiniz. GPL Lisansının bir kopyası %s ile dağıtılan COPYING "
-"dosyasındadır. %s'in telif hakları katılımcılarına aittir. Bilgi edinmek "
+"ve dağıtabilirsiniz. GPL (sürüm 2 ya da sonrası) Lisansının bir kopyası %s "
+"ile dağıtılan COPYING dosyasındadır. %s'in telif hakları katılımcılarına aittir. Bilgi edinmek "
 "için COPYRIGHT dosyasına ya da katılımcıların tüm listesine bakabilirsiniz. "
 "Bu uygulama için garanti vermiyoruz.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net #pidgin<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Şimdiki Geliştiriciler"
 
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Çılgın Yama Yazarları"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Önceki Geliştiriciler"
 
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "Emekli Çılgın Yama Yazarları"
+
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Sanatçılar"
 
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Şimdiki Çevirmenler"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Önceki Çevirmenler"
 
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Hata Ayıklama Bilgileri"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Kullanıcı Bilgisini Al"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13195,11 +13699,11 @@
 "Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Kullanıcı Kaydını Al"
 
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13207,32 +13711,32 @@
 "Lütfen kayıtlarını görmek istediğiniz kişinin görüntü veya etiket ismini "
 "giriniz."
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Görünen İsim"
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Bu kişi için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Görünen İsim..."
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Görünen Sohbet"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Bu sohbet için görünen ismi girin."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13244,30 +13748,30 @@
 "%s ve %d içeren kişiyi kişi listenizden silmek üzeresiniz. Devam etmek "
 "istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Kişiyi Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Kişiyi Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "%s grubunu %s grubu ile birleştimek üzeresiniz. Devam etmek istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Grupları Birleştir"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Grupları Birleştir"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13276,30 +13780,30 @@
 "%s grubu ve içerdiği üyeleri arkadaş listenizden silmek üzeresiniz.  Devam "
 "etmek istiyor musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "_Grubu Sil"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Grubu Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "%s ögesini kullanıcı listenizden silmek üzeresiniz.  Devam etmek istiyor "
 "musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Kişiyi Sil"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "Kişiyi _Kaldır"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13308,11 +13812,11 @@
 "Kişi listenizdeki %s sohbetini kaldırmak üzeresiniz.  Devam etmek istiyor "
 "musunuz?"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Sohbeti Sil"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Sohbeti Kaldır"
 
@@ -13421,7 +13925,7 @@
 msgstr "Dosya transferi _ayrıntıları"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Durakla"
 
@@ -13430,43 +13934,43 @@
 msgid "_Resume"
 msgstr "Devam _Et"
 
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "_Düz Metin olarak Yapıştır"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Biçimlemeyi temizle"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Bağlantı rengi"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Bağlantıları renklendir."
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Bağlantı önrengi"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Bağlantıları fare üzerine geldiğinde renklendir."
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "E-Posta Adresini _Kopyala"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Bağlantıyı Tarayıcıda Aç"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "Bağlantıyı _Konumunu Kopyala"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13476,7 +13980,7 @@
 "\n"
 "PNG ye düzenleniyor."
 
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13486,7 +13990,7 @@
 "\n"
 "PNG varsayılan yapılıyor."
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13497,7 +14001,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13508,35 +14012,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Resmi Kaydet"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "Resmi _Kaydet..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Yazıtipi Seç"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Metin Rengini Seç"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Arkaplan Rengini Seç"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Açıklama"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13544,92 +14048,155 @@
 "Lütfen eklemek istediğiniz bağlantıyı ve açıklamasını girin. Açıklama "
 "zorunlu değildir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Lütfen eklemek istediğiniz bağlantıyı girin."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Bağlantı Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Resim kaydedilemedi: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Resim Ekle"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Bu tema gülenyüz içermiyor."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Gülenyüz!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "K_alın"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "İtal_ik"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "Altı ç_izili"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "Daha büy_ük"
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "Y_azı tipleri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Ögeleri Grupla"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Ögeleri Gruplama"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Kalın"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "İtalik"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Altı çizili"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Üzeri çizili"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Yazıtipi Boyutunu Büyüt"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Yazıtipi Boyutunu Küçült"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Yazı Tipi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Arkaplan Rengi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Yazı Rengi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Biçimlemeyi Temizle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Hızlı Mesajlaşma Resmi Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Gülenyüz Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>_Kalın</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>İtal_ik</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>Altı ç_izili</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Üzeri çizili</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Daha Büyük</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "Daha k_üçük"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>Daha _Küçük</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Yazı _tipi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
 msgstr "Yazı _rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
 msgstr "_Arkaplan rengi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
-msgstr "Y_azı tipleri"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "_Yazı tipini sıfırla"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
-msgstr "_Gülenyüz!"
+msgstr "_Gülenyüz"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Resim"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Bağlantı"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Yatay çizgi"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -13716,12 +14283,12 @@
 msgid "System Log"
 msgstr "Sistem Kayıtları"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Daha fazla bilgi için`%s -h' deneyin.\n"
 
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13744,11 +14311,13 @@
 "  -h, --help          okuduğunuz bu yardım iletisini gösterir ve çıkar\n"
 "  -m, --multiple      bir kerede garanti etmez\n"
 "  -n, --nologin       otomatik olarak bağlanmanızı engeller\n"
-"  -l, --login[=İSİM]  otomatik olarak giriş yapmayı sağlar (seçimlik argüman İSİM\n"
-"                      hesapları belirtir, çoklu hesap belirtmek için virgül kullanın)\n"
+"  -l, --login[=İSİM]  otomatik olarak giriş yapmayı sağlar (seçimlik argüman "
+"İSİM\n"
+"                      hesapları belirtir, çoklu hesap belirtmek için virgül "
+"kullanın)\n"
 "  -v, --version       geçerli sürümü gösterir ve çıkar\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13772,46 +14341,46 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Tüm E-postaları Aç"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s, %d yeni ileti."
 
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>%d yeni e-postanız var.</b>"
 
-#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Tarayıcı komutu \"%s\" geçersiz."
 
-#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Adres açılamadı"
 
-#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Başlatma hatası: \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Tarayıcı yapılandırmasında 'El ile ayarla' seçili, ancak bu seçenek için "
@@ -13864,100 +14433,100 @@
 msgstr "Bir dosya seçin"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Uyarılacak Kişi"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Kişi adı:"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "Giriş yapın_ca"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "Çıkış yapı_nca"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "Uzakta _durumuna geçince"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "Geri dönünc_e"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "Boşta d_urumuna geçince"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "Bo_şta değil durumuna geçince"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Yazmaya baş_layınca"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "Yazma_ya ara verince"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "Yazmayı _bırakınca"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Bir ileti _gönderince"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "Bir _Anlık İleti penceresi aç"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "_Bir uyarıcı aç"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Bir ileti gön_der"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "Bir _komut çalıştır"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "Bir _ses çal"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Gözat..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Gö_zat..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Önizle"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "S_adece Erişilebilir Olmadığım Zaman uyar"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Tekrarlayan"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Uyarıcı Hedefi"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -13989,13 +14558,6 @@
 msgid "_Show system tray icon:"
 msgstr "_Sistem çekmecesi simgesini göster:"
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Her zaman"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Okunmayan iletiler olunca"
@@ -14008,7 +14570,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Uzaktayken"
 
@@ -14062,8 +14624,8 @@
 msgstr "Gelen iletilerde _biçimlendirmeyi göster"
 
 #: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "Kişi simgelerin_i göster"
+msgid "Show _detailed information"
+msgstr "Ayrıntılı _bilgi göster"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14105,131 +14667,131 @@
 msgid "Conversation _font:"
 msgstr "Yazışma yaz_ı tipi:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Öntanımlı Biçem"
 
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"Bu, biçimlendirmeyi destekleyen protokollerde gönderdiğiniz iletinin "
-"nasıl görüneceğini gösterir."
+"Bu, biçimlendirmeyi destekleyen protokollerde gönderdiğiniz iletinin nasıl "
+"görüneceğini gösterir."
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN sunucusu:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Örnek: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_IP Adresini Otomatik Bul"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Görünen _IP:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portlar"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Dinlenecek portları el ile belirtin"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "Başlangıç _portu:"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Bitiş p_ortu:"
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Proxy Sunucusu"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Proxy yok"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Kullanıcı:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "Gnome Varsayılanı"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "El ile ayarla"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Tarayıcı Seçimi"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Tarayıcı:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Bağlantıyı aç:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Tarayıcı varsayılanı"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Varolan pencere"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Yeni sekme"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14238,80 +14800,63 @@
 "_El ile ayarla:\n"
 "(Bağlantı için %s)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Kayıt _biçemi:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Tüm anlık _mesajları kaydet"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "Tüm sohbetleri tut"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Tüm durum değişikliklerini sistem günlüğüne kaydet"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Ses Seçimi"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "En Düşük"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "Daha Düşük"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Düşük"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Yüksek"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Daha Yüksek"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "En Yüksek"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Ses Davranışları"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Davranış:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Konsol bip sesi"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Otomatik"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Komut"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Ses Kullanma"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14320,117 +14865,81 @@
 "Ses komutu:\n"
 "(dosya ismi için %s)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Ses Seçenekleri"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Yazışmaya sırasında sesler açık"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Sesleri etkinleştir:"
 
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Sadece erişilebilir olduğumda"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Sadece erişilebilir olmadığımda"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Ses Düzeyi:"
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Ses Olayları"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Oynat"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Olay"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Test Et"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Sıfırla"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Seç..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "Boşta süresini _raporla:"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Klavye ya da fare kullanımına göre"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Otomatik-cevapla:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Aynı anda meşgul ve boş olduğu zaman"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Otomatik-uzakta"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Boşken durumu değ_iştir"
 
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
-msgstr "Durumunuzu değiştir_menizden geçen dakika "
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
+msgstr "_Boşta durumuna geçmeden önceki süre"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "Durumu _değiştir:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "Başlangıç Durumu"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Son çıkıştaki _durumu kullan"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "Başlangıçta uy_gulanacak durum:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Arayüz"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Gülenyüz Temaları"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Sesler"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Tarayıcı"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "Durum / Boşta"
 
@@ -14519,23 +15028,23 @@
 msgid "Apply"
 msgstr "Uygula"
 
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Bu dosya zaten var"
 
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Üzerine yazmak ister misiniz?"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Üzerine Yaz"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Yeni İsim Seç"
 
-#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Dizin Seç..."
 
@@ -14575,7 +15084,7 @@
 msgid "_Title:"
 msgstr "Baş_lık:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "D_urum:"
 
@@ -14589,94 +15098,46 @@
 msgid "Sa_ve & Use"
 msgstr "Kayde_t & Kullan"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "%s için durum"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Arkadaşınız giriş yaptığında"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Arkadaşınız çıkış yaptığında"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Mesaj alındığında"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Alınan mesaj yazışmayı başlatır"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Mesaj gönderildiğinde"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Kişi sohbete katıldıldığında"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Kişi sohbetten ayrıldığında"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Siz sohbette konuştuğunuzda"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Diğerleri sohbet ederken"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Birisi sohbette takma adınızı söylediğinde"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer Başarısız"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer başlatılırken hata oluştu."
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Ağ bağlantısı için bekleniyor"
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "%s yüklenirken şu hata oluştu: %s"
 
-#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Resim kaydetmede hata"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "%s klasörü yollanamadı."
 
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s bir klasörü aktaramaz. Dosyaları tek tek göndermelisiniz."
 
-#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Bir resim sürüklediniz."
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14684,23 +15145,23 @@
 "Bu resmi dosya transferi, bir mesaj içinde gönderebilir veya arkadaşınınzın "
 "görüntü resmi olarak kullanabilirsiniz."
 
-#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Kişi görüntüsü olarak ata"
 
-#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Resim dosyası gönder"
 
-#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "İleti içine ekle"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Bunu kişi ikonu olarak ayarlamak istiyor musunuz?"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14708,7 +15169,7 @@
 "Bu resmi bir dosya transferi olarak gönderebilirsiniz ya da arkadaşınızın "
 "görüntü resmi olarak kullanabilirsiniz."
 
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14721,11 +15182,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Çalıştırıcı gönderilemiyor"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14733,7 +15194,7 @@
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14744,25 +15205,25 @@
 "<b>Dosya boyutu:</b> %s\n"
 "<b>Resim boyutu:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "%s dosyası %s için çok büyük, Lütfen daha küçük bir resim deneyin.\n"
 
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Simge Hatası"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Simge ayarlanamadı"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Dosya açılamadı '%s': %s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "Resim dosyası yüklenemedi '%s': sebep bilinmiyor, muhtemelen dosya bozuk"
@@ -14775,75 +15236,75 @@
 msgid "Select color"
 msgstr "Renk seç"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Görünen İsim"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Sekmeleri _kapat"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Bilgi Al"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Davet Et"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Düzenle"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Mesaj Aç"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin gülenyüzleri"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Penguen Simgeleri"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "Bunu seçmek görsel duygu simgelerini pasifleştirir."
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "hiçbiri"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "İstatistikleri Göster"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "İstatistik Yapılandırması"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr ""
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "dakika"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Eşik:"
 
@@ -14853,18 +15314,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Kişi Uygunluk Göstericisi"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Kişilerin Uygunluğunu Gösteren eklenti."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14968,18 +15429,6 @@
 msgid "Select Color for %s"
 msgstr "%s için Renk Ayarla"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Kalın"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "İtalik"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Altı çizili"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Gelen biçemi yoksay"
@@ -15138,34 +15587,34 @@
 msgid "_Associate Buddy"
 msgstr "Kişi Seçin"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "E-Posta gönderilemedi."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "Evolution çalıştırılabilir dosyası PATH içerisinde bulunamadı."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Bu kişi için bir e-posta adresi bulunamadı."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Adres Defterine Ekle"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "E-Posta Yolla"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Entegrasyonu Yapılandırması"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Kişilerin otomatik eklenmesi gereken tüm hesapları seçin."
 
@@ -15175,7 +15624,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution Entegrasyonu"
 
@@ -15183,8 +15632,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Evolution ile entegresyonu sağlar."
 
@@ -15217,6 +15666,15 @@
 msgid "E-mail:"
 msgstr "E-mail:"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Kişi Notu</b>: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15284,11 +15742,11 @@
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Mesaj penceresi"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Sohbet Penceresi"
 
@@ -15304,32 +15762,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Müzik mesajlaşma oturumu doğrulandı."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Müzik İletisi"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Komut çalıştırılırken bir çakışma oldu:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Düzenleyici Çalıştırma Hatası"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Şu hata oluştu:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Müzik Mesajlaşması Yapılandırması"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr ""
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Uygula"
 
@@ -15341,86 +15799,86 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Birlikte beste yapmak için Müzik Mesajlaşma Eklentisi"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Uyar"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Sadece birisi sizin takma adınızı söylediğinde"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Aktif pencere"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Uyarı Metodları"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Pencere başlığı _ön ifadesi:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Pencere başlığına yeni mesaj sayısını ekle"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr ""
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr ""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Yazışma Penceresini yükselt"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Uyarıyı Kaldırma"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Yazışma penceresi aktif olunca kaldır"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Yazışma penceresine tıklandığında kaldır"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Yazışma penceresinde yazdığında kaldır"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Bir _ileti gönderildiğinde kaldır"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "&Yazışma sekmesi seçildiğinde kaldır"
 
@@ -15430,7 +15888,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "İleti Uyarısı"
 
@@ -15438,7 +15896,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Okunmamış iletiler olduğunda yapılacak uyarılar için çeşitli alternatifler "
@@ -15565,7 +16023,7 @@
 
 #: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
-msgstr ""
+msgstr "Gtkrc Dosyası Araçları"
 
 #: ../pidgin/plugins/pidginrc.c:502
 #, c-format
@@ -15590,13 +16048,15 @@
 
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
+msgstr "Metin tabanlı protokollerde ham girdi gönderebilmenizi sağlar."
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
+"Metin tabanlı protokollerde (XMPP, MSN, IRC, TOC) ham girdi gönderebilmenizi sağlar. Girdi "
+"kutusunda göndermek için Enter tuşuna basın. Hata ayıklama penceresini izleyin."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -15695,7 +16155,7 @@
 
 #: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
-msgstr ""
+msgstr "Gönderimden sonra son sözcüğün silinmesi özelliğini etkinleştir"
 
 #: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
@@ -15802,45 +16262,47 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
+"Bu eklenti kullanıcının sohbet penceresinde ve kayıtlarda zaman etiketlerini "
+"özelleştirebilmesini sağlar."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Matlık:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Yazışma Penceresi"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_Mesaj penceresi geçirgenliği"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Kaydırma çubuklarını mesaj penceresinde göster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Üzerine gelindiğinde anlık ileti penceresi şeffaflığını yoket"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Her zaman üstte"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Liste Penceresi"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Liste penceresi geçirgenliği"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Liste penceresine odaklanıldığında pencere saydamlığını kaldır"
 
@@ -15850,19 +16312,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Saydamlık"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Liste ve mesaj penceresi için geçirgenlik değişkeni."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15874,47 +16336,47 @@
 "\n"
 "* Not: Eklenti Win2000 veya daha yeni bir sürüm gerektirir."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Sürümü"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Başlangıç"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Windows başlarken %s uygulamasını başlat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Üzerine bırakılabilir Kişi Listesi"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Kişi Listesi penceresi her zaman _üstte tut"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr ""
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "Yeni sohbet iletisi geldiğinde pencereyi _canlandır"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin Seçenekleri"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows için Pidgin'e Özel Seçenekler."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 
diff -ru pidgin-2.1.1/po/uk.po pidgin-2.2.0/po/uk.po
--- pidgin-2.1.1/po/uk.po	2007-08-20 14:13:06.000000000 -0400
+++ pidgin-2.2.0/po/uk.po	2007-09-14 00:45:44.000000000 -0400
@@ -10786,7 +10786,7 @@
 msgstr "Активувати який ID?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "До кого приєднатись у розмові?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/vi.po pidgin-2.2.0/po/vi.po
--- pidgin-2.1.1/po/vi.po	2007-08-20 14:13:06.000000000 -0400
+++ pidgin-2.2.0/po/vi.po	2007-09-14 00:45:44.000000000 -0400
@@ -10824,7 +10824,7 @@
 msgstr "Kích hoạt ID nào ?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Tham gia với ai trong Chat?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/xh.po pidgin-2.2.0/po/xh.po
--- pidgin-2.1.1/po/xh.po	2007-08-20 14:13:07.000000000 -0400
+++ pidgin-2.2.0/po/xh.po	2007-09-14 00:45:44.000000000 -0400
@@ -10832,7 +10832,7 @@
 msgstr "Sesiphi Isazisi esisebenzayo?"
 
 #: src/protocols/yahoo/yahoo.c:2972
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Ngenela incoko?"
 
 #: src/protocols/yahoo/yahoo.c:2982
diff -ru pidgin-2.1.1/po/zh_CN.po pidgin-2.2.0/po/zh_CN.po
--- pidgin-2.1.1/po/zh_CN.po	2007-08-20 14:13:07.000000000 -0400
+++ pidgin-2.2.0/po/zh_CN.po	2007-09-14 00:45:44.000000000 -0400
@@ -10329,7 +10329,7 @@
 msgstr "激活哪个 ID？"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3234
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "将谁加入聊天？"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3244
diff -ru pidgin-2.1.1/po/zh_HK.po pidgin-2.2.0/po/zh_HK.po
--- pidgin-2.1.1/po/zh_HK.po	2007-08-20 14:13:07.000000000 -0400
+++ pidgin-2.2.0/po/zh_HK.po	2007-09-14 00:45:44.000000000 -0400
@@ -10839,7 +10839,7 @@
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 #: ../libpurple/protocols/yahoo/yahoo.c:3239
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "加入哪個好友目前所在的聊天室？"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3251
diff -ru pidgin-2.1.1/po/zh_TW.po pidgin-2.2.0/po/zh_TW.po
--- pidgin-2.1.1/po/zh_TW.po	2007-08-20 14:13:08.000000000 -0400
+++ pidgin-2.2.0/po/zh_TW.po	2007-09-14 00:45:44.000000000 -0400
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.479 2007/07/15 15:13:59 acli Exp $
+# $InternalId: zh_TW.po,v 1.489 2007/09/14 04:05:55 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -46,13 +46,14 @@
 # NOTE 所有語文名稱（除「世界語」外）一概譯成「XX文」，不譯「XX語」，因為寫下的是文，不是語
 # ----------------------------------------------------------
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.1.0\n"
-"POT-Creation-Date: 2007-07-15 03:23-0400\n"
-"PO-Revision-Date: 2007-07-13 04:19-0400\n"
-"Last-Translator: Ambrose Li <acli@ada.dhs.org>, Paladin R. Liu <paladin@ms1."
-"hinet.net>\n"
+"Project-Id-Version: Pidgin 2.2.0\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
+"PO-Revision-Date: 2007-09-13 14:52+0800\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
+"<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,17 +64,17 @@
 #  NOTE Untranslated
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -95,7 +96,7 @@
 "  -v, --version       顯示版本訊息並離開\n"
 
 #  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -105,15 +106,18 @@
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
@@ -127,86 +131,90 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "未有安裝任何協定模組。"
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "（大概是忘記了執行「make install」了。）"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "修改帳號"
 
 # XXX check
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "帳號："
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "密碼："
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "別名："
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
@@ -229,110 +237,113 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s？"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2104 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
 #: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
-#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
 #: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
 #: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "拒絕"
@@ -357,36 +368,36 @@
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -395,7 +406,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
@@ -405,15 +416,16 @@
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -421,161 +433,166 @@
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "自動加入"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實：是「加入」抑或「新增」?
-#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "自動加入"
-
 # XXX 還是「修改選項」？
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -585,29 +602,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "使用行動裝置中"
 
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -616,12 +633,12 @@
 "上線：%d 人\n"
 "總數：%d 人"
 
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號：%s (%s)"
 
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -631,51 +648,55 @@
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -692,43 +713,161 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "顯示空的好的群組"
 
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "匯入憑證"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "請指定主機名稱"
+
+# XXX 譯文有待改進 - acli 20070913
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "請輸入這張憑證所屬的主機名稱。"
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"無法匯入檔案「%s」。\n"
+"請檢查檔案是否可讀及是否為 PEM 格式。\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "憑證匯入錯誤"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509 憑證匯入失敗"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "選擇PEM憑證"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"無法匯出至檔案「%s」。\n"
+"請確定您有權限寫入目標檔\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "憑證匯出錯誤"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509 憑證匯出失敗"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "匯出 X.509 憑證"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s 的憑證"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"全名：%s\n"
+"\n"
+"SHA1 指紋：\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL 主機憑證"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "確定要刪除 %s 的憑證？"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "確定刪除憑證"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "憑證管理"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "主機名稱"
+
+# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
+# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
+# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "資訊"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "關閉"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -751,42 +890,46 @@
 "\n"
 "在您更正這個錯誤並重新啟動這個帳號前，Finch 將不會再試著重新連線。"
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗，原因不明。"
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "因為您並未登入，所以訊息無法送出："
+
 # XXX 這是什麼？
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -795,48 +938,65 @@
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "您離開了聊天室。"
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "開始記錄日誌"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "啟動音效"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -844,60 +1004,60 @@
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users：顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -923,101 +1083,97 @@
 msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "進度"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "檔名"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "大小"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "狀態"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "所有的檔案傳輸完畢時，關閉這個視窗"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "清除已完成的傳輸"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "中止"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "關閉"
-
 #  XXX 暫譯
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "已取消"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "失敗"
 
 #  XXX pending Paladin's confirmation - acli 20070713
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "成功存檔至 %s。"
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -1030,11 +1186,11 @@
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "主題"
 
@@ -1045,32 +1201,25 @@
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "繼續"
 
-# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
-# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "資訊"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "即時訊息"
 
@@ -1138,7 +1287,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1146,7 +1295,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
@@ -1160,7 +1308,7 @@
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "帳號："
 
@@ -1169,7 +1317,7 @@
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
@@ -1214,7 +1362,7 @@
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "執行動作"
 
@@ -1242,72 +1390,84 @@
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "無法新增好友狀態捕捉"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "未有設定任何帳號"
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "新增好友狀態捕捉前，必須先新增一個帳號。"
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
@@ -1315,13 +1475,13 @@
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
 
@@ -1370,12 +1530,12 @@
 msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "日誌"
 
@@ -1383,16 +1543,167 @@
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "開啟檔案..."
 
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "好友登入"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "好友登出"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "收到訊息"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "訊息收到，開始進行交談"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "訊息送出"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "有人進入聊天室"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "有人離開聊天室"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "您在聊天室說話"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "其他人進入聊天室"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "有人在聊天室中提到您的名字"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer 錯誤"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 初始化失敗。"
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(預設)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "選擇音效檔..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "音效設定"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "個人資料"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "自動"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "嗶一聲"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "指令"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "無音效"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "音效播放方式"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "播放方式："
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"音效指令：\n"
+"(請以 %s 代表檔名)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "音效選項"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "當交談取得輸入焦點發出音效"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "務必"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "上線而非離開期間"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "離開期間"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "音量(0-100)："
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "事件音效"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "事件"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "檔案"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "測試"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "重置"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "選擇..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1408,9 +1719,9 @@
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1421,30 +1732,39 @@
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1452,15 +1772,15 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "使用"
 
@@ -1472,53 +1792,79 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態："
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "訊息："
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "憑證"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "音效"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "狀態"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "載入模組途中遭遇錯誤。"
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "找不到 X Display 的設定"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "無法開啟檔案"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "無法載入模組，因為建置模組時沒有給它加入 X11 支援。"
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "剪貼簿模組"
 
 #  FIXME: 這很不通順
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1641,71 +1987,72 @@
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1716,19 +2063,20 @@
 # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "好友"
 
@@ -1736,22 +2084,184 @@
 msgid "buddy list"
 msgstr "好友清單"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "（並不相符）"
+
+#  XXX 這是暫譯 - acli 20070913
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s 出示了以下隨用即棄的憑證："
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"全名：%s %s\n"
+"指紋 (SHA1)：%s"
+
+#  XXX 這是暫譯 - acli 20070913
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "核實即棄憑證"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "憑證機構"
+
+#  TODO Untranslated - acli 20070913
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL Peer 快取"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "接受 %s 的憑證嗎？"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "核實 SSL 憑證"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "接受"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "檢視憑證(_V)"
+
+# FIXME 譯文不太通順 - acli 20070913
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。"
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "「%s」出示的憑證鍊是無效的。"
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "SSL 憑證錯誤"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "無效的憑證鏈"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"「%s」出示的憑證鍊聲稱它是由某憑證機構簽發，但實際上卻沒有該憑證機構的有效簽"
+"章。"
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "憑證機構的簽章是無效的"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"全名：%s\n"
+"\n"
+"指紋 (SHA1)：%s\n"
+"\n"
+"生效日期：%s\n"
+"失效日期：%s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "憑證資訊"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "未註冊錯誤"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 登入"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1770,45 +2280,45 @@
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -2184,15 +2694,15 @@
 msgid "Old flat format"
 msgstr "舊式平面檔案"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "無法記錄這個交談。"
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2201,7 +2711,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2211,16 +2721,16 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案！</b></font>"
 
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
@@ -2310,13 +2820,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2374,8 +2884,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "備註"
 
@@ -2395,18 +2905,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "好友備註"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
 
@@ -2609,44 +3119,44 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "自動回應送出："
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前是離線狀態。在您重新登入前，將無法收到任何訊息。"
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限，所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -2654,68 +3164,68 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學）
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -2725,20 +3235,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2802,7 +3312,7 @@
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
 "的對話視窗中編輯或刪除。"
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2811,17 +3321,17 @@
 "「%s」目前為離線，您要使用「好友狀態捕捉」功能儲存未能送出的訊息嗎？（儲存的"
 "訊息將在「%s」下次登入時自動送出）"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2831,9 +3341,9 @@
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2843,11 +3353,11 @@
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "使用「好友狀態捕捉」儲存離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
@@ -2911,7 +3421,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -2919,8 +3429,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -2942,23 +3452,30 @@
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
 #. *< type
 #. *< ui_requirement
@@ -2966,18 +3483,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "透過 GNUTLS 提供 SSL 的支援。"
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
 #. *< type
 #. *< ui_requirement
@@ -2985,18 +3502,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3086,25 +3602,43 @@
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "離開"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
+msgid "First name"
+msgstr "名"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
+msgid "Last name"
+msgstr "姓"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM 帳號"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 #. *< type
 #. *< ui_requirement
@@ -3116,42 +3650,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "連絡人"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "主機名稱"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "名"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "姓"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3159,43 +3671,35 @@
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM 帳號"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP 帳號"
-
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
@@ -3272,269 +3776,293 @@
 msgid "Registration completed successfully!"
 msgstr "註冊成功！"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功！"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入您的舊密碼及你的新密碼："
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友；%s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "離開"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對，要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3549,16 +4077,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
@@ -3615,7 +4143,8 @@
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3629,7 +4158,7 @@
 msgstr "頻道(_C)："
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "密碼(_P)："
 
@@ -3637,71 +4166,64 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-# FIXME ambiguous - 20061025
-# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "無法連線至認證所需的遠端資源"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL 交談失敗"
-
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "主題"
 
@@ -3713,34 +4235,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
@@ -3748,12 +4270,13 @@
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3769,7 +4292,7 @@
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3779,7 +4302,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -3813,7 +4336,7 @@
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4093,7 +4616,7 @@
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
@@ -4222,6 +4745,22 @@
 msgid "Disconnected."
 msgstr "停止連線。"
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr ""
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
@@ -4230,248 +4769,520 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "名"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "街道地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "市／村"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "電子郵件"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "職責"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "編輯 XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "作業系統"
 
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "服務探尋資訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "地址(續)"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "這個使用者沒有他的相關資訊。"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "帶內位元組串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "指令"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub 服務"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 位元組串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "帶外數據"
+
+#  NOTE Untranslated
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "註冊錯誤"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "使用者所在位置"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "使用者化身"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "好友狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "軟體版本"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "開始串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "使用者情緒"
+
+# XXX may be wrong
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "使用者數目上限"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "相容性"
+
+#  FIXME 這聽來不對 - acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "加密工作階段協商"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "使用者"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "要交換密鑰之即時訊息"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "使用者資料"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle 音訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "使用者暱稱"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle 視訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "收到的訊息"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "發佈公鑰"
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "使用者瀏覽"
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr ""
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Trillian 加密"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#  XXX 暫譯- acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "延遲送出"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "簡化加密工作階段協商"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "相容性"
+
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4480,43 +5291,51 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "登入"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "登出"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4524,44 +5343,44 @@
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
 #: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4569,25 +5388,25 @@
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
@@ -4686,25 +5505,29 @@
 msgstr "尋找聊天室"
 
 # XXX 譯文有待改進
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "您指定必須加密，但這伺服器沒有加密功能。"
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:483
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4713,55 +5536,70 @@
 "無法與伺服器建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "成功註冊 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "未知錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "成功移除 %s 的註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "移除註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "移除註冊失敗"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4771,43 +5609,80 @@
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "移除註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "請填寫以下資料以更新您的註冊資料。"
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
-msgid "Initializing Stream"
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "變更 %s 上的註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "註冊在 %s 的新帳號"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "變更註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "移除帳號註冊錯誤"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "移除帳號註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
+msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS 初始中"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4816,91 +5691,198 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "已認證對方"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "心情"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "描述情緒"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "樂手名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "樂曲名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "專輯名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "樂曲種類"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Comment"
+msgstr "好友說明"
+
+# NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
+# FIXME 
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "樂曲 ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "樂曲長度"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "作曲年份"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "樂曲網址"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "允許"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4908,52 +5890,52 @@
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "項目未找到"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件（例如訊息中含有禁字），以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4961,78 +5943,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」（認證）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5042,11 +6024,11 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
@@ -5054,170 +6036,191 @@
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯，譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "無法 Ping 使用者 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5226,7 +6229,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5234,23 +6237,32 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 給好友一個「嗶」引他（她）注意"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5261,125 +6273,139 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "域名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "需要 SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "連線埠"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s 已經離開這個交談。"
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為：%s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題：%s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s：%s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s，因為對方不支援檔案傳輸"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "無法送出訊息給 %s，因為這個 JID 是無效的"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "無法傳送檔案至 %s，因為對方目前沒有連線"
@@ -5387,21 +6413,67 @@
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
 #  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "無法傳送檔案至 %s，因為未獲對方認證"
 
 #  FIXME 這不通順 - acli 20070614
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "編輯使用者情緒"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "設定"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "設定情緒..."
+
+#  XXX may be wrong
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "設定使用者暱稱"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "請為您自己設定新的暱稱。"
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "設定暱稱..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "動作"
+
+#  XXX 要覆查
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "選擇一個動作"
+
 # XXX 暫譯
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -5625,7 +6697,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5665,42 +6737,52 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "您剛送出了一個呼叫！"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s 呼叫您！"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5708,321 +6790,323 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6031,15 +7115,15 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "個人資料網址"
 
@@ -6053,19 +7137,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -6084,8 +7168,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -6206,8 +7290,8 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
@@ -6230,10 +7314,11 @@
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單，請過一會後重試。"
 
+# See cnscode.org.tw
 #: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
-msgstr "交談中"
+msgstr "交握中"
 
 #: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
@@ -6255,74 +7340,474 @@
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: ../libpurple/protocols/msn/state.c:35
-msgid "On The Phone"
-msgstr "電話中"
+#: ../libpurple/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "電話中"
+
+#: ../libpurple/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "外出用餐"
+
+#: ../libpurple/protocols/msn/switchboard.c:400
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "送出訊息逾時，可能沒有送出訊息："
+
+#: ../libpurple/protocols/msn/switchboard.c:408
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "隱身時無法送出訊息："
+
+#: ../libpurple/protocols/msn/switchboard.c:412
+msgid "Message could not be sent because the user is offline:"
+msgstr "因為使用者目前離線，所以無法送出訊息："
+
+#: ../libpurple/protocols/msn/switchboard.c:416
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "因為連線發生錯誤，所以訊息無法送出："
+
+#: ../libpurple/protocols/msn/switchboard.c:420
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "因為我們傳送訊息的速度太快，所以訊息無法送出："
+
+#: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"因為無法與伺服器建立工作階段，所以訊息無法送出（這大概是伺服器出現了問題，請"
+"幾分鐘後重試）："
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
+
+#: ../libpurple/protocols/msn/switchboard.c:439
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "因為發生不明的錯誤，訊息可能沒有送出："
+
+#: ../libpurple/protocols/msn/userlist.c:252
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 將您加入他（她）的好友清單。"
+
+#: ../libpurple/protocols/msn/userlist.c:321
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 將您從他（她）的好友清單中移除。"
+
+#: ../libpurple/protocols/msn/userlist.c:643
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "無法新增「%s」。"
+
+#: ../libpurple/protocols/msn/userlist.c:645
+msgid "The screen name specified is invalid."
+msgstr "您所輸入的帳號無效。"
+
+# XXX 暫譯 - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "欠缺需要的加密方法"
+
+# XXX 暫譯 - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "找不到 RC4 加密方法"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版為以"
+"上）。"
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是 %d 個字元長。"
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM 錯誤"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "讀取驗證挑戰中"
+
+# XXX 好像有些怪，譯文有待改進
+#: ../libpurple/protocols/myspace/myspace.c:354
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "伺服器送來的驗證挑戰有意料之外的長度"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "登入中"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "與伺服器失去連線（%d 秒內收不到任何數據）"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "有新郵件"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "網誌有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "個人資料網頁有新留言"
+
+#  FIXME 譯文很不通順 - acli 20070913
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "有新的交友要求！"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "相片集有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+# TODO 要覆查 - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "已連結"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "未有設定使用者名稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選"
+"擇一個使用者名稱後，再嘗試重新登入。"
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "通訊協定錯誤，代碼 %d：%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "無法新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "「addbuddy」指令失敗。"
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "「persist」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "無此使用者：%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "搜尋使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "無法移除使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "「delbuddy」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "「blocklist」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "完成連線"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "讀取用的暫存區滿了"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "無法解析訊息"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "無法連到伺服器：%s (%d)"
+
+#  NOTE 這是群組名稱
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "即時訊息的好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "從伺服器加入聯絡人"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "從 MySpace.com 新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "匯入好友失敗"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "尋找好友..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "變更即時通訊名稱..."
+
+#  NOTE 這似乎是視窗標題
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim 網址處理器"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "在狀態列顯示暱稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "在狀態列顯示標題"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "傳送表情圖示"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "熒幕解像度（DPI）"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "基礎字體大小(點)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "使用者"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "個人資料"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "頭條消息"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "歌曲"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "好友總數"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "客戶端版本"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "電"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "Zapping %s..."
+msgstr "呼叫 %s"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "摑"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "摑 %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "主題"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "該使用者拒絕了您"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "燒 %s 中..."
 
-#: ../libpurple/protocols/msn/state.c:36
-msgid "Out To Lunch"
-msgstr "外出用餐"
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "親吻"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s 已經登入。"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
-msgid "Message may have not been sent because a timeout occurred:"
-msgstr "送出訊息逾時，可能沒有送出訊息："
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "親吻 %s 中..."
 
-#: ../libpurple/protocols/msn/switchboard.c:408
-msgid "Message could not be sent, not allowed while invisible:"
-msgstr "隱身時無法送出訊息："
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "擁抱"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s 已經登入。"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
-msgid "Message could not be sent because the user is offline:"
-msgstr "因為使用者目前離線，所以無法送出訊息："
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "擁抱 %s 中..."
 
-#: ../libpurple/protocols/msn/switchboard.c:416
-msgid "Message could not be sent because a connection error occurred:"
-msgstr "因為連線發生錯誤，所以訊息無法送出："
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "斯洛伐克文"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
-msgid "Message could not be sent because we are sending too quickly:"
-msgstr "因為我們傳送訊息的速度太快，所以訊息無法送出："
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
 msgstr ""
-"因為無法與伺服器建立工作階段，所以訊息無法送出（這大概是伺服器出現了問題，請"
-"幾分鐘後重試）："
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "掐屁股"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
-msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "因為發生不明的錯誤，訊息可能沒有送出："
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s 掐了您的屁股！"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: ../libpurple/protocols/myspace/zap.c:50
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 在呼叫您！"
+msgid "Goosing %s..."
+msgstr "掐 %s 的屁股中..."
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 將您加入他（她）的好友清單。"
+msgid "%s has high-fived you!"
+msgstr "%s high-five 了您！"
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 將您從他（她）的好友清單中移除。"
+msgid "High-fiving %s..."
+msgstr "High-five %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s 已經登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
-msgid "Unable to add \"%s\"."
-msgstr "無法新增「%s」。"
+msgid "Punking %s..."
+msgstr ""
 
-#: ../libpurple/protocols/msn/userlist.c:643
-msgid "The screen name specified is invalid."
-msgstr "您所輸入的帳號無效。"
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6675,18 +8160,18 @@
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6697,7 +8182,7 @@
 "與伺服器之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
 #: ../libpurple/proxy.c:1461
@@ -6735,7 +8220,7 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
@@ -6765,7 +8250,7 @@
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
@@ -6871,7 +8356,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6882,7 +8367,7 @@
 "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。）"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6892,22 +8377,22 @@
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6915,33 +8400,33 @@
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
 # NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP 使用者"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6952,100 +8437,101 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -7054,7 +8540,7 @@
 "無法連線至認證伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -7063,20 +8549,20 @@
 "無法連線到 BOS 伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7086,31 +8572,31 @@
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7118,44 +8604,44 @@
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7164,53 +8650,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7220,17 +8706,17 @@
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7243,7 +8729,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7256,7 +8742,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7269,38 +8755,38 @@
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7310,21 +8796,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2608
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2617
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7332,63 +8818,55 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
-msgid "Capabilities"
-msgstr "相容性"
-
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
-msgid "Profile"
-msgstr "個人資料"
-
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7396,114 +8874,110 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "您因為不明原因而登出。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7511,37 +8985,37 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7550,7 +9024,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7561,11 +9035,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7576,11 +9050,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7591,9 +9065,9 @@
 "效電郵地址；或者必須以英文字母為開頭，同時由「英文字母」、「數字」和「空白」"
 "所組成，或者單純以「數字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "無法加入"
 
@@ -7609,16 +9083,15 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
 #: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7627,17 +9100,17 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7647,23 +9120,23 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7673,32 +9146,32 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
 #: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7706,90 +9179,90 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7797,74 +9270,74 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "顯示您閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7872,26 +9345,26 @@
 "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
 "（較慢，但不會暴露您的 IP 位址）"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s；%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8086,7 +9559,6 @@
 msgstr "您拒絕了 %d 的要求"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "請輸入原因："
 
@@ -8103,39 +9575,33 @@
 msgid "Sorry, you are not my type..."
 msgstr "對不起，我和你，合不來的……"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "拒絕"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "您成功從一個好友的好友清單中移除了您自己"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "您成功從對方的好友清單中移除了您自己"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎？"
@@ -8143,22 +9609,22 @@
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "送出"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
+msgid "You have added %d to buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
@@ -8187,7 +9653,7 @@
 msgstr "QQ 群"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "請輸入外部 Group ID"
 
 # NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
@@ -8197,12 +9663,12 @@
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "原因：%s"
@@ -8222,37 +9688,37 @@
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "允許"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr "管理人 %d 拒絕了您加入群組 %d"
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr "管理人 %2$d 拒絕了您加入群組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr "管理人 %d 允許了您加入群組 %d"
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr "管理人 %2$d 允許了您加入群組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "群組「%2$d」新增了您 [%1$d]"
+msgid "You [%d] have been added to group \"%d\""
+msgstr "您 [%d] 已經被加入群組 \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "我不是成員"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8276,7 +9742,7 @@
 msgstr "這群組不容許外人加入"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
 msgstr "您成功離開群組"
 
 #: ../libpurple/protocols/qq/group_join.c:257
@@ -8284,16 +9750,16 @@
 msgstr "QQ 群組認證"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "您確定要離開這個群 (Qun) 嗎？"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "您確定要離開群組？"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -8301,10 +9767,6 @@
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "確定"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -8314,20 +9776,24 @@
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
 
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "請輸入原因："
+
 #  NOTE QQ「member」應是「成員」
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
 msgstr "成功更改了群的資訊"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
@@ -8347,20 +9813,18 @@
 msgstr "系統訊息"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "伺服器回應"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
+#, fuzzy
+msgid "Keep alive error"
+msgstr "讀取錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "「登入要求」Token 出現錯誤"
+msgid "Error requesting login token"
+msgstr "取得 Login Token 錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8386,101 +9850,87 @@
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s 位址"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP 位址"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP 位址"
 
 #  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "成長階段"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: 上線"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: 離開"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: 隱身"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: 離線"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "名稱無效"
 
 #  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間：</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "修改資訊"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "設定我的資訊"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "顯示登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "封鎖這個好友"
 
@@ -8494,26 +9944,13 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "以 TCP 登入"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "以隱藏狀態登入"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "寫入 Socket 途中發生錯誤"
-
-# XXX - 20061027
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "連線被拒"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "使用 TCP 連結"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8542,62 +9979,59 @@
 msgid "Connection lost"
 msgstr "連線中斷"
 
+# FIXME 譯文有待改進  - 20070912 acli
 #. cancel login progress
 #: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "您想將這個使用者加入到您的好友名單中嗎？"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "您要加入這個使用者到好友清單中嗎？"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
-msgstr "您想將他（她）加入到您的好友清單嗎？"
+# FIXME fix the original string :P
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
+msgstr "您要將他（她）加入您的好友清單嗎？"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
-msgstr "使用者「%s」允許了您的要求"
+msgid "User %s approved your request"
+msgstr "使用者 %s 允許了您的要求"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s 想要將您（%s）加入他（她）的好友清單"
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "訊息：%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
-# FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "您要將他（她）加入您的好友清單嗎？"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
@@ -8629,17 +10063,21 @@
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
+# NOTE 見cnscode.org.tw
+# FIXME 譯文有待改進
 #: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
-msgstr "傳送 Handshake"
+msgstr "傳送交握中"
 
+# NOTE 見cnscode.org.tw
 #: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "等待 Handshake 回應"
+msgstr "等待交握回應"
 
+# NOTE 見cnscode.org.tw
 #: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Handshake收到回應，送出登入要求"
+msgstr "收到交握回應，送出登入要求中"
 
 #: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
@@ -8647,11 +10085,11 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
-msgstr "重新導向登入"
+msgstr "登入已被重新導向"
 
 #: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr "強行登入"
+msgstr "強行登入中"
 
 #: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
@@ -8662,11 +10100,6 @@
 msgid "Starting Services"
 msgstr "啟動服務"
 
-# TODO 要覆查 - 20061027
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "已連結"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8723,10 +10156,6 @@
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -8794,7 +10223,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "主題："
 
@@ -8821,7 +10250,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "連線"
 
@@ -8997,8 +10426,7 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "搜尋結果"
 
@@ -9437,13 +10865,6 @@
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "心情"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9978,7 +11399,7 @@
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "姓名"
 
@@ -10113,13 +11534,6 @@
 msgstr "網路統計資料"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
@@ -10273,7 +11687,7 @@
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "正常"
 
@@ -10666,7 +12080,7 @@
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "網路"
 
@@ -10933,26 +12347,26 @@
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10964,36 +12378,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -11157,8 +12571,8 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "群組(_G)："
 
@@ -11218,33 +12632,27 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
+
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
-#  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s 在呼叫您！"
-
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11253,11 +12661,16 @@
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11267,11 +12680,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11280,49 +12693,49 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11331,7 +12744,7 @@
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11340,28 +12753,28 @@
 "無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -11369,92 +12782,96 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
-msgstr "啟動哪一個 ID？"
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+msgid "Activate which ID?"
+msgstr "啟用哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
-msgid "Join who in chat?"
-msgstr "加入哪個好友目前所在的聊天室？"
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
+msgid "Join whom in chat?"
+msgstr "加入誰的聊天室？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "You have just sent a Buzz!"
-msgstr "您剛送出了一個呼叫！"
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Open Inbox"
+msgstr "開啟收件匣"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "嗶！"
+
+# XXX 這是暫譯 - acli 20070913
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 給好友一個「嗶」引他（她）注意"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -11468,133 +12885,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "無法加入聊天室"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "未知聊天室"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "也許聊天室使用者已經到達上限"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "聊天室不存在"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您現在進入「%s」進行聊天。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "無法加入好友目前所在的聊天室"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "可能他（她）並不在聊天室內？"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "讀取聊天室清單發生錯誤。"
-
-# NOTE 解「可語音聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "可語音聊天"
-
-# NOTE 解「可視像聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "可視像聊天"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "無法取得聊天室清單。"
-
-# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
-# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
-# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "使用者建立之聊天室"
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -11611,86 +12954,86 @@
 msgstr "無法建立檔案介紹。"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 個人資料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "對不起，暫時並不支援內容被列為兒童不宜的個人資訊。"
 
 # NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結："
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "最新消息"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "更新日期"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "對不起，這則個人資訊似乎是使用目前尚未被支援的語言或格式。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11699,10 +13042,84 @@
 "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! 會不"
 "時找不到使用者的個人資料。若果您知道使用者確實存在，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "邀請被婉拒了"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "無法加入聊天室"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "未知聊天室"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "也許聊天室使用者已經到達上限"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "聊天室不存在"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您現在進入「%s」進行聊天。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "無法加入好友目前所在的聊天室"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "可能他（她）並不在聊天室內？"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "讀取聊天室清單發生錯誤。"
+
+# NOTE 解「可語音聊天的使用者數目」(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "可語音聊天"
+
+# NOTE 解「可視像聊天的使用者數目」(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "可視像聊天"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "無法取得聊天室清單。"
+
+# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
+# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
+# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "使用者建立之聊天室"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
@@ -11727,11 +13144,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "使用者"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11976,7 +13388,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 引起了您的注意！"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11985,20 +13407,40 @@
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
+# FIXME ambiguous - 20061025
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL 連線失敗"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL 交談失敗"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL peer 出示了無效的憑證"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "未知的 SSL 錯誤"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
@@ -12050,13 +13492,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2691
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12064,84 +13506,84 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3192
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3195
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3241
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3521
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "無法打開 %s：重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3681
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3716
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3772
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -12168,39 +13610,39 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "通訊協定(_T)："
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "帳號(_N)："
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "帳號別名（只在本機生效）(_L)："
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I)："
 
@@ -12236,7 +13678,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -12258,15 +13700,15 @@
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
@@ -12274,10 +13716,18 @@
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "無法儲存新帳號"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "已有一個乎合指定條件的帳號。"
+
 #: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "新增帳號"
@@ -12286,19 +13736,23 @@
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "在伺服器上建立這個新帳號"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12322,231 +13776,243 @@
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2844
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/好友/顯示離線好友(_O)"
-
-#: ../pidgin/gtkblist.c:2845
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友/顯示空白的群組(_E)"
-
-#: ../pidgin/gtkblist.c:2846
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/好友/顯示好友細節(_D)"
-
-#: ../pidgin/gtkblist.c:2847
-msgid "/Buddies/Show Idle _Times"
-msgstr "/好友/顯示閒置時間(_T)"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/好友/顯示"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/好友/顯示/離線好友(_O)"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/好友/顯示/空白群組(_E)"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/好友/顯示/好友細節(_D)"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/好友/顯示/閒置時間(_T)"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/好友/顯示/通訊協定圖示(_P)"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/工具/憑證(_C)"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12555,133 +14021,133 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "閒置 %d 日 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12699,23 +14165,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/好友/顯示離線好友"
-
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Empty Groups"
-msgstr "/好友/顯示空的好的群組"
-
-#: ../pidgin/gtkblist.c:4564
-msgid "/Buddies/Show Buddy Details"
-msgstr "/好友/顯示好友細節"
-
-#: ../pidgin/gtkblist.c:4567
-msgid "/Buddies/Show Idle Times"
-msgstr "/好友/顯示閒置時間"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/好友/顯示/離線好友"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/好友/顯示/空群組"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/好友/顯示/好友細節"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/好友/顯示/閒置時間"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/好友/顯示/通訊協定圖示"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12725,71 +14195,76 @@
 "在好友清單中顯示。\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "帳號(_S)："
 
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "別名(_L)："
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL 伺服器"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12801,225 +14276,216 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:777
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:830
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:881
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
-
-#: ../pidgin/gtkconv.c:1366
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "全部顯示"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2839
-msgid "/Options/Show Buddy _Icon"
-msgstr "/選項/顯示好友圖示(_I)"
-
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/選項"
 
@@ -13028,177 +14494,173 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3181
-msgid "/Options/Show Buddy Icon"
-msgstr "/選項/顯示好友圖示"
-
-#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear：清空所有交談的回捲緩衝區"
 
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:7978
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7984
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7992
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7998
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8444
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8968
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8972 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8974
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "依帳號"
 
@@ -13272,25 +14734,22 @@
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "主要開發者"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "開發者"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "開發者兼網站管理員"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "支援"
@@ -13299,162 +14758,175 @@
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "開發者兼網站管理員"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "資深貢獻者兼品管"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP 開發者"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "原作者"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "孟加拉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "波希尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "德文"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "愛沙尼亞文"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "法文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "加里西亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "希伯來文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "印度文"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -13463,54 +14935,54 @@
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "喬治亞文"
 
 # FIXME 可以譯好一點 20070520 acli
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註：KDE 譯「坎納達」
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "康納達文"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "韓文"
 
 #  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
 #  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -13519,61 +14991,55 @@
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#  XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
-#  XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭……
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "挪威文"
-
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -13581,99 +15047,101 @@
 #  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
 #  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時"
 "提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
-"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
-"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內"
-"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全"
-"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
-"何保用。<BR><BR>"
+"Lotus Sametime、Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>"
+"倘若您希望修改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條"
+"款即可；%s 內已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著"
+"作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
+"式恕不提供任何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -13681,80 +15149,85 @@
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "前任開發者"
 
+# NOTE 參見「Crazy Patch Writer」條
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "前任的狂熱模組作者"
+
 #  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13770,32 +15243,32 @@
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13803,42 +15276,42 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13954,7 +15427,7 @@
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13964,44 +15437,44 @@
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -14012,7 +15485,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -14022,7 +15495,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14033,7 +15506,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -14044,130 +15517,201 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像：%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "粗體(_B)"
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "字型(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+#, fuzzy
+msgid "Group Items"
+msgstr "群組 ID："
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "解除群組"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "粗體"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "斜體(_I)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "底線(_U)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "放大字體(_L)"
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "_Normal"
-msgstr "正常(_N)"
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "縮小字體(_S)"
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "刪除線"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "放大字體"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1072
-msgid "_Font face"
-msgstr "字型(_F)"
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "字型"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "背景顏色"
 
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
-msgstr "前景顏色(_F)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
-msgstr "背景顏色(_B)"
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "前景顏色"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "清除格式化"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "插入影像"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
+msgid "Insert Smiley"
+msgstr "插入表情"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>粗體(_B)</b>"
+
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>斜體(_I)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>底線(_U)</u>"
+
+#  NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法）
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>刪除線</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>儲存影像途中發生錯誤</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "_Normal"
+msgstr "正常(_N)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>縮小(_S)</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "_Font face"
 msgstr "字型(_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "清除格式化(_R)"
+#  XXX 譯「文字顏色」會否較好？ - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "前景顏色(_C)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "背景顏色(_K)"
 
 #  XXX
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "笑一個！(_S)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "連結(_L)"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "橫線(_H)"
+
 #  XXX 不通順 - ambrose 20070415
 #: ../pidgin/gtklog.c:292
 #, c-format
@@ -14252,14 +15796,14 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14286,7 +15830,7 @@
 "哪些帳號，並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14311,48 +15855,48 @@
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
@@ -14404,100 +15948,100 @@
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "預設"
 
@@ -14531,13 +16075,6 @@
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "務必"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "有未讀訊息時"
@@ -14550,7 +16087,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "離開期間"
 
@@ -14603,9 +16140,10 @@
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
+#  TODO 要覆查 - acli 20070912
 #: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "顯示好友圖示(_I)"
+msgid "Show _detailed information"
+msgstr "顯示詳細資訊(_D)"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14648,132 +16186,132 @@
 msgid "Conversation _font:"
 msgstr "交談用的字型(_F)："
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文，而是樣本本身，玩死人了 :P
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化，送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S)："
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "結束通訊埠(_E)："
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前，不用「毋須」，改為「不使用」
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O)："
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14782,80 +16320,63 @@
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "日誌格式(_F)："
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(預設)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "音效播放方式"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "自動"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "指令"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14864,118 +16385,82 @@
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "音效選項"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "上線而非離開期間"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "離開期間"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "事件音效"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "事件"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "測試"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "重置"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "選擇..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "音效"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -15064,23 +16549,23 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -15122,7 +16607,7 @@
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "狀態(_S)："
 
@@ -15136,94 +16621,46 @@
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "好友登入"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "好友登出"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "收到訊息"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "訊息收到，開始進行交談"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "訊息送出"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "有人進入聊天室"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "有人離開聊天室"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "您在聊天室說話"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "有人在聊天室中提到您的名字"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer 錯誤"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer 初始化失敗。"
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15231,23 +16668,23 @@
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15255,7 +16692,7 @@
 "您可以透過檔案傳輸，或者把它當成是你的好友圖示等方式，來傳送影像檔給這個使用"
 "者。"
 
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15268,17 +16705,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15289,25 +16726,25 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15321,31 +16758,31 @@
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情圖示"
 
@@ -15362,38 +16799,38 @@
 msgid "none"
 msgstr "無"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "顯示統計資料"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "統計設定"
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限："
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "精密度："
 
@@ -15403,18 +16840,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "好友在線狀態預測"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "好友在線狀態預測模組"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15528,19 +16965,6 @@
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "粗體"
-
-# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "斜體"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "底線"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "忽略收到訊息中的自訂格式"
@@ -15705,30 +17129,30 @@
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
 #  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -15736,7 +17160,7 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
@@ -15746,7 +17170,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15757,8 +17181,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15811,6 +17235,15 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "檢查使用者介面的各種信號是否都能正常運作。"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>好友備註</b>：%s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "歷史記錄"
@@ -15860,11 +17293,11 @@
 msgid "Draw Markerline in "
 msgstr "在何處使用標示線"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
@@ -15880,32 +17313,32 @@
 msgid "Music messaging session confirmed."
 msgstr "成功確定音樂訊息工作階段。"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "音樂訊息"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "執行下列指令時發生衝突："
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "執行編輯器途中發生錯誤"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "發生了下列錯誤："
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "音樂訊息設定"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "樂譜編輯器路徑"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "套用(_A)"
 
@@ -15917,12 +17350,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15930,35 +17363,35 @@
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "通知種類"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t只當有人提到您的名字(_O)"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "焦點視窗(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "加入字串到視窗標題之前(_S)："
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
 #  TODO 要覆查 - 20061029
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "加入新訊息數目到 X 屬性中(_X)"
 
@@ -15966,42 +17399,42 @@
 # NOTE「URGENT」一字大概應該保留，因為絕大多數的視窗管理員都不支援，而且會引致奇怪的後果
 # NOTE 譯文更動 by Ambrose
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "設定視窗的「URGENT」（緊急資訊）提示(_U)"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "浮現交談視窗(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "通知移除"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "當交談取得輸入焦點時移除通知(_G)"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "送出訊息後移除通知(_M)"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "當視窗標籤被點選後移除通知(_B)"
 
@@ -16011,7 +17444,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -16019,7 +17452,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
@@ -16396,45 +17829,45 @@
 "timestamp formats."
 msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "不透明度："
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "即時訊息交談視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "即時訊息視窗透明度(_I)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "在即時訊息視窗取得焦點時移除透明度"
 
 # XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "總是在最上層"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "好友清單視窗透明度(_B)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "取得輸入焦點時移除好友清單視窗透明度"
 
@@ -16444,19 +17877,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16467,47 +17900,47 @@
 "\n"
 "* 請注意：這個模組需要至少 Win2000 的 Windows 版本才能產生效果。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime 版本"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "啟動"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "當 Windows 啟動時同時執行 %s (_S)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "可停駐的好友清單(_D)"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K)；"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "只在停駐時生效"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "收到聊天訊息後閃動視窗(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
@@ -16561,6 +17994,99 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "您剛送出了一個呼叫！"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s 在呼叫您！"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "您因為不明原因而登出。"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "您確定要離開這個群 (Qun) 嗎？"
+
+#~ msgid "Go ahead"
+#~ msgstr "確定"
+
+#~ msgid "Server ACK"
+#~ msgstr "伺服器回應"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
+
+#~ msgid "Request login token error!"
+#~ msgstr "「登入要求」Token 出現錯誤"
+
+#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
+#~ msgid "%s Address"
+#~ msgstr "%s 位址"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 上線"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: 離開"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: 隱身"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: 離線"
+
+#~ msgid "Modify My Information"
+#~ msgstr "修改資訊"
+
+#~ msgid "Login in TCP"
+#~ msgstr "以 TCP 登入"
+
+#~ msgid "Login Hidden"
+#~ msgstr "以隱藏狀態登入"
+
+#~ msgid "Socket send error"
+#~ msgstr "寫入 Socket 途中發生錯誤"
+
+# XXX - 20061027
+#~ msgid "Connection refused"
+#~ msgstr "連線被拒"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "您想將他（她）加入到您的好友清單嗎？"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s 在呼叫您！"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "您剛送出了一個呼叫！"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/選項/顯示好友圖示(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/選項/顯示好友圖示"
+
+#  XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
+#  XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭……
+#~ msgid "Norwegian"
+#~ msgstr "挪威文"
+
+#~ msgid "_Bold"
+#~ msgstr "粗體(_B)"
+
+#~ msgid "_Larger"
+#~ msgstr "放大字體(_L)"
+
+#~ msgid "_Smaller"
+#~ msgstr "縮小字體(_S)"
+
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "顯示好友圖示(_I)"
+
 # NOTE 沒辦法，用不到着重號，又沒法改換字型……
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "尚未支援指令，訊息因此沒有被送出。"
@@ -16589,24 +18115,15 @@
 #~ msgid "/Buddies/_About Pidgin"
 #~ msgstr "/好友/關於 Pidgin(_A)"
 
-#~ msgid "Larger font size"
-#~ msgstr "放大字體"
-
 #~ msgid "Smaller font size"
 #~ msgstr "縮小字體"
 
-#~ msgid "Reset formatting"
-#~ msgstr "清除格式化"
-
 #~ msgid "Insert link"
 #~ msgstr "插入連結"
 
 #~ msgid "Insert image"
 #~ msgstr "插入影像"
 
-#~ msgid "Insert smiley"
-#~ msgstr "插入表情"
-
 #~ msgid "Tools"
 #~ msgstr "工具"
 
@@ -16798,13 +18315,6 @@
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>好友別名：</b>%s"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
@@ -17033,10 +18543,6 @@
 #~ msgstr "格式化帳號..."
 
 #  XXX 要覆查
-#~ msgid "Selection"
-#~ msgstr "選擇"
-
-#  XXX 要覆查
 #~ msgid "Faces"
 #~ msgstr "好友圖示"
 
@@ -17054,9 +18560,6 @@
 #~ msgid "<i>Information below may not be accurate</i><br>\n"
 #~ msgstr "【下列資訊可能不準確】<br>\n"
 
-#~ msgid "Change My Face"
-#~ msgstr "修改好友圖示"
-
 #~ msgid "Please wait for new version"
 #~ msgstr "請等待新版本推出"
 
@@ -17113,9 +18616,6 @@
 #~ msgid "Gaim - Save As..."
 #~ msgstr "Gaim - 儲存為..."
 
-#~ msgid "Buzz!!"
-#~ msgstr "嗶！"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list%s%s."
 #~ msgstr "使用者 %s 想要將 %s 加入他（她）的好友清單%s%s。"
 
@@ -17252,9 +18752,6 @@
 #~ msgid "Use TLS if available"
 #~ msgstr "TLS 可用則用"
 
-#~ msgid "Require TLS"
-#~ msgstr "需要TLS"
-
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "因為不明原因導致與伺服器連線中斷。"
 
@@ -17310,18 +18807,12 @@
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#~ msgid "%s requested your information"
-#~ msgstr "%s 查詢您的使用者資訊"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s 要求一個 PING"
 
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER 協定模組"
 
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
@@ -17354,9 +18845,6 @@
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "目前無法使用聊天室"
 
-#~ msgid "Unable to create new connection."
-#~ msgstr "無法開啟新連結。"
-
 #~ msgid "Auth host"
 #~ msgstr "認證伺服器"
 
@@ -17417,9 +18905,6 @@
 #~ msgid "Call ended."
 #~ msgstr "結束呼叫。"
 
-#~ msgid "Calling %s"
-#~ msgstr "呼叫 %s"
-
 #~ msgid "End Call"
 #~ msgstr "結束呼叫"
 
@@ -17447,9 +18932,6 @@
 #~ msgid "Realname"
 #~ msgstr "姓名"
 
-#~ msgid "Email Address"
-#~ msgstr "電子郵件"
-
 #~ msgid "EMail"
 #~ msgstr "電子郵件"
 
@@ -17518,194 +19000,3 @@
 #, fuzzy
 #~ msgid "Web aware"
 #~ msgstr "允許其他使用者在網路上查看您目前的狀態"
-
-#  XXX 這個有點怪，譯錯？
-#~ msgid "Active"
-#~ msgstr "啟動"
-
-#~ msgid "Add User"
-#~ msgstr "新增使用者"
-
-#~ msgid "Write a gtkrc file with these settings to %s"
-#~ msgstr "將這些設定寫入到 %s 的 gtkrc 檔"
-
-#~ msgid "Screenname:"
-#~ msgstr "帳號："
-
-#~ msgid "Host name"
-#~ msgstr "主機名稱"
-
-#~ msgid "Default status messages"
-#~ msgstr "預設狀態訊息"
-
-#~ msgid "Edit Status Messages"
-#~ msgstr "編輯狀態訊息"
-
-#~ msgid "Set Status Messages..."
-#~ msgstr "設定狀態訊息..."
-
-#~ msgid "Not At Home"
-#~ msgstr "不在家"
-
-#~ msgid "Not At Desk"
-#~ msgstr "不在座位"
-
-#~ msgid "Not In Office"
-#~ msgstr "不在辦公室"
-
-#~ msgid "Hello!"
-#~ msgstr "您好！"
-
-#~ msgid "Gaim"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim - Signed off"
-#~ msgstr "Gaim - 已登出"
-
-#~ msgid "Gaim - Away"
-#~ msgstr "Gaim - 離開"
-
-#~ msgid "Set account idle time"
-#~ msgstr "設定帳號閒置時間"
-
-#~ msgid "Unset account idle time"
-#~ msgstr "取消帳號閒置時間設定"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "您想將他（她）加入到您的好友名單中嗎？"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "為這個好友加上別名(_A)..."
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#~ msgid "Alias Contact..."
-#~ msgstr "為這組好友加上別名..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/工具/帳號相關指令(_T)"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/工具/帳號清單(_C)"
-
-#~ msgid "Idle "
-#~ msgstr "閒置"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/工具/帳號相關指令"
-
-#~ msgid "Active Developers"
-#~ msgstr "現任開發者"
-
-#~ msgid "Change password"
-#~ msgstr "修改密碼"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "處理事件或回覆時發生錯誤 (%s)。"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "不顯示中斷連線錯誤"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "不顯示登入錯誤"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "隱藏重新連線交談視窗"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "當你斷線時，系統會自動幫你重新連線。"
-
-# NOTE 譯文核實 by Etan Reisner (開發者之一)
-#~ msgid "Use last matching buddy"
-#~ msgstr "使用最後（而非最先）一個匹配的好友帳號"
-
-# NOTE 每行不可太長，並要人手用「\n」分隔，否則視窗會過闊
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "若果一個好友其實概括了好幾個好友帳號，通訊時便根據這裏\n"
-#~ "所給定的得分值計分，積分最少者為「優先」，成為當時實際\n"
-#~ "使用的好友帳號。\n"
-#~ "「離線」狀態預設得 4 分，「離開」兩分，「閒置」1 分。\n"
-#~ "要得出預設的優先次序「沒閒置→閒置→離開→離開兼閒置」，\n"
-#~ "使用上列的預設值即可。"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "保持對話框開啟(_K)"
-
-#~ msgid "A_way"
-#~ msgstr "離開(_W)"
-
-#~ msgid "_Idle"
-#~ msgstr "閒置(_I)"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "由閒置返回(_N)"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "瀏覽(_W)..."
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "移除好友狀態捕捉"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "在離開時，將所有的新訊息置入佇列中(_Q)"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "無法設定 AIM 離開訊息。"
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請"
-#~ "在完全登入後再設定一次。"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "核實所有即時訊息的簽章"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "數位簽署所有頻道訊息"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "核實所有頻道訊息的簽章"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "（%d 個訊息）"
-#~ msgstr[1] "（%d 個訊息）"
-
-#~ msgid "(1 message)"
-#~ msgstr "（一個訊息）"
-
-#~ msgid "Default auto-away"
-#~ msgstr "預設自動離開"
-
-#~ msgid "_Sorting:"
-#~ msgstr "排序方式(_S)："
-
-#~ msgid "Buddy Display"
-#~ msgstr "好友顯示"
-
-# XXX 暫譯
-#~ msgid "Show more buddy details"
-#~ msgstr "顯示更多使用者細節"
-
-#~ msgid "Gnome Default"
-#~ msgstr "GNOME預設值"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "離開訊息(_M)："
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
Only in pidgin-2.2.0/share: ca-certs
diff -ru pidgin-2.1.1/share/Makefile.am pidgin-2.2.0/share/Makefile.am
--- pidgin-2.1.1/share/Makefile.am	2007-08-20 14:13:08.000000000 -0400
+++ pidgin-2.2.0/share/Makefile.am	2007-08-27 22:35:01.000000000 -0400
@@ -1,4 +1,4 @@
 
-SUBDIRS = sounds
+SUBDIRS = sounds ca-certs
 
 EXTRA_DIST = Makefile.mingw
diff -ru pidgin-2.1.1/share/Makefile.in pidgin-2.2.0/share/Makefile.in
--- pidgin-2.1.1/share/Makefile.in	2007-08-20 14:14:12.000000000 -0400
+++ pidgin-2.2.0/share/Makefile.in	2007-09-14 03:31:37.000000000 -0400
@@ -108,6 +108,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -136,6 +138,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -191,14 +195,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -210,7 +212,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -271,6 +272,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -291,6 +293,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@
@@ -403,7 +407,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = sounds
+SUBDIRS = sounds ca-certs
 EXTRA_DIST = Makefile.mingw
 all: all-recursive
 
diff -ru pidgin-2.1.1/share/sounds/Makefile.in pidgin-2.2.0/share/sounds/Makefile.in
--- pidgin-2.1.1/share/sounds/Makefile.in	2007-08-20 14:14:12.000000000 -0400
+++ pidgin-2.2.0/share/sounds/Makefile.in	2007-09-14 03:31:38.000000000 -0400
@@ -109,6 +109,8 @@
 DYNAMIC_JABBER_TRUE = @DYNAMIC_JABBER_TRUE@
 DYNAMIC_MSN_FALSE = @DYNAMIC_MSN_FALSE@
 DYNAMIC_MSN_TRUE = @DYNAMIC_MSN_TRUE@
+DYNAMIC_MYSPACE_FALSE = @DYNAMIC_MYSPACE_FALSE@
+DYNAMIC_MYSPACE_TRUE = @DYNAMIC_MYSPACE_TRUE@
 DYNAMIC_NOVELL_FALSE = @DYNAMIC_NOVELL_FALSE@
 DYNAMIC_NOVELL_TRUE = @DYNAMIC_NOVELL_TRUE@
 DYNAMIC_OSCAR_FALSE = @DYNAMIC_OSCAR_FALSE@
@@ -137,6 +139,8 @@
 ENABLE_CAP_TRUE = @ENABLE_CAP_TRUE@
 ENABLE_DBUS_FALSE = @ENABLE_DBUS_FALSE@
 ENABLE_DBUS_TRUE = @ENABLE_DBUS_TRUE@
+ENABLE_GESTURES_FALSE = @ENABLE_GESTURES_FALSE@
+ENABLE_GESTURES_TRUE = @ENABLE_GESTURES_TRUE@
 ENABLE_GNT_FALSE = @ENABLE_GNT_FALSE@
 ENABLE_GNT_TRUE = @ENABLE_GNT_TRUE@
 ENABLE_GTK_FALSE = @ENABLE_GTK_FALSE@
@@ -192,14 +196,12 @@
 INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
 INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
 INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -211,7 +213,6 @@
 INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
 INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 KRB4_CFLAGS = @KRB4_CFLAGS@
@@ -272,6 +273,7 @@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 SASL_LIBS = @SASL_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SILC_CFLAGS = @SILC_CFLAGS@
@@ -292,6 +294,8 @@
 STATIC_LINK_LIBS = @STATIC_LINK_LIBS@
 STATIC_MSN_FALSE = @STATIC_MSN_FALSE@
 STATIC_MSN_TRUE = @STATIC_MSN_TRUE@
+STATIC_MYSPACE_FALSE = @STATIC_MYSPACE_FALSE@
+STATIC_MYSPACE_TRUE = @STATIC_MYSPACE_TRUE@
 STATIC_NOVELL_FALSE = @STATIC_NOVELL_FALSE@
 STATIC_NOVELL_TRUE = @STATIC_NOVELL_TRUE@
 STATIC_OSCAR_FALSE = @STATIC_OSCAR_FALSE@