changeset 23126:2f4b10ee752b

propagate from branch 'im.pidgin.pidgin' (head caaa65e1c157e6cb43219237f88a4ad298f3bbf5) to branch 'im.pidgin.pidgin.custom_smiley' (head 762e0e84f778841d4021f4d8ea5c39bff5e173b2)
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 28 Apr 2008 00:01:07 +0000
parents 981a0bfc3d9d (current diff) 29cd77930050 (diff)
children 3da84b370eda
files ChangeLog.API finch/libgnt/pygnt/Files.txt finch/libgnt/pygnt/Makefile.am finch/libgnt/pygnt/Makefile.make finch/libgnt/pygnt/README.txt finch/libgnt/pygnt/common.c finch/libgnt/pygnt/common.h finch/libgnt/pygnt/dbus-gnt finch/libgnt/pygnt/example/rss/gnthtml.py finch/libgnt/pygnt/example/rss/gntrss-ui.py finch/libgnt/pygnt/example/rss/gntrss.py finch/libgnt/pygnt/file.py finch/libgnt/pygnt/gendef.sh finch/libgnt/pygnt/gnt.override finch/libgnt/pygnt/gntbox.override finch/libgnt/pygnt/gntfilesel.override finch/libgnt/pygnt/gntmodule.c finch/libgnt/pygnt/gnttree.override finch/libgnt/pygnt/gntwidget.override finch/libgnt/pygnt/test.py libpurple/core.c libpurple/imgstore.c libpurple/imgstore.h libpurple/util.h pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtml.c pidgin/gtkmain.c pidgin/gtkutils.c po/POTFILES.in
diffstat 155 files changed, 4635 insertions(+), 10099 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Mon Mar 31 21:23:57 2008 +0000
+++ b/.mtn-ignore	Mon Apr 28 00:01:07 2008 +0000
@@ -1,5 +1,6 @@
 (.*/)?\.svn
 .*/?Makefile(\.in)?$
+.*/?Makefile\.am\.mingw$
 (.*/)?TAGS$
 .*/?.*\.pc$
 .*/perl/common/[^/]+\.c$
--- a/COPYRIGHT	Mon Mar 31 21:23:57 2008 +0000
+++ b/COPYRIGHT	Mon Apr 28 00:01:07 2008 +0000
@@ -52,6 +52,7 @@
 Matt Brenneke
 Jeremy Brooks
 Jonathan Brossard
+Jeffery Brown
 Philip Brown
 Norbert Buchmuller
 Sean Burke
@@ -232,6 +233,7 @@
 Matthew Luckie
 Mike Lundy
 Jason Lynch
+Iain MacDonnell
 Lucio Maciel
 Brian Macke
 Paolo Maggi
@@ -358,6 +360,7 @@
 Dossy Shiobara
 Michael Shkutkov
 Shreevatsa R
+Dylan Simon <dylan@dylex.net>
 Ettore Simone
 John Silvestri
 Craig Slusher
--- a/ChangeLog	Mon Mar 31 21:23:57 2008 +0000
+++ b/ChangeLog	Mon Apr 28 00:01:07 2008 +0000
@@ -1,6 +1,34 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.4.1 ():
+version 2.x.x:
+	libpurple:
+	* In MySpaceIM, messages from spambots are discarded (Justin Williams)
+	* Strip mIRC formatting codes from quit and part messages.
+	* IRC now displays ban lists in-channel for joined channels.
+	* Fixed a bug where the list of loaded plugins would get removed when
+	  switching between different operating systems.
+
+	Pidgin:
+	* The typing notification in the conversation history can be disabled or
+	  customized (font, color etc.) in .gtkrc-2.0.
+	* Added a plugin (not built by default) which adds a Send button back
+	  to the conversation window. People without physical keyboards have a
+	  hard time with the lack of the button.
+	* Clicking on the buddyicon in the conversation window toggles the size of
+	  the icon between small and large.
+
+	General:
+	* The configure script now dies on more absent dependencies.  The
+	  --disable-xxx arguments to configure can be used to bypass unneeded
+	  dependencies.  This will also cause the configure script to die if an
+	  --enable-xxx option is used and the dependencies it requires are
+	  missing.
+	* The Evolution integration plugin must now be explicitly enabled.  Use
+	  the --enable-gevolution argument to configure to enable it.
+	* The Contact Availability Prediction plugin must now be explicitly
+	  enabled.  Use the --enable-cap argument to configure to enable it.
+
+version 2.4.1 (03/31/2008):
 	http://developer.pidgin.im/query?status=closed&milestone=2.4.1
 
 	libpurple:
--- a/ChangeLog.API	Mon Mar 31 21:23:57 2008 +0000
+++ b/ChangeLog.API	Mon Apr 28 00:01:07 2008 +0000
@@ -6,6 +6,18 @@
 		* gtk_imhtml_smiley_create, gtk_imhtml_smiley_reload and
 		  gtk_imhtml_smiley_destroy to deal with GtkIMHtmlSmiley's.
 
+version 2.x.x:
+	perl:
+		Added:
+		* Purple::Prefs::get_children_names.
+		* Purple::timeout_remove.
+		Changed:
+		* Purple::timeout_add now returns a handle which can be used
+		  to remove the timeout.
+		* Callbacks to Purple::Util::fetch_url and the
+		  Purple::Request::* functions can now be specified as both
+		  strings (the name of the callback function) and as coderefs.
+
 version 2.4.0 (02/29/2008):
 	libpurple:
 		Added:
--- a/ChangeLog.win32	Mon Mar 31 21:23:57 2008 +0000
+++ b/ChangeLog.win32	Mon Apr 28 00:01:07 2008 +0000
@@ -1,3 +1,9 @@
+version 2.4.1 (03/31/2008):
+	* Fix an issue preventing the Buddy List being raised when pidgin.exe
+	  is run for a second time.
+	* Fix protocol handlers
+	* Fix AIM/ICQ usage of non-ASCII text with new Glib versions.
+
 version 2.4.0 (02/29/2008):
 	* Updated GTK+ to 2.12.8
 	* Updated include Meanwhile library to include patches referenced at:
--- a/NEWS	Mon Mar 31 21:23:57 2008 +0000
+++ b/NEWS	Mon Apr 28 00:01:07 2008 +0000
@@ -6,6 +6,10 @@
 	John: Well, I didn't really do much this release except muck about with
 	the configure script.  Blame me if it worked in 2.4.0 but doesn't now.
 
+	Will: We seem to be falling into a nice pattern of releasing on the last
+	day of a month.  Hypothetical AIX users might be pleased to learn that
+	Pidgin might actually run for them now!
+
 2.4.0 (2/29/2008):
 	John: While this release took what seems like forever to get out the
 	door, I think it's well worth the wait, especially for Yahoo! users.
--- a/autogen.sh	Mon Mar 31 21:23:57 2008 +0000
+++ b/autogen.sh	Mon Apr 28 00:01:07 2008 +0000
@@ -33,6 +33,7 @@
 #   AUTOHEADER_FLAGS - command line arguments to pass to autoheader
 #   AUTOMAKE_FLAGS - command line arguments to pass to automake flags
 #   CONFIGURE_FLAGS - command line arguments to pass to configure
+#   GLIB_GETTEXTIZE_FLAGS - command line arguments to pass to glib-gettextize
 #   INTLTOOLIZE_FLAGS - command line arguments to pass to intltoolize
 #   LIBTOOLIZE_FLAGS - command line arguments to pass to libtoolize
 #
@@ -48,14 +49,22 @@
 PACKAGE="Pidgin"
 ARGS_FILE="autogen.args"
 
+libtoolize="libtoolize"
+case $(uname -s) in
+	Darwin*)
+		libtoolize="glibtoolize"
+		;;
+	*)
+esac
+
 ###############################################################################
 # Some helper functions
 ###############################################################################
 check () {
 	CMD=$1
 
-	echo -n "checking for ${CMD}... "
-	BIN=`which ${CMD}`
+	printf "%s" "checking for ${CMD}... "
+	BIN=`which ${CMD} 2> /dev/null`
 
 	if [ x"${BIN}" = x"" ] ; then
 		echo "not found."
@@ -70,7 +79,7 @@
 	CMD=$1
 	shift
 
-	echo -n "running ${CMD} ${@}... "
+	printf "%s" "running ${CMD} ${@}... "
 	OUTPUT=`${CMD} ${@} 2>&1`
 	if [ $? != 0 ] ; then
 		echo "failed."
@@ -87,7 +96,7 @@
 ###############################################################################
 # We really start here, yes, very sneaky!
 ###############################################################################
-FIGLET=`which figlet`
+FIGLET=`which figlet 2> /dev/null`
 if [ x"${FIGLET}" != x"" ] ; then
 	${FIGLET} -f small ${PACKAGE}
 	echo "build system is being generated"
@@ -98,11 +107,11 @@
 ###############################################################################
 # Look for our args file
 ###############################################################################
-echo -n "checking for ${ARGS_FILE}: "
+printf "%s" "checking for ${ARGS_FILE}: "
 if [ -f ${ARGS_FILE} ] ; then
 	echo "found."
-	echo -n "sourcing ${ARGS_FILE}: "
-	. autogen.args
+	printf "%s" "sourcing ${ARGS_FILE}: "
+	. ${ARGS_FILE}
 	echo "done."
 else
 	echo "not found."
@@ -111,7 +120,8 @@
 ###############################################################################
 # Check for our required helpers
 ###############################################################################
-check "libtoolize";		LIBTOOLIZE=${BIN};
+check "$libtoolize";		LIBTOOLIZE=${BIN};
+check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN};
 check "intltoolize";	INTLTOOLIZE=${BIN};
 check "aclocal";		ACLOCAL=${BIN};
 check "autoheader";		AUTOHEADER=${BIN};
@@ -121,15 +131,16 @@
 ###############################################################################
 # Run all of our helpers
 ###############################################################################
-run_or_die ${LIBTOOLIZE} -c -f --automake ${LIBTOOLIZE_FLAGS}
-run_or_die ${INTLTOOLIZE} -c -f --automake ${INTLTOOLIZE_FLAGS}
-run_or_die ${ACLOCAL} -I m4macros ${ACLOCAL_FLAGS}
+run_or_die ${LIBTOOLIZE} ${LIBTOOLIZE_FLAGS:-"-c -f --automake"}
+run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GETTEXTIZE_FLAGS:-"--force --copy"}
+run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
+run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
-run_or_die ${AUTOMAKE} -a -c -f --gnu ${AUTOMAKE_FLAGS}
-run_or_die ${AUTOCONF} -f ${AUTOCONF_FLAGS}
+run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}
+run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS}
 
 ###############################################################################
 # Run configure
 ###############################################################################
-echo "running ./configure ${CONFIGURE_ARGS} $@"
-./configure ${CONFIGURE_ARGS} $@
+echo "running ./configure ${CONFIGURE_FLAGS} $@"
+./configure ${CONFIGURE_FLAGS} $@
--- a/configure.ac	Mon Mar 31 21:23:57 2008 +0000
+++ b/configure.ac	Mon Apr 28 00:01:07 2008 +0000
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [4])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [4])
-m4_define([purple_micro_version], [1])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@
 m4_define([gnt_lt_current], [4])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [4])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -64,6 +64,14 @@
 
 AC_INIT([pidgin], [purple_display_version], [devel@pidgin.im])
 
+if test `pwd | wc -w` -ne 1; then
+	AC_MSG_ERROR([
+You are attempting to build in a path that contains spaces.  This
+will fail.  Relocate this source tree to a path that does not contain
+spaces and run configure again.
+])
+fi
+
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -350,13 +358,13 @@
 		[compile without GtkSpell automatic spell checking])],
 	enable_gtkspell="$enableval", enable_gtkspell="yes")
 AC_ARG_ENABLE(gevolution,
-	[AC_HELP_STRING([--disable-gevolution],
-		[compile without the Evolution plugin])],
-	enable_gevolution="$enableval", enable_gevolution="yes")
+	[AC_HELP_STRING([--enable-gevolution],
+		[compile with the Evolution plugin])],
+	enable_gevolution="$enableval", enable_gevolution="no")
 AC_ARG_ENABLE(cap,
-	[AC_HELP_STRING([--disable-cap],
-		[compile without Contact Availability Prediction plugin])],
-	enable_cap="$enableval", enable_cap="yes")
+	[AC_HELP_STRING([--enable-cap],
+		[compile with Contact Availability Prediction plugin])],
+	enable_cap="$enableval", enable_cap="no")
 AC_ARG_ENABLE(gestures,
 	[AC_HELP_STRING([--disable-gestures],
 		[compile without the gestures plugin])],
@@ -404,11 +412,18 @@
 					X11_LIBS="$x_libpath_add"
 					X11_CFLAGS="$x_incpath_add"
 				else
-					with_x=no
+					AC_MSG_ERROR([
+X11 development headers not found.
+Use --without-x if you do not need X11 support.
+])
 				fi
 			])
 		AC_SUBST(X11_LIBS)
 		AC_SUBST(X11_CFLAGS)
+	else
+		enable_screensaver=no
+		enable_sm=no
+		enable_gestures=no
 	fi
 
 	dnl #######################################################################
@@ -438,9 +453,15 @@
 			if test "x$enable_screensaver" = "xyes" ; then
 				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
 				AC_SUBST(XSS_LIBS)
+			else
+				AC_MSG_ERROR([
+XScreenSaver extension development headers not found.
+Use --disable-screensaver if you do not need XScreenSaver extension support,
+this is required for detecting idle time by mouse and keyboard usage.
+])
 			fi
 		else
-			enable_screensaver=no
+			AC_MSG_ERROR([X support is required to build with XScreenSaver extensions])
 		fi
 	fi
 
@@ -461,9 +482,14 @@
 			if test "x$enable_sm" = "xyes"; then
 				AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])
 				AC_SUBST(SM_LIBS)
+			else
+				AC_MSG_ERROR([
+X session management development headers not found.
+Use --disable-sm if you do not need session management support.
+])
 			fi
 		else
-			enable_sm=no
+			AC_MSG_ERROR([X support is required to build with X session management support])
 		fi
 	fi
 
@@ -482,8 +508,10 @@
 	if test "x$enable_startup_notification" = "xyes"; then
 		PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [
 			AC_MSG_RESULT(no)
-			enable_startup_notification=no
-		])
+			AC_MSG_ERROR([
+Startup notification development headers not found.
+Use --disable-startup-notification if you do not need it.
+])])
 
 		if test "x$enable_startup_notification" = "xyes"; then
 			AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
@@ -498,8 +526,10 @@
 	if test "x$enable_gtkspell" = "xyes" ; then
 		PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
 			AC_MSG_RESULT(no)
-			enable_gtkspell=no
-		])
+			AC_MSG_ERROR([
+GtkSpell development headers not found.
+Use --disable-gtkspell if you do not need it.
+])])
 		if test "x$enable_gtkspell" = "xyes" ; then
 			AC_DEFINE(USE_GTKSPELL, 1, [Define if we're using GtkSpell])
 			AC_SUBST(GTKSPELL_CFLAGS)
@@ -528,6 +558,11 @@
 			AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
 			AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 			AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+		else
+			AC_MSG_ERROR([
+Evolution development headers not found.
+Use --disable-gevolution if you do not need it.
+])
 		fi
 	fi
 
@@ -537,8 +572,10 @@
 	if test "x$enable_cap" = "xyes"; then
 		PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[
 			AC_MSG_RESULT(no)
-			enable_cap="no"
-			])
+			AC_MSG_ERROR([
+sqlite3 development headers not found.
+Use --disable-cap if you do not need the Contact Availability Prediction plugin.
+])])
 	fi
         
 
@@ -675,24 +712,39 @@
 			[], [$GSTREAMER_LIBS])
 	], [
 		AC_MSG_RESULT(no)
-		enable_gst="no"
-	])
+		AC_MSG_ERROR([
+GStreamer development headers not found.
+Use --disable-gstreamer if you do not need GStreamer (sound) support.
+])])
 fi
 
 dnl #######################################################################
 dnl # Check for Meanwhile headers (for Sametime)
 dnl #######################################################################
-PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
-	have_meanwhile="yes"
-], [
-	have_meanwhile="no"
-])
+AC_ARG_ENABLE(meanwhile,
+	[AC_HELP_STRING([--disable-meanwhile],
+		[compile without meanwhile (required for Sametime support)])],
+	enable_meanwhile="$enableval", enable_meanwhile="yes")
+if test "x$enable_meanwhile" = "xyes"; then
+	PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+		have_meanwhile="yes"
+	], [
+		have_meanwhile="no"
+		AC_MSG_ERROR([
+Meanwhile development headers not found.
+Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+])])
+fi
 AC_SUBST(MEANWHILE_CFLAGS)
 AC_SUBST(MEANWHILE_LIBS)
 
 dnl #######################################################################
 dnl # Check for Native Avahi headers (for Bonjour)
 dnl #######################################################################
+AC_ARG_ENABLE(avahi,
+	[AC_HELP_STRING([--disable-avahi],
+		[compile without avahi (required for Bonjour support)])],
+	enable_avahi="$enableval", enable_avahi="yes")
 AC_ARG_WITH(avahi-client-includes, [AC_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
 AC_ARG_WITH(avahi-client-libs, [AC_HELP_STRING([--with-avahi-client-libs=DIR], [compile the Bonjour plugin against the Avahi Client libs in DIR])], [ac_avahi_client_libs="$withval"], [ac_avahi_client_libs="no"])
 AVAHI_CFLAGS=""
@@ -724,6 +776,12 @@
 fi
 AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
 
+if test "x$enable_avahi" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
+	AC_MSG_ERROR([
+avahi development headers not found.
+Use --disable-avahi if you do not need avahi (Bonjour) support.
+])
+fi
 AC_SUBST(AVAHI_CFLAGS)
 AC_SUBST(AVAHI_LIBS)
 
@@ -1151,13 +1209,15 @@
 fi
 
 if test "x$enable_dbus" = "xyes" ; then
-	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], [
+	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60], [
 		AC_SUBST(DBUS_CFLAGS)
 		AC_SUBST(DBUS_LIBS)
 		enable_dbus=yes
 	], [
-		enable_dbus=no
-	])
+		AC_MSG_ERROR([
+D-Bus development headers not found.
+Use --disable-dbus if you do not need D-Bus support.
+])])
 
 dnl Check for libnm_glib; if we don't have it, oh well
 	if test "x$enable_libnm" = "xyes" ; then
@@ -1170,8 +1230,10 @@
 		],
 		[
 			AC_MSG_RESULT(no)
-			enable_libnm=no
-		])
+			AC_MSG_ERROR([
+NetworkManager development headers not found.
+Use --disable-nm if you do not need NetworkManager support.
+])])
 		AC_SUBST(LIBNM_CFLAGS)
 		AC_SUBST(LIBNM_LIBS)
 	fi
@@ -1319,7 +1381,10 @@
 		enable_mono=yes
 	], [
 		AC_MSG_RESULT(no)
-		enable_mono=no
+		AC_MSG_ERROR([
+Mono development headers not found.
+Use --disable-mono if you do not need Mono support.
+])
 	])
 	if test x"$enable_mono" = x"yes"; then
 		oldLIBS="$LIBS"
@@ -1354,8 +1419,9 @@
 if test "$enable_plugins" = no ; then
 	enable_perl=no
 fi
-
+looked_for_perl="no"
 if test "$enable_perl" = yes ; then
+	looked_for_perl="yes"
 	AC_PATH_PROG(perlpath, perl)
 	AC_MSG_CHECKING(for Perl compile flags)
 	PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
@@ -1482,6 +1548,13 @@
 	AM_CONDITIONAL(USE_PERL, false)
 fi
 
+if test "x$looked_for_perl" = "xyes" -a "x$enable_perl" = "xno"; then
+	AC_MSG_ERROR([
+Perl development headers not found.
+Use --disable-perl if you do not need Perl scripting support.
+])
+fi
+
 dnl #######################################################################
 dnl # SSL support
 dnl #
@@ -1491,7 +1564,7 @@
 dnl These two are inverses of each other <-- stolen from evolution!
 
 AC_ARG_ENABLE(gnutls,
-	[  --enable-gnutls=[yes,no]  attempt to use GnuTLS for SSL support (preferred) [default=yes]],
+	[  --enable-gnutls=[yes,no]  attempt to use GnuTLS for SSL support [default=yes]],
 	[enable_gnutls="$enableval"],
 	[enable_gnutls="yes"])
 
@@ -1501,13 +1574,14 @@
 	[enable_nss="yes"])
 
 msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
-
+looked_for_gnutls="no"
 dnl #
 dnl # Check for GnuTLS if it's specified.
 dnl #
 if test "x$enable_gnutls" != "xno"; then
 	enable_gnutls="no"
 	prefix=`eval echo $prefix`
+	looked_for_gnutls="yes"
 
 	AC_ARG_WITH(gnutls-includes,
 		[  --with-gnutls-includes=PREFIX   location of GnuTLS includes.],
@@ -1591,7 +1665,9 @@
 dnl #
 dnl # Check for NSS if it's specified, or if GnuTLS checks failed.
 dnl #
+looked_for_nss="no"
 if test "x$enable_nss" != "xno"; then
+	looked_for_nss="yes"
 
 	AC_ARG_WITH(nspr-includes,
 		[AC_HELP_STRING([--with-nspr-includes=PREFIX], [specify location of Mozilla nspr4 includes.])],
@@ -1871,6 +1947,24 @@
 	msg_ssl=$msg_nss
 elif test "x$msg_gnutls" != "x"; then
 	msg_ssl=$msg_gnutls
+elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes"; then
+	AC_MSG_ERROR([
+Neither GnuTLS or NSS SSL development headers found.
+Use --disable-nss --disable-gnutls if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+])
+elif test "x$looked_for_gnutls" = "xyes"; then
+	AC_MSG_ERROR([
+GnuTLS SSL development headers not found.
+Use --disable-gnutls if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without SSL support.
+])
+elif test "x$looked_for_nss" = "xyes"; then
+	AC_MSG_ERROR([
+NSS SSL development headers not found.
+Use --disable-nss if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without SSL support.
+])
 fi
 
 dnl #######################################################################
@@ -1904,6 +1998,10 @@
 	if test "$TCLCONFIG" = "no"; then
 		AC_MSG_RESULT([no])
 		enable_tcl=no
+		AC_MSG_ERROR([
+Tcl development headers not found.
+Use --disable-tcl if you do not need Tcl scripting support.
+])
 	else
 		. $TCLCONFIG
 		AC_MSG_CHECKING([Tcl version compatability])
@@ -1968,6 +2066,10 @@
 	if test "$TKCONFIG" = "no"; then
 		AC_MSG_RESULT([no])
 		enable_tk=no
+		AC_MSG_ERROR([
+Tk development headers not found.
+Use --disable-tk if you do not need Tk scripting support.
+])
 	else
 		. $TKCONFIG
 		eval "TK_LIB_SPEC=\"$TK_LIB_SPEC\""
@@ -2135,7 +2237,7 @@
 dnl # Check for check
 dnl #######################################################################
 PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
-					ifdef([AM_PATH_CHECK],
+					ifdef([[AM_PATH_CHECK]],
 					[AM_PATH_CHECK(0.8.2,:,:)],
 					[AC_MSG_RESULT([no, testing is disabled])])
 				  ])
@@ -2146,14 +2248,14 @@
 dnl #######################################################################
 dnl # Disable pixmap installation
 dnl #######################################################################
-AC_ARG_ENABLE(pixmaps-install, AC_HELP_STRING([--enable-pixmaps-install], [enable installation of pixmap files]), enable_pixmaps="$enableval", enable_pixmaps=yes)
+AC_ARG_ENABLE(pixmaps-install, AC_HELP_STRING([--disable-pixmaps-install], [disable installation of pixmap files - Pidgin still needs them!]), enable_pixmaps="$enableval", enable_pixmaps=yes)
 
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
 
 dnl #######################################################################
 dnl # Disable installation of translation files
 dnl #######################################################################
-AC_ARG_ENABLE(nls, AC_HELP_STRING([--enable-nls], [enable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
 
 AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
 
@@ -2335,6 +2437,12 @@
 if test "x$pidginpath" != "x" ; then
 	echo Warning: You have an old copy of Pidgin at $pidginpath.
 fi
+if test "x$enable_pixmaps" = "xno" ; then
+	echo
+	echo Warning: You have disabled the installation of pixmap data, but Pidgin
+	echo still requires installed pixmaps.  Be sure you know what you\'re doing.
+fi
 echo
 echo configure complete, now type \'make\'
 echo
+
--- a/doc/gtkrc-2.0	Mon Mar 31 21:23:57 2008 +0000
+++ b/doc/gtkrc-2.0	Mon Apr 28 00:01:07 2008 +0000
@@ -28,12 +28,27 @@
 # Set the widget style for IMHtml widgets in notify dialogs
 widget "*pidgin_notify_imhtml" style "imhtml-fix"
 
-# The following lets you customize the color of hyperlinks
-# and also the text cursors. The link color thing is Pidgin specific
-# but the rest work for any Gtk2 program. You can search the Gtk2
-# docs for other style properties.
+# It is safe to remove any undesired settings from the following
 style "my-style-name" {
+  # Change the color of hyperlinks.
   GtkIMHtml::hyperlink-color = "#000080"
+  # Change the color of the nick in highlighted messages, e.g. messages containing your nick
+  GtkIMHtml::highlight-name-color = "#AF7F00"
+  # Change the color of the nick in received message
+  GtkIMHtml::receive-name-color = "#cc0000"
+  # Change the color of the nick in sent message
+  GtkIMHtml::send-name-color = "#204a87"
+  # Change the color of the nick in action messages, e.g. "/me likes pidgin"
+  GtkIMHtml::action-name-color = "#062585"
+  # Change the font of the typing notification in conversation history.
+  GtkIMHtml::typing-notification-font = "italic light 8.0"
+  # Change the color of the typing notification
+  GtkIMHtml::typing-notification-color = "#ff0000"
+  # Disable the typing notification
+  GtkIMHtml::typing-notification-enable = 1
+
+  # The following settings will change the behaviour in all GTK+ applications
+  # Change the cursor color
   GtkWidget::cursor-color    = "#0000FF"
   GtkWidget::secondary-cursor-color = "#00FF00" #for mixed ltr and rtl
 }
--- a/finch/gntconv.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/gntconv.c	Mon Apr 28 00:01:07 2008 +0000
@@ -682,7 +682,7 @@
 	ggc->active_conv = conv;
 	FINCH_SET_DATA(conv, ggc);
 
-	if (cc && FINCH_GET_DATA(cc)) {
+	if (cc && FINCH_GET_DATA(cc) && cc != conv) {
 		finch_conversation_set_active(conv);
 		return;
 	}
--- a/finch/gntft.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/gntft.c	Mon Apr 28 00:01:07 2008 +0000
@@ -403,6 +403,7 @@
 	double kbps = 0.0;
 	time_t elapsed, now;
 	char *kbsec;
+	gboolean send;
 
 	if ((now = purple_xfer_get_end_time(xfer)) == 0)
 		now = time(NULL);
@@ -429,6 +430,7 @@
 	}
 	data->last_updated_time = current_time;
 
+	send = (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND);
 	size_str      = purple_str_size_to_units(purple_xfer_get_size(xfer));
 	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
 	kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
@@ -442,14 +444,17 @@
 	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_STATUS, send ? _("Sent") : _("Received"));
 		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_REMAINING, _("Finished"));
-		purple_xfer_conversation_write(xfer, msg, FALSE);
-		g_free(msg);
+		if (!send) {
+			char *msg = g_strdup_printf(_("The file was saved as %s."), purple_xfer_get_local_filename(xfer));
+			purple_xfer_conversation_write(xfer, msg, FALSE);
+			g_free(msg);
+		}
 		data->notified = TRUE;
 	} else {
-		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS, _("Transferring"));
+		gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_STATUS,
+				send ? _("Sending") : _("Receiving"));
 	}
 
 	update_title_progress();
--- a/finch/gntlog.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/gntlog.c	Mon Apr 28 00:01:07 2008 +0000
@@ -23,7 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include "internal.h"
+#include "finch.h"
 
 #include <gnt.h>
 #include <gntbox.h>
--- a/finch/libgnt/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/libgnt/Makefile.am	Mon Apr 28 00:01:07 2008 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST=genmarshal pygnt
+EXTRA_DIST=genmarshal
 
 SUBDIRS = . wms
 pkgconfigdir = $(libdir)/pkgconfig
--- a/finch/libgnt/configure.ac	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/libgnt/configure.ac	Mon Apr 28 00:01:07 2008 +0000
@@ -27,7 +27,7 @@
 m4_define([gnt_lt_current], [4])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [4])
-m4_define([gnt_micro_version], [0])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
--- a/finch/libgnt/gntentry.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/libgnt/gntentry.c	Mon Apr 28 00:01:07 2008 +0000
@@ -238,8 +238,15 @@
 		destroy_suggest(entry);
 		return FALSE;
 	} else if (count == 1) {
+		char *store = g_strndup(entry->start, entry->end - entry->start);
+		gboolean ret;
+
 		destroy_suggest(entry);
-		return complete_suggest(entry, sgst);
+		complete_suggest(entry, sgst);
+
+		ret = (strncmp(store, entry->start, entry->end - entry->start) != 0);
+		g_free(store);
+		return ret;
 	} else {
 		if (max > 0) {
 			GntWidget *ddown = entry->ddown;
--- a/finch/libgnt/gntmain.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/finch/libgnt/gntmain.c	Mon Apr 28 00:01:07 2008 +0000
@@ -245,8 +245,11 @@
 	}
 
 	rd += HOLDING_ESCAPE;
-	if (HOLDING_ESCAPE)
+	if (HOLDING_ESCAPE) {
 		keys[0] = '\033';
+		g_source_remove(escape_stuff.timer);
+		escape_stuff.timer = 0;
+	}
 	keys[rd] = 0;
 	gnt_wm_set_event_stack(wm, TRUE);
 
@@ -271,12 +274,6 @@
 		int p;
 
 		if (k[0] == '\033' && rd == 1) {
-			if (escape_stuff.timer) {
-				gnt_wm_process_input(wm, "\033\033");
-				g_source_remove(escape_stuff.timer);
-				escape_stuff.timer = 0;
-				break;
-			}
 			escape_stuff.timer = g_timeout_add(250, escape_timeout, NULL);
 			break;
 		}
--- a/finch/libgnt/pygnt/Files.txt	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-gendef.sh
-gnt.override
-Makefile
-test.py
-dbus-gnt
-gntmodule.c
--- a/finch/libgnt/pygnt/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-EXTRA_DIST = gendef.sh
-
-pg_LTLIBRARIES = gnt.la
-
-pgdir = $(libdir)
-
-sources = \
-	gnt.def \
-	gnt.override \
-	gntbox.override \
-	gntfilesel.override \
-	gnttree.override \
-	gntwidget.override
-
-gnt_la_SOURCES = gnt.c common.c common.h gntmodule.c
-
-gnt_la_LDFLAGS = -module -avoid-version \
-	`pkg-config --libs pygobject-2.0`
-
-gnt_la_LIBADD = \
-	$(GLIB_LIBS) \
-	../libgnt.la
-
-AM_CPPFLAGS = \
-	-I../ \
-	$(GLIB_CFLAGS) \
-	$(GNT_CFLAGS)  \
-	-I/usr/include/python2.4 \
-	`pkg-config --cflags pygobject-2.0`
-
-CLEANFILES = gnt.def gnt.c gnt.defe
-
-gnt.def: $(srcdir)/../*.h
-	$(srcdir)/gendef.sh
-
-gnt.c: $(sources)
-	pygtk-codegen-2.0 --prefix gnt \
-	--override gnt.override \
-	gnt.def > $@
-
--- a/finch/libgnt/pygnt/Makefile.make	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-CC = gcc
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.4/ -I.. -g -O0
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 gnt`
- 
-gnt.so: gnt.o gntmodule.o common.o
-	$(CC) $(LDFLAGS) -shared $^ -o $@
-
-gnt.c: gnt.def *.override common.c common.h
-	pygtk-codegen-2.0 --prefix gnt \
-	--override gnt.override \
-	gnt.def > $@
-
-#python codegen/codegen.py --prefix gnt \
-
-clean:
-	@rm *.so *.o gnt.c
--- a/finch/libgnt/pygnt/README.txt	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-Run these in sequence:
-
-./gendef.sh
-make -f Makefile.make gnt.so
--- a/finch/libgnt/pygnt/common.c	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#include "common.h"
-
-PyObject *
-create_pyobject_from_string_list(GList *list)
-{
-	PyObject *py_list;
-	if (list == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-	if ((py_list = PyList_New(0)) == NULL) {
-		g_list_foreach(list, (GFunc)g_free, NULL);
-		g_list_free(list);
-		return NULL;
-	}
-	while (list) {
-		PyObject *obj = PyString_FromString(list->data);
-		PyList_Append(py_list, obj);
-		Py_DECREF(obj);
-		g_free(list->data);
-		list = g_list_delete_link(list, list);
-	}
-	return py_list;
-}
--- a/finch/libgnt/pygnt/common.h	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#include "Python.h"
-#include "gnt.h"
-
-PyObject *create_pyobject_from_string_list(GList *list);
-
--- a/finch/libgnt/pygnt/dbus-gnt	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-#!/usr/bin/env python
-
-# This script requires Python 2.4 and pygnt bindings
-#
-# Note that all function names are resolved dynamically, no
-# purple-specific library is needed.
-
-import dbus
-import dbus.glib
-import dbus.decorators
-import gobject
-import os
-import gnt
-import sys
-
-import time
-
-convwins = {}
-
-def buddysignedon(buddy):
-    pass
-
-def conv_closed(conv):
-    key = get_dict_key(conv)
-    stuff = convwins[key]
-    stuff[0].destroy()
-    # if a conv window is closed, then reopened, this thing crashes
-    convwins[key] = None
-
-def add_message(conv, who, msg, flags, timestamp):
-    stuff = show_conversation(conv, False)
-    tv = stuff[1]
-    tv.append_text_with_flags("\n", 0)
-    if timestamp:
-        tv.append_text_with_flags(time.strftime("(%X) ", time.localtime(timestamp)), 8)
-    else:
-        tv.append_text_with_flags(time.strftime("(%X) "), 8)
-    if flags & 3:
-        tv.append_text_with_flags(who + ": ", 1)
-        msg = purple.PurpleMarkupStripHtml(msg)
-        tv.append_text_with_flags(msg, 0)
-        stuff[0].set_urgent()
-    else:
-        tv.append_text_with_flags(msg, 8)
-    tv.scroll(0)
-
-def wrote_msg(account, who, msg, conv, flags):
-    add_message(conv, who, msg, flags, None)
-
-bus = dbus.SessionBus()
-obj = bus.get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
-purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
-
-bus.add_signal_receiver(buddysignedon,
-                        dbus_interface = "im.pidgin.purple.PurpleInterface",
-                        signal_name = "BuddySignedOn")
-
-bus.add_signal_receiver(wrote_msg,
-                        dbus_interface = "im.pidgin.purple.PurpleInterface",
-                        signal_name = "WroteImMsg")
-
-bus.add_signal_receiver(wrote_msg,
-                        dbus_interface = "im.pidgin.purple.PurpleInterface",
-                        signal_name = "WroteChatMsg")
-
-bus.add_signal_receiver(conv_closed,
-                        dbus_interface = "im.pidgin.purple.PurpleInterface",
-                        signal_name = "DeletingConversation")
-
-def get_dict_key(conv):
-    val = purple.PurpleConversationGetName(conv)
-    return val
-
-def send_im_cb(entry, key, conv):
-    if key[0] == '\r':
-        # XXX: do something about the / commands
-        type = purple.PurpleConversationGetType(conv)
-        if type == 1:
-            imdata = purple.PurpleConversationGetImData(conv)
-            purple.PurpleConvImSend(imdata, entry.get_text())
-        else:
-            chatdata = purple.PurpleConversationGetChatData(conv)
-            purple.PurpleConvChatSend(chatdata, entry.get_text())
-        entry.clear()
-
-def conv_window_destroyed(win, key):
-    del convwins[key]
-
-def show_conversation(conv, history):
-    key = get_dict_key(conv)
-    if key in convwins:
-        return convwins[key]
-    win = gnt.Window()
-    vbox = gnt.Box(0, 1)
-    win.add_widget(vbox)
-    win.set_title(purple.PurpleConversationGetName(conv))
-    win.set_pad(0)
-    vbox.set_pad(0)
-    tv = gnt.TextView()
-    entry = gnt.Entry("")
-    vbox.add_widget(tv)
-    entry.set_size(40, 1)
-    vbox.add_widget(entry)
-    entry.connect("key_pressed", send_im_cb, conv)
-    tv.clear()
-    tv.attach_scroll_widget(entry)
-    win.show()
-    convwins[key] = [win, tv, entry]
-    win.connect("destroy", conv_window_destroyed, key)
-    
-    if history:
-        msgs = purple.PurpleConversationGetMessageHistory(conv)
-        msgs.reverse()
-        for msg in msgs:
-            who = purple.PurpleConversationMessageGetSender(msg)
-            what = purple.PurpleConversationMessageGetMessage(msg)
-            flags = purple.PurpleConversationMessageGetFlags(msg)
-            when = purple.PurpleConversationMessageGetTimestamp(msg)
-            add_message(conv, who, what, flags, when)
-
-    return convwins[key]
-
-def show_buddylist():
-    win = gnt.Window()
-    tree = gnt.Tree()
-    tree.set_property("columns", 1)
-    win.add_widget(tree)
-    node = purple.PurpleBlistGetRoot()
-    while node:
-        if purple.PurpleBlistNodeIsGroup(node):
-            sys.stderr.write(str(node) + "\n")
-            tree.add_row_after(str(node), ["asd", ""], None, None)
-            #tree.add_row_after(node, [str(purple.PurpleGroupGetName(node)), ""], None, None)
-            #tree.add_row_after(node, ["aasd", ""], None, None)
-        elif purple.PurpleBlistNodeIsContact(node):
-            buddy = purple.PurpleContactGetPriorityBuddy(node)
-            group = purple.PurpleBuddyGetGroup(buddy)
-            #tree.add_row_after(node, [str(purple.PurpleBuddyGetName(buddy)), ""], group, None)
-
-        node = purple.PurpleBlistNodeNext(node, False)
-    win.show()
-
-gnt.gnt_init()
-
-# show_buddylist()
-
-convs = purple.PurpleGetConversations()
-for conv in convs:
-    show_conversation(conv, True)
-
-gnt.gnt_main()
-
-gnt.gnt_quit()
-
--- a/finch/libgnt/pygnt/example/rss/gnthtml.py	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-
-"""
-gr - An RSS-reader built using libgnt and feedparser.
-
-Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
-
-This application is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This application 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this application; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
-USA
-"""
-
-"""
-This file defines GParser, which is a simple HTML parser to display HTML
-in a GntTextView nicely.
-"""
-
-import sgmllib
-import gnt
-
-class GParser(sgmllib.SGMLParser):
-    def __init__(self, view):
-        sgmllib.SGMLParser.__init__(self, False)
-        self.link = None
-        self.view = view
-        self.flag = gnt.TEXT_FLAG_NORMAL
-
-    def parse(self, s):
-        self.feed(s)
-        self.close()
-
-    def unknown_starttag(self, tag, attrs):
-        if tag in ["b", "i", "blockquote", "strong"]:
-            self.flag = self.flag | gnt.TEXT_FLAG_BOLD
-        elif tag in ["p", "hr", "br"]:
-            self.view.append_text_with_flags("\n", self.flag)
-        else:
-            print tag
-
-    def unknown_endtag(self, tag):
-        if tag in ["b", "i", "blockquote", "strong"]:
-            self.flag = self.flag & ~gnt.TEXT_FLAG_BOLD
-        elif tag in ["p", "hr", "br"]:
-            self.view.append_text_with_flags("\n", self.flag)
-        else:
-            print tag
-
-    def start_u(self, attrs):
-        self.flag = self.flag | gnt.TEXT_FLAG_UNDERLINE
-
-    def end_u(self):
-        self.flag = self.flag & ~gnt.TEXT_FLAG_UNDERLINE
-
-    def start_a(self, attributes):
-        for name, value in attributes:
-            if name == "href":
-                self.link = value
-
-    def do_img(self, attrs):
-        for name, value in attrs:
-            if name == 'src':
-                self.view.append_text_with_flags("[img:" + value + "]", self.flag)
-
-    def end_a(self):
-        if not self.link:
-            return
-        self.view.append_text_with_flags(" (", self.flag)
-        self.view.append_text_with_flags(self.link, self.flag | gnt.TEXT_FLAG_UNDERLINE)
-        self.view.append_text_with_flags(")", self.flag)
-        self.link = None
-
-    def handle_data(self, data):
-        if len(data.strip()) == 0:
-            return
-        self.view.append_text_with_flags(data, self.flag)
-
--- a/finch/libgnt/pygnt/example/rss/gntrss-ui.py	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,400 +0,0 @@
-#!/usr/bin/env python
-
-"""
-gr - An RSS-reader built using libgnt and feedparser.
-
-Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
-
-This application is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This application 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this application; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
-USA
-"""
-
-"""
-This file deals with the UI part (gnt) of the application
-
-TODO:
-    - Allow showing feeds of only selected 'category' and/or 'priority'. A different
-      window should be used to change such filtering.
-    - Display details of each item in its own window.
-    - Add search capability, and allow searching only in title/body. Also allow
-      filtering in the search results.
-    - Show the data and time for feed items (probably in a separate column .. perhaps not)
-    - Have a simple way to add a feed.
-    - Allow renaming a feed.
-"""
-
-import gntrss
-import gnthtml
-import gnt
-import gobject
-import sys
-
-__version__ = "0.0.1alpha"
-__author__ = "Sadrul Habib Chowdhury (sadrul@pidgin.im)"
-__copyright__ = "Copyright 2007, Sadrul Habib Chowdhury"
-__license__ = "GPL" # see full license statement above
-
-gnt.gnt_init()
-
-class RssTree(gnt.Tree):
-    __gsignals__ = {
-        'active_changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
-    }
-
-    __gntbindings__ = {
-        'jump-next-unread' : ('jump_next_unread', 'n')
-    }
-
-    def jump_next_unread(self, null):
-        first = None
-        next = None
-        all = self.get_rows()
-        for item in all:
-            if item.unread:
-                if next:
-                    first = item
-                    break
-                elif not first and self.active != item:
-                    first = item
-            if self.active == item:
-                next = item
-        if first:
-            self.set_active(first)
-            self.set_selected(first)
-        return True
-
-    def __init__(self):
-        self.active = None
-        gnt.Tree.__init__(self)
-        gnt.set_flag(self, 8)    # remove borders
-        self.connect('key_pressed', self.do_key_pressed)
-
-    def set_active(self, active):
-        if self.active == active:
-            return
-        if self.active:
-            flag = gnt.TEXT_FLAG_NORMAL
-            if self.active.unread:
-                flag = flag | gnt.TEXT_FLAG_BOLD
-            self.set_row_flags(self.active, flag)
-        old = self.active
-        self.active = active
-        flag = gnt.TEXT_FLAG_UNDERLINE
-        if self.active.unread:
-            flag = flag | gnt.TEXT_FLAG_BOLD
-        self.set_row_flags(self.active, flag)
-        self.emit('active_changed', old)
-
-    def do_key_pressed(self, null, text):
-        if text == '\r':
-            now = self.get_selection_data()
-            self.set_active(now)
-            return True
-        return False
-
-gobject.type_register(RssTree)
-gnt.register_bindings(RssTree)
-
-win = gnt.Box(homo = False, vert = True)
-win.set_toplevel(True)
-win.set_title("GntRss")
-win.set_pad(0)
-
-#
-# [[[ Generic feed/item callbacks
-#
-def feed_item_added(feed, item):
-    add_feed_item(item)
-
-def add_feed(feed):
-    if not feed.get_data('gntrss-connected'):
-        feed.connect('added', feed_item_added)
-        feed.connect('notify', update_feed_title)
-        feed.set_data('gntrss-connected', True)
-    feeds.add_row_after(feed, [feed.title, str(feed.unread)], None, None)
-
-def remove_item(item, feed):
-    items.remove(item)
-
-def update_feed_item(item, property):
-    if property.name == 'unread':
-        if feeds.active == item.parent:
-            flag = 0
-            if item == items.active:
-                flag = gnt.TEXT_FLAG_UNDERLINE
-            if item.unread:
-                flag = flag | gnt.TEXT_FLAG_BOLD
-            else:
-                flag = flag | gnt.TEXT_FLAG_NORMAL
-            items.set_row_flags(item, flag)
-
-        unread = item.parent.unread
-        if item.unread:
-            unread = unread + 1
-        else:
-            unread = unread - 1
-        item.parent.set_property('unread', unread)
-
-def add_feed_item(item):
-    currentfeed = feeds.active
-    if item.parent != currentfeed:
-        return
-    months = ["", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-    dt = str(item.date_parsed[2]) + "." + months[item.date_parsed[1]] + "." + str(item.date_parsed[0])
-    items.add_row_after(item, [str(item.title), dt], None, None)
-    if item.unread:
-        items.set_row_flags(item, gnt.TEXT_FLAG_BOLD)
-    if not item.get_data('gntrss-connected'):
-        item.set_data('gntrss-connected', True)
-        # this needs to happen *without* having to add the item in the tree
-        item.connect('notify', update_feed_item)
-        item.connect('delete', remove_item)
-
-#
-# ]]] Generic feed/item callbacks
-#
-
-
-####
-# [[[ The list of feeds
-###
-
-# 'Add Feed' dialog
-add_feed_win = None
-def add_feed_win_closed(win):
-    global add_feed_win
-    add_feed_win = None
-
-def add_new_feed():
-    global add_feed_win
-
-    if add_feed_win:
-        gnt.gnt_window_present(add_feed_win)
-        return
-    win = gnt.Window()
-    win.set_title("New Feed")
-
-    box = gnt.Box(False, False)
-    label = gnt.Label("Link")
-    box.add_widget(label)
-    entry = gnt.Entry("")
-    entry.set_size(40, 1)
-    box.add_widget(entry)
-
-    win.add_widget(box)
-    win.show()
-    add_feed_win = win
-    add_feed_win.connect("destroy", add_feed_win_closed)
-
-#
-# The active row in the feed-list has changed. Update the feed-item table.
-def feed_active_changed(tree, old):
-    items.remove_all()
-    if not tree.active:
-        return
-    update_items_title()
-    for item in tree.active.items:
-        add_feed_item(item)
-    win.give_focus_to_child(items)
-
-#
-# Check for the action keys and decide how to deal with them.
-def feed_key_pressed(tree, text):
-    if tree.is_searching():
-        return
-    if text == 'r':
-        feed = tree.get_selection_data()
-        tree.perform_action_key('j')
-        #tree.perform_action('move-down')
-        feed.refresh()
-    elif text == 'R':
-        feeds = tree.get_rows()
-        for feed in feeds:
-            feed.refresh()
-    elif text == 'm':
-        feed = tree.get_selection_data()
-        if feed:
-            feed.mark_read()
-            feed.set_property('unread', 0)
-    elif text == 'a':
-        add_new_feed()
-    else:
-        return False
-    return True
-
-feeds = RssTree()
-feeds.set_property('columns', 2)
-feeds.set_col_width(0, 20)
-feeds.set_col_width(1, 6)
-feeds.set_column_resizable(0, False)
-feeds.set_column_resizable(1, False)
-feeds.set_column_is_right_aligned(1, True)
-feeds.set_show_separator(False)
-feeds.set_column_title(0, "Feeds")
-feeds.set_show_title(True)
-
-feeds.connect('active_changed', feed_active_changed)
-feeds.connect('key_pressed', feed_key_pressed)
-gnt.unset_flag(feeds, 256)   # Fix the width
-
-####
-# ]]] The list of feeds
-###
-
-####
-# [[[ The list of items in the feed
-####
-
-#
-# The active item in the feed-item list has changed. Update the
-# summary content.
-def item_active_changed(tree, old):
-    details.clear()
-    if not tree.active:
-        return
-    item = tree.active
-    details.append_text_with_flags(str(item.title) + "\n", gnt.TEXT_FLAG_BOLD)
-    details.append_text_with_flags("Link: ", gnt.TEXT_FLAG_BOLD)
-    details.append_text_with_flags(str(item.link) + "\n", gnt.TEXT_FLAG_UNDERLINE)
-    details.append_text_with_flags("Date: ", gnt.TEXT_FLAG_BOLD)
-    details.append_text_with_flags(str(item.date) + "\n", gnt.TEXT_FLAG_NORMAL)
-    details.append_text_with_flags("\n", gnt.TEXT_FLAG_NORMAL)
-    parser = gnthtml.GParser(details)
-    parser.parse(str(item.summary))
-    item.mark_unread(False)
-
-    if old and old.unread:   # If the last selected item is marked 'unread', then make sure it's bold
-        items.set_row_flags(old, gnt.TEXT_FLAG_BOLD)
-
-#
-# Look for action keys in the feed-item list.
-def item_key_pressed(tree, text):
-    if tree.is_searching():
-        return
-    current = tree.get_selection_data()
-    if text == 'M':     # Mark all of the items 'read'
-        feed = feeds.active
-        if feed:
-            feed.mark_read()
-    elif text == 'm':     # Mark the current item 'read'
-        current.mark_unread(False)
-        tree.perform_action_key('j')
-    elif text == 'U':     # Mark the current item 'unread'
-        current.mark_unread(True)
-    elif text == 'd':
-        current.remove()
-        tree.perform_action_key('j')
-    else:
-        return False
-    return True
-
-items = RssTree()
-items.set_property('columns', 2)
-items.set_col_width(0, 40)
-items.set_col_width(1, 11)
-items.set_column_resizable(1, False)
-items.set_column_title(0, "Items")
-items.set_column_title(1, "Date")
-items.set_show_title(True)
-items.connect('key_pressed', item_key_pressed)
-items.connect('active_changed', item_active_changed)
-
-####
-# ]]] The list of items in the feed
-####
-
-#
-# Update the title of the items list depending on the selection in the feed list
-def update_items_title():
-    feed = feeds.active
-    if feed:
-        items.set_column_title(0, str(feed.title) + ": " + str(feed.unread) + "(" + str(len(feed.items)) + ")")
-    else:
-        items.set_column_title(0, "Items")
-    items.draw()
-
-# The container on the top
-line = gnt.Line(vertical = False)
-
-# The textview to show the details of a feed
-details = gnt.TextView()
-details.set_take_focus(True)
-details.set_flag(gnt.TEXT_VIEW_TOP_ALIGN)
-details.attach_scroll_widget(details)
-
-# Make it look nice
-s = feeds.get_size()
-size = gnt.screen_size()
-size[0] = size[0] - s[0]
-items.set_size(size[0], size[1] / 2)
-details.set_size(size[0], size[1] / 2)
-
-# Category tree
-cat = gnt.Tree()
-cat.set_property('columns', 1)
-cat.set_column_title(0, 'Category')
-cat.set_show_title(True)
-gnt.set_flag(cat, 8)    # remove borders
-
-box = gnt.Box(homo = False, vert = False)
-box.set_pad(0)
-
-vbox = gnt.Box(homo = False, vert = True)
-vbox.set_pad(0)
-vbox.add_widget(feeds)
-vbox.add_widget(gnt.Line(False))
-vbox.add_widget(cat)
-box.add_widget(vbox)
-
-box.add_widget(gnt.Line(True))
-
-vbox = gnt.Box(homo = False, vert = True)
-vbox.set_pad(0)
-vbox.add_widget(items)
-vbox.add_widget(gnt.Line(False))
-vbox.add_widget(details)
-box.add_widget(vbox)
-
-win.add_widget(box)
-win.show()
-
-def update_feed_title(feed, property):
-    if property.name == 'title':
-        if feed.customtitle:
-            title = feed.customtitle
-        else:
-            title = feed.title
-        feeds.change_text(feed, 0, title)
-    elif property.name == 'unread':
-        feeds.change_text(feed, 1, str(feed.unread) + "(" + str(len(feed.items)) + ")")
-        flag = 0
-        if feeds.active == feed:
-            flag = gnt.TEXT_FLAG_UNDERLINE
-            update_items_title()
-        if feed.unread > 0:
-            flag = flag | gnt.TEXT_FLAG_BOLD
-        feeds.set_row_flags(feed, flag)
-
-# populate everything
-for feed in gntrss.feeds:
-    feed.refresh()
-    feed.set_auto_refresh(True)
-    add_feed(feed)
-
-gnt.gnt_register_action("Stuff", add_new_feed)
-gnt.gnt_main()
-
-gnt.gnt_quit()
-
--- a/finch/libgnt/pygnt/example/rss/gntrss.py	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-#!/usr/bin/env python
-
-"""
-gr - An RSS-reader built using libgnt and feedparser.
-
-Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
-
-This application is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This application 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this application; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
-USA
-"""
-
-"""
-This file deals with the rss parsing part (feedparser) of the application
-"""
-
-import os
-import tempfile, urllib2
-import feedparser
-import gobject
-import sys
-import time
-
-##
-# The FeedItem class. It will update emit 'delete' signal when it's
-# destroyed.
-##
-class FeedItem(gobject.GObject):
-    __gproperties__ = {
-        'unread' : (gobject.TYPE_BOOLEAN, 'read',
-            'The unread state of the item.',
-            False, gobject.PARAM_READWRITE)
-    }
-    __gsignals__ = {
-        'delete' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
-    }
-    def __init__(self, item, parent):
-        self.__gobject_init__()
-        try:
-            "Apparently some feed items don't have any dates in them"
-            self.date = item['date']
-            self.date_parsed = item['date_parsed']
-        except:
-            item['date'] = self.date = time.ctime()
-            self.date_parsed = feedparser._parse_date(self.date)
-
-        self.title = item['title'].encode('utf8')
-        self.summary = item['summary'].encode('utf8')
-        self.link = item['link']
-        self.parent = parent
-        self.unread = True
-
-    def __del__(self):
-        pass
-
-    def remove(self):
-        self.emit('delete', self.parent)
-        if self.unread:
-            self.parent.set_property('unread', self.parent.unread - 1)
-
-    def do_set_property(self, property, value):
-        if property.name == 'unread':
-            self.unread = value
-
-    def mark_unread(self, unread):
-        if self.unread == unread:
-            return
-        self.set_property('unread', unread)
-
-gobject.type_register(FeedItem)
-
-def item_hash(item):
-    return str(item['title'])
-
-"""
-The Feed class. It will update the 'link', 'title', 'desc' and 'items'
-attributes if/when they are updated (triggering 'notify::<attr>' signal)
-
-TODO:
-    - Add a 'count' attribute
-    - Each feed will have a 'uidata', which will be its display window
-    - Look into 'category'. Is it something that feed defines, or the user?
-    - Have separate refresh times for each feed.
-    - Have 'priority' for each feed. (somewhat like category, perhaps?)
-"""
-class Feed(gobject.GObject):
-    __gproperties__ = {
-        'link' : (gobject.TYPE_STRING, 'link',
-            'The web page this feed is associated with.',
-            '...', gobject.PARAM_READWRITE),
-        'title' : (gobject.TYPE_STRING, 'title',
-            'The title of the feed.',
-            '...', gobject.PARAM_READWRITE),
-        'desc' : (gobject.TYPE_STRING, 'description',
-            'The description for the feed.',
-            '...', gobject.PARAM_READWRITE),
-        'items' : (gobject.TYPE_POINTER, 'items',
-            'The items in the feed.', gobject.PARAM_READWRITE),
-        'unread' : (gobject.TYPE_INT, 'unread',
-            'Number of unread items in the feed.', 0, 10000, 0, gobject.PARAM_READWRITE)
-    }
-    __gsignals__ = {
-        'added' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
-    }
-
-    def __init__(self, feed):
-        self.__gobject_init__()
-        url = feed['link']
-        name = feed['name']
-        self.url = url           # The url of the feed itself
-        self.link = url          # The web page associated with the feed
-        self.desc = url
-        self.title = (name, url)[not name]
-        self.customtitle = name
-        self.unread = 0
-        self.items = []
-        self.hash = {}
-        self.pending = False
-        self._refresh = {'time' : 30, 'id' : 0}
-
-    def __del__(self):
-        pass
-
-    def do_set_property(self, property, value):
-        if property.name == 'link':
-            self.link = value
-        elif property.name == 'desc':
-            self.desc = value
-        elif property.name == 'title':
-            self.title = value
-        elif property.name == 'unread':
-            self.unread = value
-        pass
-
-    def set_result(self, result):
-        # XXX Look at result['bozo'] first, and emit some signal that the UI can use
-        # to indicate (dim the row?) that the feed has invalid XML format or something
-
-        try:
-            channel = result['channel']
-            self.set_property('link', channel['link'])
-            self.set_property('desc', channel['description'])
-            self.set_property('title', channel['title'])
-            items = result['items']
-        except:
-            items = ()
-
-        tmp = {}
-        for item in self.items:
-            tmp[hash(item)] = item
-
-        unread = self.unread
-        for item in items:
-            try:
-                exist = self.hash[item_hash(item)]
-                del tmp[hash(exist)]
-            except:
-                itm = FeedItem(item, self)
-                self.items.append(itm)
-                self.emit('added', itm)
-                self.hash[item_hash(item)] = itm
-                unread = unread + 1
-
-        if unread != self.unread:
-            self.set_property('unread', unread)
-
-        for hv in tmp:
-            self.items.remove(tmp[hv])
-            tmp[hv].remove()
-            "Also notify the UI about the count change"
-
-        self.pending = False
-        return False
-
-    def refresh(self):
-        if self.pending:
-            return
-        self.pending = True
-        FeedReader(self).run()
-        return True
-
-    def mark_read(self):
-        for item in self.items:
-            item.mark_unread(False)
-
-    def set_auto_refresh(self, auto):
-        if auto:
-            if self._refresh['id']:
-                return
-            if self._refresh['time'] < 1:
-                self._refresh['time'] = 1
-            self.id = gobject.timeout_add(self._refresh['time'] * 1000 * 60, self.refresh)
-        else:
-            if not self._refresh['id']:
-                return
-            gobject.source_remove(self._refresh['id'])
-            self._refresh['id'] = 0
-
-gobject.type_register(Feed)
-
-"""
-The FeedReader updates a Feed. It fork()s off a child to avoid blocking.
-"""
-class FeedReader:
-    def __init__(self, feed):
-        self.feed = feed
-
-    def reap_child(self, pid, status):
-        result = feedparser.parse(self.tmpfile.name)
-        self.tmpfile.close()
-        self.feed.set_result(result)
-
-    def run(self):
-        self.tmpfile = tempfile.NamedTemporaryFile()
-        self.pid = os.fork()
-        if self.pid == 0:
-            tmp = urllib2.urlopen(self.feed.url)
-            content = tmp.read()
-            tmp.close()
-            self.tmpfile.write(content)
-            self.tmpfile.flush()
-            # Do NOT close tmpfile here
-            os._exit(os.EX_OK)
-        gobject.child_watch_add(self.pid, self.reap_child)
-
-feeds = []
-urls = (
-    {'name': '/.',
-     'link': "http://rss.slashdot.org/Slashdot/slashdot"},
-    {'name': 'KernelTrap',
-     'link': "http://kerneltrap.org/node/feed"},
-    {'name': None,
-     'link': "http://pidgin.im/rss.php"},
-    {'name': "F1",
-     'link': "http://www.formula1.com/rss/news/latest.rss"},
-    {'name': "Freshmeat",
-     'link': "http://www.pheedo.com/f/freshmeatnet_announcements_unix"},
-    {'name': "Cricinfo",
-     'link': "http://www.cricinfo.com/rss/livescores.xml"}
-)
-
-for url in urls:
-    feed = Feed(url)
-    feeds.append(feed)
-
--- a/finch/libgnt/pygnt/file.py	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-import gnt, sys
-
-def file_selected(widget, path, file, null):
-	sys.stderr.write(path + " " + file)
-	list = widget.get_selected_multi_files()
-	for i in list:
-		sys.stderr.write(i)
-
-gnt.gnt_init()
-
-win = gnt.Window()
-
-files = gnt.FileSel()
-files.set_multi_select(True)
-files.set_title("Files")
-files.connect("file_selected", file_selected, None)
-
-files.show()
-
-gnt.gnt_main()
-
-gnt.gnt_quit()
--- a/finch/libgnt/pygnt/gendef.sh	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#!/bin/sh
-FILES="
-	gntwidget.h
-	gntbindable.h
-	gntbox.h
-	gntbutton.h
-	gntcheckbox.h
-	gntclipboard.h
-	gntcolors.h
-	gntcombobox.h
-	gntentry.h
-	gntfilesel.h
-	gntkeys.h
-	gntlabel.h
-	gntline.h
-	gntmarshal.h
-	gntmenu.h
-	gntmenuitem.h
-	gntmenuitemcheck.h
-	gntslider.h
-	gntstyle.h
-	gnttextview.h
-	gnttree.h
-	gntutils.h
-	gntwindow.h
-	gntwm.h
-	gntws.h
-	gnt.h"
-
-# Generate the def file
-rm -f gnt.def
-for file in $FILES
-do
-	echo -n "Generating definitions for ${file} ... "
-	python /usr/share/pygtk/2.0/codegen/h2def.py ../$file >> gnt.def
-	echo "Done"
-done
-
-# Remove the definitions about the enums
-ENUMS="
-GNT_TYPE_ALIGNMENT
-GNT_TYPE_COLOR_TYPE
-GNT_TYPE_MENU_TYPE
-GNT_TYPE_STYLE
-GNT_TYPE_KEY_PRESS_MODE
-GNT_TYPE_ENTRY_FLAG
-GNT_TYPE_TEXT_FORMAT_FLAGS
-GNT_TYPE_TEXT_VIEW_FLAG
-"
-
-for enum in $ENUMS
-do
-	sed -ie s/^.*gtype-id\ \"$enum\".*$//g gnt.def
-done
-
-
--- a/finch/libgnt/pygnt/gnt.override	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-%%
-headers
-#include <Python.h>
-#include "pygobject.h"
-#include "gnt.h"
-#include "gntbindable.h"
-#include "gntwidget.h"
-#include "gntbox.h"
-#include "gntbutton.h"
-#include "gntcheckbox.h"
-#include "gntcolors.h"
-#include "gntcombobox.h"
-#include "gntentry.h"
-#include "gntfilesel.h"
-#include "gntkeys.h"
-#include "gntlabel.h"
-#include "gntline.h"
-#include "gntmenu.h"
-#include "gntmenuitem.h"
-#include "gntmenuitemcheck.h"
-#include "gntslider.h"
-#include "gntstyle.h"
-#include "gnttextview.h"
-#include "gnttree.h"
-#include "gntutils.h"
-#include "gntwindow.h"
-#include "gntwm.h"
-#include "gntws.h"
-#include "common.h"
-%%
-include
- gntbox.override
- gntfilesel.override
- gnttree.override
- gntwidget.override
-%%
-modulename gnt
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore-glob
-	*_get_gtype
-%%
-define set_flag
-static PyObject *
-_wrap_set_flag(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = {"flags", NULL};
-	PyGObject *widget;
-	int flags;
-
-	if (!PyArg_ParseTuple(args, "O!i:gnt.set_flag", &PyGntWidget_Type, &widget,
-				&flags)) {
-		return NULL;
-	}
-
-	GNT_WIDGET_SET_FLAGS(widget->obj, flags);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-define unset_flag
-static PyObject *
-_wrap_unset_flag(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = {"flags", NULL};
-	PyGObject *widget;
-	int flags;
-
-	if (!PyArg_ParseTuple(args, "O!i:gnt.unset_flag", &PyGntWidget_Type, &widget,
-				&flags)) {
-		return NULL;
-	}
-
-	GNT_WIDGET_UNSET_FLAGS(widget->obj, flags);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-define screen_size noargs
-static PyObject *
-_wrap_screen_size(PyObject *self)
-{
-	PyObject *list = PyList_New(0);
-
-	if (list == NULL)
-		return NULL;
-
-	PyList_Append(list, PyInt_FromLong((long)getmaxx(stdscr)));
-	PyList_Append(list, PyInt_FromLong((long)getmaxy(stdscr)));
-
-	return list;
-}
-%%
-override gnt_register_action
-static GHashTable *actions;
-
-
-
-static PyObject *
-_wrap_gnt_register_action(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = {"name", "callback", NULL};
-	PyGObject *callback;
-	GClosure *closure;
-	char *name;
-
-	if (!PyArg_ParseTuple(args, "sO:gnt.gnt_register_action", &name, &callback)) {
-		return NULL;
-	}
-
-	if (!PyCallable_Check(callback)) {
-		PyErr_SetString(PyExc_TypeError, "the callback must be callable ... doh!");
-		return NULL;
-	}
-
-	gnt_register_action(name, callback->obj);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-define register_bindings
-
-static gboolean
-pygnt_binding_callback(GntBindable *bindable, GList *list)
-{
-	PyObject *wrapper = pygobject_new(G_OBJECT(bindable));
-	PyObject_CallMethod(wrapper, list->data, "O", Py_None);
-	Py_DECREF(wrapper);
-	return TRUE;
-}
-
-static PyObject *
-_wrap_register_bindings(PyObject *self, PyObject *args)
-{
-	PyTypeObject *class;
-	int pos = 0;
-	PyObject *key, *value, *gbindings;
-	GntBindableClass *bindable;
-
-	if (!PyArg_ParseTuple(args, "O!:gnt.register_bindings",
-				&PyType_Type, &class)) {
-		/* Make sure it's a GntBindableClass subclass */
-		PyErr_SetString(PyExc_TypeError,
-				"argument must be a GntBindable subclass");
-		return NULL;
-	}
-
-	gbindings = PyDict_GetItemString(class->tp_dict, "__gntbindings__");
-	if (!gbindings)
-		goto end;
-
-	if (!PyDict_Check(gbindings)) {
-		PyErr_SetString(PyExc_TypeError,
-				"__gntbindings__ attribute not a dict!");
-		return NULL;
-	}
-
-	bindable = g_type_class_ref(pyg_type_from_object((PyObject *)class));
-	while (PyDict_Next(gbindings, &pos, &key, &value)) {
-		const char *trigger, *callback, *name;
-		GList *list = NULL;
-
-		if (!PyString_Check(key)) {
-			PyErr_SetString(PyExc_TypeError,
-					"__gntbindings__ keys must be strings");
-			g_type_class_unref(bindable);
-			return NULL;
-		}
-		name = PyString_AsString(key);
-
-		if (!PyTuple_Check(value) ||
-				!PyArg_ParseTuple(value, "ss", &callback, &trigger)) {
-			PyErr_SetString(PyExc_TypeError,
-					"__gntbindings__ values must be (callback, trigger) tupples");
-			g_type_class_unref(bindable);
-			return NULL;
-		}
-
-		gnt_bindable_class_register_action(bindable, name, pygnt_binding_callback,
-				trigger, g_strdup(callback), NULL);
-	}
-	if (gbindings)
-		PyDict_DelItemString(class->tp_dict, "__gntbindings__");
-	g_type_class_unref(bindable);
-
-end:
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
--- a/finch/libgnt/pygnt/gntbox.override	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/**
- * pygnt- Python bindings for the GNT toolkit.
- * Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
- *
- *   gntbox.override: overrides for the box widget.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
- * USA
- */
-%%
-override gnt_box_add_widget kwargs
-static PyObject *
-_wrap_gnt_box_add_widget(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "widget", NULL };
-    PyGObject *widget;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:GntBox.add_widget", kwlist, &PyGntWidget_Type, &widget))
-        return NULL;
-    
-    gnt_box_add_widget(GNT_BOX(self->obj), GNT_WIDGET(widget->obj));
-	Py_INCREF(widget);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
--- a/finch/libgnt/pygnt/gntfilesel.override	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/**
- * pygnt- Python bindings for the GNT toolkit.
- * Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
- *
- *   gntfilesel.override: overrides for the file selector.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
- * USA
- */
-%%
-headrs
-#include "common.h"
-%%
-override gnt_file_sel_get_selected_multi_files noargs
-static PyObject *
-_wrap_gnt_file_sel_get_selected_multi_files(PyGObject *self)
-{
-	GList *list = gnt_file_sel_get_selected_multi_files(GNT_FILE_SEL(self->obj));
-	return create_pyobject_from_string_list(list);
-}
-
--- a/finch/libgnt/pygnt/gntmodule.c	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-#include <pygobject.h>
-#include "gnt.h"
- 
-void gnt_register_classes (PyObject *d); 
-extern PyMethodDef gnt_functions[];
-
-static void
-gnt_add_string_constants(PyObject *module)
-{
-#define define_key(x) if (GNT_KEY_##x && *(GNT_KEY_##x))  PyModule_AddStringConstant(module, "KEY_" #x, GNT_KEY_##x)
-
-	define_key(POPUP);
-
-	define_key(LEFT);
-	define_key(RIGHT);
-	define_key(UP);
-	define_key(DOWN);
-
-	define_key(CTRL_UP);
-	define_key(CTRL_DOWN);
-	define_key(CTRL_RIGHT);
-	define_key(CTRL_LEFT);
-
-	define_key(PGUP);
-	define_key(PGDOWN);
-	define_key(HOME);
-	define_key(END);
-
-	define_key(ENTER);
-
-	define_key(BACKSPACE);
-	define_key(DEL);
-	define_key(INS);
-	define_key(BACK_TAB);
-
-	define_key(CTRL_A);
-	define_key(CTRL_B);
-	define_key(CTRL_D);
-	define_key(CTRL_E);
-	define_key(CTRL_F);
-	define_key(CTRL_G);
-	define_key(CTRL_H);
-	define_key(CTRL_I);
-	define_key(CTRL_J);
-	define_key(CTRL_K);
-	define_key(CTRL_L);
-	define_key(CTRL_M);
-	define_key(CTRL_N);
-	define_key(CTRL_O);
-	define_key(CTRL_P);
-	define_key(CTRL_R);
-	define_key(CTRL_T);
-	define_key(CTRL_U);
-	define_key(CTRL_V);
-	define_key(CTRL_W);
-	define_key(CTRL_X);
-	define_key(CTRL_Y);
-
-	define_key(F1);
-	define_key(F2);
-	define_key(F3);
-	define_key(F4);
-	define_key(F5);
-	define_key(F6);
-	define_key(F7);
-	define_key(F8);
-	define_key(F9);
-	define_key(F10);
-	define_key(F11);
-	define_key(F12);
-}
- 
-DL_EXPORT(void)
-initgnt(void)
-{
-    PyObject *m, *d;
- 
-    init_pygobject ();
-
-    m = Py_InitModule ("gnt", gnt_functions);
-    d = PyModule_GetDict (m);
- 
-    gnt_register_classes (d);
-    gnt_add_constants(m, "GNT_");
- 
-    if (PyErr_Occurred ()) {
-        Py_FatalError ("can't initialise module sad");
-    }
-
-	gnt_init();
-	gnt_add_string_constants(m);
-}
-
--- a/finch/libgnt/pygnt/gnttree.override	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/**
- * pygnt- Python bindings for the GNT toolkit.
- * Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
- *
- *   gnttree.override: overrides for the tree widget.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
- * USA
- */
-%%
-headers
-#include "common.h"
-%%
-ignore 
-gnt_tree_create_row
-gnt_tree_create_row_from_list
-%%
-override gnt_tree_get_selection_text_list noargs
-static PyObject *
-_wrap_gnt_tree_get_selection_text_list(PyGObject *self)
-{
-	GList *list = gnt_tree_get_selection_text_list(GNT_TREE(self->obj));
-	return create_pyobject_from_string_list(list);
-}
-%%
-override gnt_tree_get_rows noargs
-static PyObject *
-_wrap_gnt_tree_get_rows(PyGObject *self)
-{
-	GList *list = gnt_tree_get_rows(GNT_TREE(self->obj));
-	PyObject *py_list;
-	if (list == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
-	if ((py_list = PyList_New(0)) == NULL) {
-		return NULL;
-	}
-	while (list) {
-		PyObject *obj = list->data;
-		PyList_Append(py_list, obj);
-		list = list->next;
-	}
-	return py_list;
-}
-%%
-override gnt_tree_add_row_after
-static PyObject *
-_wrap_gnt_tree_add_row_after(PyGObject *self, PyObject *args)
-{
-	static char *kwlist[] = {"key", "row", "parent", "bigbro", NULL};
-	PyObject *py_list;
-	gpointer key, parent, bigbro = NULL;
-	int len, i;
-	GList *list = NULL;
-	GntTreeRow *row;
-	gboolean insert_last = FALSE;
-
-	if (!PyArg_ParseTuple(args,
-				"OOO|O:GntTree.add_row_after",
-				&key,
-				&py_list,
-				&parent,
-				&bigbro))
-		return NULL;
-
-	len = PySequence_Length(py_list);
-	for (i = 0; i < len; i++) {
-		PyObject *item = PySequence_GetItem(py_list, i);
-		if (!pygobject_check(item, &PyString_Type)) {
-			PyErr_SetString(PyExc_TypeError,
-					"column_list members must be strings");
-			Py_DECREF(item);
-			return NULL;
-		}
-		list = g_list_prepend(list, PyString_AsString(item));
-		Py_DECREF(item);
-	}
-
-	if (parent == Py_None)
-		parent = NULL;
-	if (bigbro == Py_None)
-		bigbro = NULL;
-	else if (bigbro == NULL)
-		insert_last = TRUE;
-
-	Py_INCREF((PyObject*)key);
-
-	list = g_list_reverse(list);
-	row = gnt_tree_create_row_from_list(GNT_TREE(self->obj), list);
-	if (insert_last)
-		gnt_tree_add_row_last(GNT_TREE(self->obj),
-				key, row, parent);
-	else
-		gnt_tree_add_row_after(GNT_TREE(self->obj),
-				key, row,
-				parent, bigbro);
-	g_list_free(list);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-override gnt_tree_get_selection_data noargs
-static PyObject *
-_wrap_gnt_tree_get_selection_data(PyGObject *self)
-{
-	PyObject *ret = gnt_tree_get_selection_data(GNT_TREE(self->obj));
-	if (!ret)
-		ret = Py_None;
-	Py_INCREF(ret);
-	return ret;
-}
-%%
-override gnt_tree_change_text
-static PyObject *
-_wrap_gnt_tree_change_text(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "key", "colno", "text", NULL };
-	char *text;
-	int colno;
-	gpointer key;
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs,"Ois:GntTree.change_text", kwlist, &key, &colno, &text))
-		return NULL;
-
-	gnt_tree_change_text(GNT_TREE(self->obj), key, colno, text);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-override gnt_tree_set_row_flags
-static PyObject *
-_wrap_gnt_tree_set_row_flags(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "key", "flag", NULL };
-	int flag;
-	gpointer key;
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs,"Oi:GntTree.set_row_flags", kwlist, &key, &flag))
-		return NULL;
-
-	gnt_tree_set_row_flags(GNT_TREE(self->obj), key, flag);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-override gnt_tree_remove
-static PyObject *
-_wrap_gnt_tree_remove(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-	static char *kwlist[] = { "key", NULL };
-	gpointer key;
-
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:GntTree.remove", kwlist, &key))
-		return NULL;
-
-	gnt_tree_remove(GNT_TREE(self->obj), key);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-override gnt_tree_set_selected
-static PyObject *
-_wrap_gnt_tree_set_selected(PyGObject *self, PyObject *args)
-{
-	gpointer key;
-	if (!PyArg_ParseTuple(args, "O:GntTree.set_selected", &key)) {
-		return NULL;
-	}
-	gnt_tree_set_selected(GNT_TREE(self->obj), key);
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-%%
-override gnt_tree_set_compare_func
-static PyObject *
-_wrap_gnt_tree_set_compare_func(PyGObject *self, PyObject *args)
-{
-	static char *kwlist[] = {"compare_func", NULL};
-	PyGObject *compare;
-
-	if (!PyArg_ParseTuple(args, "O:GntTree.set_compare_func", &compare)) {
-		return NULL;
-	}
-
-	if (!PyCallable_Check(compare)) {
-		PyErr_SetString(PyExc_TypeError, "the callback must be callable ... doh!");
-		return NULL;
-	}
-
-	Py_INCREF(compare);
-	gnt_tree_set_compare_func(GNT_TREE(self->obj), (GCompareFunc)compare->obj);
-
-	Py_INCREF(Py_None);
-	return Py_None;
-}
-
--- a/finch/libgnt/pygnt/gntwidget.override	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/**
- * pygnt- Python bindings for the GNT toolkit.
- * Copyright (C) 2007 Sadrul Habib Chowdhury <sadrul@pidgin.im>
- *
- *   gntwidget.override: overrides for generic widgets.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301
- * USA
- */
-%%
-override gnt_widget_get_size args
-static PyObject *
-_wrap_gnt_widget_get_size(PyGObject *self)
-{
-    PyObject *list = PyList_New(0);
-    int x = 0, y = 0;
-
-    gnt_widget_get_size(GNT_WIDGET(self->obj), &x, &y);
-    PyList_Append(list, PyInt_FromLong((long)x));
-    PyList_Append(list, PyInt_FromLong((long)y));
-
-    return list;
-}
-
--- a/finch/libgnt/pygnt/test.py	Mon Mar 31 21:23:57 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-#!/usr/bin/env python
-import gobject
-import gnt
-
-class MyObject(gobject.GObject):
-    __gproperties__ = {
-        'mytype': (gobject.TYPE_INT, 'mytype', 'the type of the object',
-                0, 10000, 0, gobject.PARAM_READWRITE),
-        'string': (gobject.TYPE_STRING, 'string property', 'the string',
-                None, gobject.PARAM_READWRITE),
-        'gobject': (gobject.TYPE_OBJECT, 'object property', 'the object',
-                gobject.PARAM_READWRITE),
-    }
-
-    def __init__(self, type = 'string', value = None):
-        self.__gobject_init__()
-        self.set_property(type, value)
-
-    def __del__(self):
-        pass
-
-    def do_set_property(self, pspec, value):
-        if pspec.name == 'string':
-            self.string = value
-            self.type = gobject.TYPE_STRING
-        elif pspec.name == 'gobject':
-            self.gobject = value
-            self.type = gobject.TYPE_OBJECT
-        else:
-            raise AttributeError, 'unknown property %s' % pspec.name
-    def do_get_property(self, pspec):
-        if pspec.name == 'string':
-            return self.string
-        elif pspec.name == 'gobject':
-            return self.gobject
-        elif pspec.name == 'mytype':
-            return self.type
-        else:
-            raise AttributeError, 'unknown property %s' % pspec.name
-gobject.type_register(MyObject)
-
-def button_activate(button, tree):
-    list = tree.get_selection_text_list()
-    ent = tree.get_selection_data()
-    if ent.type == gobject.TYPE_STRING:
-        str = ""
-        for i in list:
-            str = str + i
-        entry.set_text("clicked!!!" + str)
-    elif ent.type == gobject.TYPE_OBJECT:
-        ent.gobject.set_text("mwhahaha!!!")
-
-gnt.gnt_init()
-
-win = gnt.Window()
-
-entry = gnt.Entry("")
-obj = MyObject()
-obj.set_property('gobject', entry)
-
-win.add_widget(entry)
-win.set_title("Entry")
-
-button = gnt.Button("Click!")
-win.add_widget(button)
-
-tree = gnt.Tree()
-tree.set_property("columns", 1)
-win.add_widget(tree)
-
-# so random non-string values can be used as the key for a row in a GntTree!
-last = None
-for i in range(1, 100):
-    key = MyObject('string', str(i))
-    tree.add_row_after(key, [str(i)], None, last)
-    last = key
-
-tree.add_row_after(MyObject('gobject', entry), ["asd"], None, None)
-tree.add_row_after(MyObject('string', "b"), ["123"], MyObject('gobject', entry), None)
-
-button.connect("activate", button_activate, tree)
-
-tv = gnt.TextView()
-
-win.add_widget(tv)
-tv.append_text_with_flags("What up!!", gnt.TEXT_FLAG_BOLD)
-
-win.show()
-
-gnt.gnt_main()
-
-gnt.gnt_quit()
-
--- a/libpurple/account.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/account.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1359,8 +1359,12 @@
 		return;
 	}
 
-	if (orig_pass == NULL || new_pass_1 == NULL || new_pass_2 == NULL ||
-		*orig_pass == '\0' || *new_pass_1 == '\0' || *new_pass_2 == '\0')
+	if ((purple_request_fields_is_field_required(fields, "password") &&
+			(orig_pass == NULL || *orig_pass == '\0')) ||
+		(purple_request_fields_is_field_required(fields, "new_password_1") &&
+			(new_pass_1 == NULL || *new_pass_1 == '\0')) ||
+		(purple_request_fields_is_field_required(fields, "new_password_2") &&
+			(new_pass_2 == NULL || *new_pass_2 == '\0')))
 	{
 		purple_notify_error(account, NULL,
 						  _("Fill out all fields completely."), NULL);
@@ -1376,11 +1380,20 @@
 	PurpleRequestFields *fields;
 	PurpleRequestFieldGroup *group;
 	PurpleRequestField *field;
+	PurpleConnection *gc;
+	PurplePlugin *prpl = NULL;
+	PurplePluginProtocolInfo *prpl_info = NULL;
 	char primary[256];
 
 	g_return_if_fail(account != NULL);
 	g_return_if_fail(purple_account_is_connected(account));
 
+	gc = purple_account_get_connection(account);
+	if (gc != NULL)
+		prpl = purple_connection_get_prpl(gc);
+	if (prpl != NULL)
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
 	fields = purple_request_fields_new();
 
 	group = purple_request_field_group_new(NULL);
@@ -1389,21 +1402,24 @@
 	field = purple_request_field_string_new("password", _("Original password"),
 										  NULL, FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
-	purple_request_field_set_required(field, TRUE);
+	if (!(prpl_info && (prpl_info->options | OPT_PROTO_PASSWORD_OPTIONAL)))
+		purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_string_new("new_password_1",
 										  _("New password"),
 										  NULL, FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
-	purple_request_field_set_required(field, TRUE);
+	if (!(prpl_info && (prpl_info->options | OPT_PROTO_PASSWORD_OPTIONAL)))
+		purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	field = purple_request_field_string_new("new_password_2",
 										  _("New password (again)"),
 										  NULL, FALSE);
 	purple_request_field_string_set_masked(field, TRUE);
-	purple_request_field_set_required(field, TRUE);
+	if (!(prpl_info && (prpl_info->options | OPT_PROTO_PASSWORD_OPTIONAL)))
+		purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
 	g_snprintf(primary, sizeof(primary), _("Change password for %s"),
--- a/libpurple/blist.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/blist.c	Mon Apr 28 00:01:07 2008 +0000
@@ -2238,6 +2238,8 @@
 				pce = parts->data;
 				chat_name = g_hash_table_lookup(chat->components,
 												pce->identifier);
+				g_list_foreach(parts, (GFunc)g_free, NULL);
+				g_list_free(parts);
 
 				if (chat->account == account && chat_name != NULL &&
 					name != NULL && !strcmp(chat_name, name)) {
--- a/libpurple/blist.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/blist.h	Mon Apr 28 00:01:07 2008 +0000
@@ -475,7 +475,8 @@
  * @param buddy   The new buddy who gets added
  * @param contact The optional contact to place the buddy in.
  * @param group   The group to add the new buddy to.
- * @param node    The insertion point
+ * @param node    The insertion point.  Pass in NULL to add the node as
+ *                the last child in the given group.
  */
 void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, PurpleGroup *group, PurpleBlistNode *node);
 
--- a/libpurple/buddyicon.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/buddyicon.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1,5 +1,5 @@
 /**
- * @file icon.c Buddy Icon API
+ * @file buddyicon.c Buddy Icon API
  * @ingroup core
  */
 
@@ -31,36 +31,85 @@
 #include "imgstore.h"
 #include "util.h"
 
-typedef struct _PurpleBuddyIconData PurpleBuddyIconData;
-
 /* NOTE: Instances of this struct are allocated without zeroing the memory, so
  * NOTE: be sure to update purple_buddy_icon_new() if you add members. */
 struct _PurpleBuddyIcon
 {
 	PurpleAccount *account;    /**< The account the user is on.          */
-	PurpleStoredImage *img;    /**< The id of the stored image with the
+	PurpleStoredImage *img;    /**< The stored image containing
 	                                the icon data.                       */
 	char *username;            /**< The username the icon belongs to.    */
 	char *checksum;            /**< The protocol checksum.               */
 	int ref_count;             /**< The buddy icon reference count.      */
 };
 
+/**
+ * This is the big grand daddy hash table that contains references to
+ * everybody's buddy icons.
+ *
+ * Key is a PurpleAccount.
+ * Value is another hash table, usually referred to as "icon_cache."
+ * For this inner hash table:
+ *    Key is the username of the buddy whose icon is being stored.
+ *    Value is the PurpleBuddyIcon for this buddy.
+ */
 static GHashTable *account_cache = NULL;
+
+/**
+ * This hash table contains a bunch of PurpleStoredImages that are
+ * shared across all accounts.
+ *
+ * Key is the filename for this image as constructed by
+ * purple_util_get_image_filename().  So it is the base16 encoded
+ * sha-1 hash plus an appropriate file extension.  For example:
+ *   "0f4972d17d1e70e751c43c90c948e72efbff9796.gif"
+ *
+ * The value is a PurpleStoredImage containing the icon data.  These
+ * images are reference counted, and when the count reaches 0
+ * imgstore.c emits the image-deleting signal and we remove the image
+ * from the hash table (but it might still be saved on disk, if the
+ * icon is being used by offline accounts or some such).
+ */
 static GHashTable *icon_data_cache = NULL;
+
+/**
+ * This hash table contains references counts for how many times each
+ * icon in the ~/.purple/icons/ directory is being used.  It's pretty
+ * crazy.  It maintains the reference count across sessions, too, so
+ * if you exit Pidgin then this hash table is reconstructed the next
+ * time Pidgin starts.
+ *
+ * Key is the filename for this image as constructed by
+ * purple_util_get_image_filename().  So it is the base16 encoded
+ * sha-1 hash plus an appropriate file extension.  For example:
+ *   "0f4972d17d1e70e751c43c90c948e72efbff9796.gif"
+ *
+ * The value is a GINT_TO_POINTER count of the number of times this
+ * icon is used.  So if four of your buddies are using an icon, and
+ * you have the icon set for two of your accounts, then this number
+ * will be six.  When this reference count reaches 0 the icon will
+ * be deleted from disk.
+ */
 static GHashTable *icon_file_cache = NULL;
 
-static void delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name);
-
 /* This one is used for both custom buddy icons
  * on PurpleContacts and account icons. */
 static GHashTable *pointer_icon_cache = NULL;
 
 static char       *cache_dir     = NULL;
+
+/** "Should icons be cached to disk?" */
 static gboolean    icon_caching  = TRUE;
 
 /* For ~/.gaim to ~/.purple migration. */
 static char *old_icons_dir = NULL;
 
+static void delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name);
+
+/*
+ * Begin functions for dealing with the on-disk icon cache
+ */
+
 static void
 ref_filename(const char *filename)
 {
@@ -158,6 +207,14 @@
 	g_free(path);
 }
 
+/*
+ * End functions for dealing with the on-disk icon cache
+ */
+
+/*
+ * Begin functions for dealing with the in-memory icon cache
+ */
+
 static gboolean
 value_equals(gpointer key, gpointer value, gpointer user_data)
 {
@@ -222,6 +279,10 @@
 	return img;
 }
 
+/*
+ * End functions for dealing with the in-memory icon cache
+ */
+
 static PurpleBuddyIcon *
 purple_buddy_icon_create(PurpleAccount *account, const char *username)
 {
--- a/libpurple/buddyicon.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/buddyicon.h	Mon Apr 28 00:01:07 2008 +0000
@@ -45,7 +45,7 @@
 /*@{*/
 
 /**
- * Creates a new buddy icon structure and populate it.
+ * Creates a new buddy icon structure and populates it.
  *
  * If the buddy icon already exists, you'll get a reference to that structure,
  * which will have been updated with the data supplied.
--- a/libpurple/conversation.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/conversation.c	Mon Apr 28 00:01:07 2008 +0000
@@ -862,7 +862,7 @@
 		gc = purple_account_get_connection(account);
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
-		(gc == NULL || !g_slist_find(gc->buddy_chats, conv)))
+		(gc != NULL && !g_slist_find(gc->buddy_chats, conv)))
 		return;
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM &&
--- a/libpurple/core.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/core.c	Mon Apr 28 00:01:07 2008 +0000
@@ -326,25 +326,6 @@
 	return remote_user_dir;
 }
 
-static void purple_dbus_owner_show_buddy_list(void)
-{
-	DBusError dbus_error;
-	DBusMessage *msg = NULL, *reply = NULL;
-	DBusConnection *dbus_connection = NULL;
-
-	if ((dbus_connection = purple_dbus_get_connection()) == NULL)
-		return;
-
-	if ((msg = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE, DBUS_INTERFACE_PURPLE, "PurpleBlistShow")) == NULL)
-		return;
-
-	dbus_error_init(&dbus_error);
-	if ((reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, 5000, &dbus_error)) != NULL)
-	{
-		dbus_message_unref(msg);
-	}
-	dbus_error_free(&dbus_error);
-}
 #endif /* HAVE_DBUS */
 
 gboolean
@@ -369,9 +350,6 @@
 			else
 				is_single_instance = strcmp(dbus_owner_user_dir, user_dir);
 
-			if (!is_single_instance)
-				purple_dbus_owner_show_buddy_list();
-
 			g_free(dbus_owner_user_dir);
 		}
 	}
--- a/libpurple/dbus-server.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/dbus-server.h	Mon Apr 28 00:01:07 2008 +0000
@@ -28,9 +28,9 @@
 #ifndef _PURPLE_DBUS_SERVER_H_
 #define _PURPLE_DBUS_SERVER_H_
 
+#include "dbus-purple.h"
 #include "value.h"
 
-
 G_BEGIN_DECLS
 
 /**
@@ -51,6 +51,8 @@
     PurpleDBusType *parent;
 };
 
+#include "dbus-bindings.h"
+
 /* By convention, the PurpleDBusType variable representing each structure
    PurpleSomeStructure has the name PURPLE_DBUS_TYPE_PurpleSomeStructure.
    The following macros facilitate defining such variables
--- a/libpurple/imgstore.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/imgstore.c	Mon Apr 28 00:01:07 2008 +0000
@@ -34,11 +34,9 @@
 #include "util.h"
 
 static GHashTable *imgstore;
-static int nextid = 0;
+static unsigned int nextid = 0;
 
-/**
- * Stored image
- *
+/*
  * NOTE: purple_imgstore_add() creates these without zeroing the memory, so
  * NOTE: make sure to update that function when adding members.
  */
@@ -91,7 +89,14 @@
 {
 	PurpleStoredImage *img = purple_imgstore_add(data, size, filename);
 	if (img) {
-		img->id = ++nextid;
+		/*
+		 * Use the next unused id number.  We do it in a loop on the
+		 * off chance that nextid wraps back around to 0 and the hash
+		 * table still contains entries from the first time around.
+		 */
+		do {
+			img->id = ++nextid;
+		} while (img->id == 0 || g_hash_table_lookup(imgstore, &(img->id)) != NULL);
 
 		g_hash_table_insert(imgstore, &(img->id), img);
 	}
--- a/libpurple/imgstore.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/imgstore.h	Mon Apr 28 00:01:07 2008 +0000
@@ -51,7 +51,11 @@
  *                      ownership of and free as appropriate.  If you want a
  *                      copy of the data, make it before calling this function.
  * @param size		Image data's size.
- * @param filename	Filename associated with image.
+ * @param filename	Filename associated with image.  This is for your
+ *                  convenience.  It could be the full path to the
+ *                  image or, more commonly, the filename of the image
+ *                  without any directory information.  It can also be
+ *                  NULL, if you don't need to keep track of a filename.
  *
  * @return The stored image.
  */
@@ -80,9 +84,14 @@
  *                      ownership of and free as appropriate.  If you want a
  *                      copy of the data, make it before calling this function.
  * @param size		Image data's size.
- * @param filename	Filename associated with image.
+ * @param filename	Filename associated with image.  This is for your
+ *                  convenience.  It could be the full path to the
+ *                  image or, more commonly, the filename of the image
+ *                  without any directory information.  It can also be
+ *                  NULL, if you don't need to keep track of a filename.
 
- * @return ID for the image.
+ * @return ID for the image.  This is a unique number that can be used
+ *         within libpurple to reference the image.
  */
 int purple_imgstore_add_with_id(gpointer data, size_t size, const char *filename);
 
@@ -127,11 +136,13 @@
 const char *purple_imgstore_get_filename(const PurpleStoredImage *img);
 
 /**
- * Returns an extension corresponding to the image's file type.
+ * Looks at the magic numbers of the image data (the first few bytes)
+ * and returns an extension corresponding to the image's file type.
  *
  * @param img  The image.
  *
- * @return The icon's extension or "icon" if unknown.
+ * @return The image's extension (for example "png") or "icon"
+ *         if unknown.
  */
 const char *purple_imgstore_get_extension(PurpleStoredImage *img);
 
--- a/libpurple/log.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/log.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1758,6 +1758,7 @@
 			lastoff = offset;
 
 			g_snprintf(convostart, length, "%s", temp);
+			memset(&tm, 0, sizeof(tm));
 			sscanf(convostart, "%*s %s %d %d:%d:%d %d",
 			       month, &tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec, &tm.tm_year);
 			/* Ugly hack, in case current locale is not English */
--- a/libpurple/notify.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/notify.c	Mon Apr 28 00:01:07 2008 +0000
@@ -586,7 +586,7 @@
 }
 
 
-gchar *
+const gchar *
 purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *user_info_entry)
 {
 	g_return_val_if_fail(user_info_entry != NULL, NULL);
@@ -603,7 +603,7 @@
 	user_info_entry->label = g_strdup(label);
 }
 
-gchar *
+const gchar *
 purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *user_info_entry)
 {
 	g_return_val_if_fail(user_info_entry != NULL, NULL);
--- a/libpurple/notify.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/notify.h	Mon Apr 28 00:01:07 2008 +0000
@@ -596,7 +596,7 @@
  *
  * @result                    The label
  */
-gchar *purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *user_info_entry);
+const gchar *purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *user_info_entry);
 
 /**
  * Set the label for a PurpleNotifyUserInfoEntry
@@ -613,7 +613,7 @@
  *
  * @result                    The value
  */
-gchar *purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *user_info_entry);
+const gchar *purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *user_info_entry);
 
 /**
  * Set the value for a PurpleNotifyUserInfoEntry
--- a/libpurple/plugin.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugin.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1212,7 +1212,7 @@
 	if (g_list_find_custom(search_paths, path, (GCompareFunc)strcmp))
 		return;
 
-	search_paths = g_list_append(search_paths, strdup(path));
+	search_paths = g_list_append(search_paths, g_strdup(path));
 }
 
 void
@@ -1294,7 +1294,7 @@
 
 		/* Strip the extension */
 		if (basename)
-			basename = purple_plugin_get_basename(filename);
+			basename = purple_plugin_get_basename(basename);
 
 		if (((plugin = purple_plugins_find_with_filename(filename)) != NULL) ||
 				(basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) ||
--- a/libpurple/plugins/perl/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Mon Apr 28 00:01:07 2008 +0000
@@ -90,7 +90,9 @@
 common/Makefile: common/Makefile.PL
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ../${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
@@ -148,7 +150,9 @@
 
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ../${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 
--- a/libpurple/plugins/perl/common/Notify.xs	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/common/Notify.xs	Mon Apr 28 00:01:07 2008 +0000
@@ -172,10 +172,10 @@
 void purple_notify_user_info_remove_last_item(user_info)
 	Purple::NotifyUserInfo user_info
 
-gchar *
+const gchar *
 purple_notify_user_info_entry_get_label(user_info_entry)
 	Purple::NotifyUserInfoEntry user_info_entry
 
-gchar *
+const gchar *
 purple_notify_user_info_entry_get_value(user_info_entry)
 	Purple::NotifyUserInfoEntry user_info_entry
--- a/libpurple/plugins/perl/common/Prefs.xs	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/common/Prefs.xs	Mon Apr 28 00:01:07 2008 +0000
@@ -167,6 +167,17 @@
 	const char *name
 
 void
+purple_prefs_get_children_names(name)
+	const char *name
+PREINIT:
+	GList *l;
+PPCODE:
+	for (l = purple_prefs_get_children_names(name); l != NULL; l = g_list_delete_link(l, l)) {
+		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
+		g_free(l->data);
+	}
+
+void
 purple_prefs_uninit()
 
 void
--- a/libpurple/plugins/perl/common/Purple.xs	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/common/Purple.xs	Mon Apr 28 00:01:07 2008 +0000
@@ -74,14 +74,24 @@
 	PURPLE_PERL_BOOT(Util);
 	PURPLE_PERL_BOOT(XMLNode);
 
-void
+guint
 timeout_add(plugin, seconds, callback, data = 0)
 	Purple::Plugin plugin
 	int seconds
 	SV *callback
 	SV *data
 CODE:
-	purple_perl_timeout_add(plugin, seconds, callback, data);
+	RETVAL = purple_perl_timeout_add(plugin, seconds, callback, data);
+OUTPUT:
+	RETVAL
+
+gboolean
+timeout_remove(handle)
+	guint handle
+CODE:
+	RETVAL = purple_perl_timeout_remove(handle);
+OUTPUT:
+	RETVAL
 
 void
 deinit()
--- a/libpurple/plugins/perl/common/Request.xs	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Mon Apr 28 00:01:07 2008 +0000
@@ -15,10 +15,20 @@
 
 
 typedef struct {
-	char *cancel_cb;
-	char *ok_cb;
+	SV *ok_fun;
+	SV *cancel_fun;
 } PurplePerlRequestData;
 
+static void
+purple_perl_request_data_free(PurplePerlRequestData *ppr)
+{
+	if (ppr->ok_fun)
+		SvREFCNT_dec(ppr->ok_fun);
+	if (ppr->cancel_fun)
+		SvREFCNT_dec(ppr->cancel_fun);
+	g_free(ppr);
+}
+
 /********************************************************/
 /*                                                      */
 /* Callback function that calls a perl subroutine       */
@@ -39,23 +49,19 @@
 
 	XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields"));
 	PUTBACK;
-
-	call_pv(gpr->ok_cb, G_EVAL | G_SCALAR);
+	call_sv(gpr->ok_fun, G_EVAL | G_SCALAR);
 	SPAGAIN;
 
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
 
-	g_free(gpr->ok_cb);
-	g_free(gpr->cancel_cb);
-	g_free(gpr);
+	purple_perl_request_data_free(gpr);
 }
 
 static void
 purple_perl_request_cancel_cb(void * data, PurpleRequestFields *fields)
 {
-
 	PurplePerlRequestData *gpr = (PurplePerlRequestData *)data;
 
 	dSP;
@@ -65,16 +71,14 @@
 
 	XPUSHs(purple_perl_bless_object(fields, "Purple::Request::Fields"));
 	PUTBACK;
-	call_pv(gpr->cancel_cb, G_EVAL | G_SCALAR);
+	call_sv(gpr->cancel_fun, G_EVAL | G_SCALAR);
 	SPAGAIN;
 
 	PUTBACK;
 	FREETMPS;
 	LEAVE;
 
-	g_free(gpr->ok_cb);
-	g_free(gpr->cancel_cb);
-	g_free(gpr);
+	purple_perl_request_data_free(gpr);
 }
 
 MODULE = Purple::Request  PACKAGE = Purple::Request  PREFIX = purple_request_
@@ -131,14 +135,13 @@
 	SV * cancel_cb
 CODE:
 	PurplePerlRequestData *gpr;
-	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
 	purple_perl_normalize_script_name(basename);
 	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	gpr->ok_fun = purple_perl_sv_from_fun(handle, ok_cb);
+	gpr->cancel_fun = purple_perl_sv_from_fun(handle, cancel_cb);
 	g_free(basename);
 
 	RETVAL = purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
@@ -155,14 +158,13 @@
 	SV * cancel_cb
 CODE:
 	PurplePerlRequestData *gpr;
-	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
 	purple_perl_normalize_script_name(basename);
 	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	gpr->ok_fun = purple_perl_sv_from_fun(handle, ok_cb);
+	gpr->cancel_fun = purple_perl_sv_from_fun(handle, cancel_cb);
 	g_free(basename);
 
 	RETVAL = purple_request_file(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
@@ -182,14 +184,13 @@
 	SV * cancel_cb
 CODE:
 	PurplePerlRequestData *gpr;
-	STRLEN len;
 	char *basename;
 
 	basename = g_path_get_basename(handle->path);
 	purple_perl_normalize_script_name(basename);
 	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
+	gpr->ok_fun = purple_perl_sv_from_fun(handle, ok_cb);
+	gpr->cancel_fun = purple_perl_sv_from_fun(handle, cancel_cb);
 	g_free(basename);
 
 	RETVAL = purple_request_fields(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
--- a/libpurple/plugins/perl/common/Util.xs	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/common/Util.xs	Mon Apr 28 00:01:07 2008 +0000
@@ -1,11 +1,11 @@
 #include "module.h"
 
-typedef struct {
-	char *cb;
-} PurplePerlUrlData;
-
-static void purple_perl_util_url_cb(PurpleUtilFetchUrlData *url_data, void *user_data, const gchar *url_text, size_t size, const gchar *error_message) {
-	PurplePerlUrlData *gpr = (PurplePerlUrlData *)user_data;
+static void
+purple_perl_util_url_cb(PurpleUtilFetchUrlData *url_data, void *user_data,
+                        const gchar *url_text, size_t size,
+                        const gchar *error_message)
+{
+	SV *sv = (SV *)user_data;
 	dSP;
 	ENTER;
 	SAVETMPS;
@@ -14,11 +14,12 @@
 	XPUSHs(sv_2mortal(newSVpvn(url_text, size)));
 	PUTBACK;
 
-	call_pv(gpr->cb, G_EVAL | G_SCALAR);
+	call_sv(sv, G_EVAL | G_SCALAR);
 	SPAGAIN;
 
-	g_free(gpr->cb);
-	g_free(gpr);
+	/* XXX Make sure this destroys it correctly and that we don't want
+	 * something like sv_2mortal(sv) or something else here instead. */
+	SvREFCNT_dec(sv);
 
 	PUTBACK;
 	FREETMPS;
@@ -248,25 +249,22 @@
 PROTOTYPES: ENABLE
 
 void
-purple_util_fetch_url(handle, url, full, user_agent, http11, cb)
-	Purple::Plugin handle
+purple_util_fetch_url(plugin, url, full, user_agent, http11, cb)
+	Purple::Plugin plugin
 	const char *url
 	gboolean full
 	const char *user_agent
 	gboolean http11
 	SV * cb
 CODE:
-	PurplePerlUrlData *gpr;
-	STRLEN len;
-	char *basename;
+	SV *sv = purple_perl_sv_from_fun(plugin, cb);
 
-	basename = g_path_get_basename(handle->path);
-	purple_perl_normalize_script_name(basename);
-	gpr = g_new(PurplePerlUrlData, 1);
-
-	gpr->cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cb, len));
-	g_free(basename);
-	purple_util_fetch_url(url, full, user_agent, http11, purple_perl_util_url_cb, gpr);
+	if (sv != NULL) {
+		purple_util_fetch_url(url, full, user_agent, http11,
+		                      purple_perl_util_url_cb, sv);
+	} else {
+		purple_debug_warning("perl", "Callback not a valid type, only strings and coderefs allowed in purple_util_fetch_url.\n");
+	}
 
 void
 purple_util_set_user_dir(dir)
--- a/libpurple/plugins/perl/perl-common.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/perl-common.c	Mon Apr 28 00:01:07 2008 +0000
@@ -616,3 +616,26 @@
 
 	return NULL;
 }
+
+SV *purple_perl_sv_from_fun(PurplePlugin *plugin, SV *callback)
+{
+	SV *sv = NULL;
+
+	if (SvTYPE(callback) == SVt_RV) {
+		SV *cbsv = SvRV(callback);
+
+		if (SvTYPE(cbsv) == SVt_PVCV) {
+			sv = newSVsv(callback);
+		}
+	} else if (SvTYPE(callback) == SVt_PV) {
+		PurplePerlScript *gps;
+
+		gps = (PurplePerlScript *)PURPLE_PLUGIN_LOADER_INFO(plugin);
+		sv = newSVpvf("%s::%s", gps->package, SvPV_nolen(callback));
+	} else {
+		purple_debug_warning("perl", "Callback not a valid type, only strings and coderefs allowed.\n");
+	}
+
+	return sv;
+}
+
--- a/libpurple/plugins/perl/perl-common.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/perl-common.h	Mon Apr 28 00:01:07 2008 +0000
@@ -67,5 +67,5 @@
 void *purple_perl_data_from_sv(PurpleValue *value, SV *sv);
 SV *purple_perl_sv_from_vargs(const PurpleValue *value, va_list *args,
                             void ***copy_arg);
-
+SV *purple_perl_sv_from_fun(PurplePlugin *plugin, SV *callback);
 #endif /* _PURPLE_PERL_COMMON_H_ */
--- a/libpurple/plugins/perl/perl-handlers.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/perl-handlers.c	Mon Apr 28 00:01:07 2008 +0000
@@ -207,13 +207,15 @@
 	return ret_frame;
 }
 
-static void
+static gboolean
 destroy_timeout_handler(PurplePerlTimeoutHandler *handler)
 {
+	gboolean ret = FALSE;
+
 	timeout_handlers = g_list_remove(timeout_handlers, handler);
 
 	if (handler->iotag > 0)
-		purple_timeout_remove(handler->iotag);
+		ret = purple_timeout_remove(handler->iotag);
 
 	if (handler->callback != NULL)
 		SvREFCNT_dec(handler->callback);
@@ -222,6 +224,8 @@
 		SvREFCNT_dec(handler->data);
 
 	g_free(handler);
+
+	return ret;
 }
 
 static void
@@ -301,8 +305,8 @@
 
 	for (i = 0; i < value_count; i++) {
 		sv_args[i] = purple_perl_sv_from_vargs(values[i],
-		                                     (va_list*)&args,
-		                                     &copy_args[i]);
+		                                       (va_list*)&args,
+		                                       &copy_args[i]);
 
 		XPUSHs(sv_args[i]);
 	}
@@ -422,14 +426,14 @@
 	return NULL;
 }
 
-void
+guint
 purple_perl_timeout_add(PurplePlugin *plugin, int seconds, SV *callback, SV *data)
 {
 	PurplePerlTimeoutHandler *handler;
 
 	if (plugin == NULL) {
 		croak("Invalid handle in adding perl timeout handler.\n");
-		return;
+		return 0;
 	}
 
 	handler = g_new0(PurplePerlTimeoutHandler, 1);
@@ -443,15 +447,39 @@
 	timeout_handlers = g_list_append(timeout_handlers, handler);
 
 	handler->iotag = purple_timeout_add(seconds * 1000, perl_timeout_cb, handler);
+
+	return handler->iotag;
+}
+
+gboolean
+purple_perl_timeout_remove(guint handle)
+{
+	GList *l, *l_next;
+
+	for (l = timeout_handlers; l != NULL; l = l_next) {
+		PurplePerlTimeoutHandler *handler;
+
+		l_next = l->next;
+
+		handler = (PurplePerlTimeoutHandler *)l->data;
+
+		if (handler->iotag == handle)
+			return destroy_timeout_handler(handler);
+	}
+
+	purple_debug_info("perl", "No timeout handler found with handle %u.\n",
+	                  handle);
+	return FALSE;
 }
 
 void
 purple_perl_timeout_clear_for_plugin(PurplePlugin *plugin)
 {
-	PurplePerlTimeoutHandler *handler;
 	GList *l, *l_next;
 
 	for (l = timeout_handlers; l != NULL; l = l_next) {
+		PurplePerlTimeoutHandler *handler;
+
 		l_next = l->next;
 
 		handler = (PurplePerlTimeoutHandler *)l->data;
--- a/libpurple/plugins/perl/perl-handlers.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/perl/perl-handlers.h	Mon Apr 28 00:01:07 2008 +0000
@@ -48,8 +48,9 @@
 GtkWidget *purple_perl_gtk_get_plugin_frame(PurplePlugin *plugin);
 #endif
 
-void purple_perl_timeout_add(PurplePlugin *plugin, int seconds, SV *callback,
-                           SV *data);
+guint purple_perl_timeout_add(PurplePlugin *plugin, int seconds, SV *callback,
+                              SV *data);
+gboolean purple_perl_timeout_remove(guint handle);
 void purple_perl_timeout_clear_for_plugin(PurplePlugin *plugin);
 void purple_perl_timeout_clear(void);
 
--- a/libpurple/plugins/statenotify.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/plugins/statenotify.c	Mon Apr 28 00:01:07 2008 +0000
@@ -42,6 +42,10 @@
 {
 	gboolean available, old_available;
 
+	if (!purple_status_is_exclusive(status) ||
+			!purple_status_is_exclusive(old_status))
+		return;
+
 	available = purple_status_is_available(status);
 	old_available = purple_status_is_available(old_status);
 
--- a/libpurple/protocols/bonjour/jabber.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Mon Apr 28 00:01:07 2008 +0000
@@ -114,6 +114,28 @@
 	return "1";
 }
 
+static gchar *
+get_xmlnode_contents(xmlnode *node)
+{
+	gchar *contents;
+
+	contents = xmlnode_to_str(node, NULL);
+
+	/* we just want the stuff inside <font></font>
+	 * There isn't stuff exposed in xmlnode.c to do this more cleanly. */
+
+	if (contents) {
+		char *bodystart = strchr(contents, '>');
+		char *bodyend = strrchr(bodystart, '<');
+		if (bodystart && bodyend && (bodystart + 1) != bodyend) {
+			*bodyend = '\0';
+			memmove(contents, bodystart + 1, (bodyend - bodystart));
+		}
+	}
+
+	return contents;
+}
+
 static void
 _jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleBuddy *pb)
 {
@@ -167,7 +189,7 @@
 				if (font_size != NULL)
 					font_size = _font_size_ichat_to_purple(atoi(font_size));
 				font_color = xmlnode_get_attrib(html_body_font_node, "color");
-				html_body = xmlnode_get_data(html_body_font_node);
+				html_body = get_xmlnode_contents(html_body_font_node);
 
 				if (html_body == NULL)
 					/* This is the kind of formated messages that Purple creates */
--- a/libpurple/protocols/irc/irc.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/irc/irc.h	Mon Apr 28 00:01:07 2008 +0000
@@ -118,6 +118,7 @@
 void irc_msg_away(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badmode(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_ban(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args);
--- a/libpurple/protocols/irc/msgs.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/irc/msgs.c	Mon Apr 28 00:01:07 2008 +0000
@@ -30,6 +30,7 @@
 #include "irc.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 static char *irc_mask_nick(const char *mask);
 static char *irc_mask_userhost(const char *mask);
@@ -61,9 +62,11 @@
 
 static void irc_chat_remove_buddy(PurpleConversation *convo, char *data[2])
 {
-	char *message;
+	char *message, *stripped;
 
-	message = g_strdup_printf("quit: %s", data[1]);
+	stripped = data[1] ? irc_mirc2txt(data[1]) : NULL;
+	message = g_strdup_printf("quit: %s", stripped);
+	g_free(stripped);
 
 	if (purple_conv_chat_find_user(PURPLE_CONV_CHAT(convo), data[0]))
 		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(convo), data[0], message);
@@ -189,6 +192,49 @@
 	purple_notify_error(gc, NULL, _("Bad mode"), args[1]);
 }
 
+void irc_msg_ban(struct irc_conn *irc, const char *name, const char *from, char **args)
+{
+	PurpleConversation *convo;
+
+	if (!args || !args[0] || !args[1])
+		return;
+
+	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
+						      args[1], irc->account);
+
+	if (!strcmp(name, "367")) {
+		char *msg = NULL;
+		/* Ban list entry */
+		if (!args[2])
+			return;
+		if (args[3] && args[4]) {
+			/* This is an extended syntax, not in RFC 1459 */
+			int t1 = atoi(args[4]);
+			time_t t2 = time(NULL);
+			msg = g_strdup_printf(_("Ban on %s by %s, set %ld seconds ago"),
+			                      args[2], args[3], t2 - t1);
+		} else {
+			msg = g_strdup_printf(_("Ban on %s"), args[2]);
+		}
+		if (convo) {
+			purple_conv_chat_write(PURPLE_CONV_CHAT(convo), "", msg,
+			                       PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NO_LOG,
+			                       time(NULL));
+		} else {
+			purple_debug_info("irc", "%s\n", msg);
+		}
+		g_free(msg);
+	} else if (!strcmp(name, "368")) {
+		if (!convo)
+			return;
+		/* End of ban list */
+		purple_conv_chat_write(PURPLE_CONV_CHAT(convo), "",
+		                       _("End of ban list"),
+		                       PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NO_LOG,
+		                       time(NULL));
+	}
+}
+
 void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	PurpleConnection *gc = purple_account_get_connection(irc->account);
@@ -660,16 +706,16 @@
 void irc_msg_invite(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	PurpleConnection *gc = purple_account_get_connection(irc->account);
-	GHashTable *components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	char *nick = irc_mask_nick(from);
+	GHashTable *components;
+	gchar *nick;
 
-	if (!args || !args[1] || !gc) {
-		g_free(nick);
-		g_hash_table_destroy(components);
+	if (!args || !args[1] || !gc)
 		return;
-	}
 
-	g_hash_table_insert(components, strdup("channel"), strdup(args[1]));
+	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	nick = irc_mask_nick(from);
+
+	g_hash_table_insert(components, g_strdup("channel"), g_strdup(args[1]));
 
 	serv_got_chat_invite(gc, args[1], nick, NULL, components);
 	g_free(nick);
@@ -934,7 +980,7 @@
 	if (!args || !args[1])
 		return;
 
-	newnick = strdup(args[1]);
+	newnick = g_strdup(args[1]);
 	end = newnick + strlen(newnick) - 1;
 	/* try fallbacks */
 	if((*end < '9') && (*end >= '1')) {
@@ -991,7 +1037,9 @@
 		g_free(msg);
 		serv_got_chat_left(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(convo)));
 	} else {
-		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(convo), nick, args[1]);
+		msg = args[1] ? irc_mirc2txt(args[1]) : NULL;
+		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(convo), nick, msg);
+		g_free(msg);
 	}
 	g_free(nick);
 }
--- a/libpurple/protocols/irc/parse.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/irc/parse.c	Mon Apr 28 00:01:07 2008 +0000
@@ -75,6 +75,8 @@
 	{ "333", "*", irc_msg_ignore },		/* Topic setter stuff		*/
 	{ "353", "nvc:", irc_msg_names },	/* Names list			*/
 	{ "366", "nc:", irc_msg_names },	/* End of names			*/
+	{ "367", "ncnnv", irc_msg_ban },	/* Ban list			*/
+	{ "368", "nc:", irc_msg_ban },		/* End of ban list		*/
 	{ "372", "n:", irc_msg_motd },		/* MOTD				*/
 	{ "375", "n:", irc_msg_motd },		/* Start MOTD			*/
 	{ "376", "n:", irc_msg_motd },		/* End of MOTD			*/
--- a/libpurple/protocols/jabber/auth.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/auth.c	Mon Apr 28 00:01:07 2008 +0000
@@ -264,7 +264,7 @@
 
 static void jabber_auth_start_cyrus(JabberStream *js)
 {
-	const char *clientout = NULL, *mech = NULL;
+	const char *clientout = NULL;
 	char *enc_out;
 	unsigned coutlen = 0;
 	xmlnode *auth;
@@ -297,7 +297,7 @@
 		if (js->sasl_state==SASL_OK) {
 			sasl_setprop(js->sasl, SASL_SEC_PROPS, &secprops);
 			purple_debug_info("sasl", "Mechs found: %s\n", js->sasl_mechs->str);
-			js->sasl_state = sasl_client_start(js->sasl, js->sasl_mechs->str, NULL, &clientout, &coutlen, &mech);
+			js->sasl_state = sasl_client_start(js->sasl, js->sasl_mechs->str, NULL, &clientout, &coutlen, &js->current_mech);
 		}
 		switch (js->sasl_state) {
 			/* Success */
@@ -372,10 +372,10 @@
 				 * due to mechanism specific issues, so we want to try one of the other
 				 * supported mechanisms. This code handles that case
 				 */
-				if (mech && strlen(mech) > 0) {
+				if (js->current_mech && strlen(js->current_mech) > 0) {
 					char *pos;
-					if ((pos = strstr(js->sasl_mechs->str, mech))) {
-						g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(mech));
+					if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
+						g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
 					}
 					again = TRUE;
 				}
@@ -387,7 +387,7 @@
 	if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) {
 		auth = xmlnode_new("auth");
 		xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl");
-		xmlnode_set_attrib(auth, "mechanism", mech);
+		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
 		if (clientout) {
 			if (coutlen == 0) {
 				xmlnode_insert_data(auth, "=", -1);
@@ -490,12 +490,6 @@
 	{
 		char *mech_name = xmlnode_get_data(mechnode);
 #ifdef HAVE_CYRUS_SASL
-		/* Skip the GSSAPI mechanism unless it's enabled for this account */
-		if (mech_name && !strcmp(mech_name, "GSSAPI") &&
-			!purple_account_get_bool(js->gc->account, "auth_gssapi", TRUE)) {
-			continue;
-		}
-
 		g_string_append(js->sasl_mechs, mech_name);
 		g_string_append_c(js->sasl_mechs, ' ');
 #else
@@ -723,13 +717,16 @@
 		} else if(xmlnode_get_child(query, "password")) {
 			if(js->gsc == NULL && !purple_account_get_bool(js->gc->account,
 						"auth_plain_in_clear", FALSE)) {
+				char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+											js->gc->account->username);
 				purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 						_("Plaintext Authentication"),
-						_("This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+						msg,
 						1,
 						purple_connection_get_account(js->gc), NULL, NULL,
 						purple_connection_get_account(js->gc), allow_plaintext_auth,
 						disallow_plaintext_auth);
+				g_free(msg);
 				return;
 			}
 			finish_plaintext_authentication(js);
@@ -1101,8 +1098,24 @@
 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet)
 {
 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-	char *msg = jabber_parse_error(js, packet, &reason);
+	char *msg;
 
+#ifdef HAVE_CYRUS_SASL
+	if(js->auth_fail_count++ < 5) {
+		if (js->current_mech && strlen(js->current_mech) > 0) {
+			char *pos;
+			if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
+				g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
+			}
+		}
+
+		sasl_dispose(&js->sasl);
+
+		jabber_auth_start_cyrus(js);
+		return;
+	}
+#endif
+	msg = jabber_parse_error(js, packet, &reason);
 	if(!msg) {
 		purple_connection_error_reason (js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
--- a/libpurple/protocols/jabber/chat.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/chat.c	Mon Apr 28 00:01:07 2008 +0000
@@ -137,9 +137,12 @@
 {
 	PurpleAccount *account = purple_conversation_get_account(conv);
 	PurpleConnection *gc = purple_account_get_connection(account);
-	JabberStream *js = gc->proto_data;
-	int id = purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv));
-
+	JabberStream *js;
+	int id;
+	if (!gc)
+		return NULL;
+	js = gc->proto_data;
+	id = purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv));
 	return jabber_chat_find_by_id(js, id);
 }
 
--- a/libpurple/protocols/jabber/jabber.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Apr 28 00:01:07 2008 +0000
@@ -2377,7 +2377,7 @@
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_ban,
-	                  _("ban &lt;user&gt; [room]:  Ban a user from the room."),
+	                  _("ban &lt;user&gt; [reason]:  Ban a user from the room."),
 	                  NULL);
 	purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
@@ -2401,13 +2401,13 @@
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_join,
-	                  _("join: &lt;room&gt; [server]:  Join a chat on this server."),
+	                  _("join: &lt;room&gt; [password]:  Join a chat on this server."),
 	                  NULL);
 	purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY |
 	                  PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber",
 	                  jabber_cmd_chat_kick,
-	                  _("kick &lt;user&gt; [room]:  Kick a user from the room."),
+	                  _("kick &lt;user&gt; [reason]:  Kick a user from the room."),
 	                  NULL);
 	purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL,
 	                  PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY,
--- a/libpurple/protocols/jabber/jabber.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Mon Apr 28 00:01:07 2008 +0000
@@ -158,6 +158,11 @@
 	void *sasl;
 	void *sasl_cb;
 #endif
+	/* did someone say something about the end of the struct? */
+#ifdef HAVE_CYRUS_SASL
+	const char *current_mech;
+	int auth_fail_count;
+#endif
 
 	int sasl_state;
 	int sasl_maxbuf;
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon Apr 28 00:01:07 2008 +0000
@@ -223,14 +223,6 @@
 						"auth_plain_in_clear", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						   option);
-
-#ifdef HAVE_CYRUS_SASL
-	option = purple_account_option_bool_new(
-											_("Use GSSAPI (Kerberos v5) for authentication"),
-											"auth_gssapi", TRUE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
-											   option);	
-#endif
 	
 	option = purple_account_option_int_new(_("Connect port"), "port", 5222);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
--- a/libpurple/protocols/jabber/si.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/jabber/si.c	Mon Apr 28 00:01:07 2008 +0000
@@ -664,6 +664,9 @@
 	if(!(jid = xmlnode_get_attrib(streamhost_used, "jid")))
 		return;
 
+	purple_debug_info("jabber", "jabber_si_connect_proxy_cb() will be looking at jsx %p: jsx->streamhosts is %p and jid is %p",
+					  jsx, jsx->streamhosts, jid);
+
 	if(!(matched = g_list_find_custom(jsx->streamhosts, jid, jabber_si_compare_jid)))
 	{
 		gchar *my_jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node,
@@ -780,6 +783,8 @@
 
 			g_snprintf(port, sizeof(port), "%hu", portnum);
 
+			purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and ft_proxy_list[%i] %p",
+							  jsx, jsx->streamhosts, i, ft_proxy_list[i]);
 			if(g_list_find_custom(jsx->streamhosts, ft_proxy_list[i], jabber_si_compare_jid) != NULL)
 				continue;
 
@@ -807,6 +812,8 @@
 		if (!(sh->jid && sh->host && sh->port > 0))
 			continue;
 
+		purple_debug_info("jabber", "jabber_si_xfer_bytestreams_listen_cb() will be looking at jsx %p: jsx->streamhosts %p and sh->jid %p",
+						  jsx, jsx->streamhosts, sh->jid);
 		if(g_list_find_custom(jsx->streamhosts, sh->jid, jabber_si_compare_jid) != NULL)
 			continue;
 
@@ -969,6 +976,8 @@
 	g_free(jsx->rxqueue);
 	g_free(jsx);
 	xfer->data = NULL;
+	
+	purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p", jsx);
 }
 
 static void jabber_si_xfer_cancel_send(PurpleXfer *xfer)
--- a/libpurple/protocols/msnp9/nexus.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/msnp9/nexus.c	Mon Apr 28 00:01:07 2008 +0000
@@ -337,7 +337,8 @@
 	username =
 		g_strdup(purple_url_encode(purple_account_get_username(session->account)));
 
-	password = g_strndup(purple_connection_get_password(session->account->gc), 16);
+	password = g_utf8_strncpy(g_strdup(purple_connection_get_password(session->account->gc)),
+							  purple_connection_get_password(session->account->gc), 16);
 	encpass = g_strdup(purple_url_encode(password));
 	g_free(password);
 
--- a/libpurple/protocols/msnp9/slplink.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/msnp9/slplink.c	Mon Apr 28 00:01:07 2008 +0000
@@ -118,6 +118,8 @@
 	while (slplink->slp_calls != NULL)
 		msn_slp_call_destroy(slplink->slp_calls->data);
 
+	g_queue_free(slplink->slp_msg_queue);
+
 	session->slplinks =
 		g_list_remove(session->slplinks, slplink);
 
--- a/libpurple/protocols/msnp9/switchboard.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/msnp9/switchboard.c	Mon Apr 28 00:01:07 2008 +0000
@@ -111,6 +111,9 @@
 	for (l = swboard->users; l != NULL; l = l->next)
 		g_free(l->data);
 
+	if (swboard->users != NULL)
+		g_list_free(swboard->users);
+
 	session = swboard->session;
 	session->switches = g_list_remove(session->switches, swboard);
 
--- a/libpurple/protocols/msnp9/userlist.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/msnp9/userlist.c	Mon Apr 28 00:01:07 2008 +0000
@@ -362,6 +362,20 @@
 	passport = msn_user_get_passport(user);
 	store = msn_user_get_friendly_name(user);
 
+	if (list_op & MSN_LIST_AL_OP)
+	{
+		/* These are users who are allowed to see our status. */
+		purple_privacy_deny_remove(account, passport, TRUE);
+		purple_privacy_permit_add(account, passport, TRUE);
+	}
+
+	if (list_op & MSN_LIST_BL_OP)
+	{
+		/* These are users who are not allowed to see our status. */
+		purple_privacy_permit_remove(account, passport, TRUE);
+		purple_privacy_deny_add(account, passport, TRUE);
+	}
+
 	if (list_op & MSN_LIST_FL_OP)
 	{
 		GSList *c;
@@ -377,20 +391,6 @@
 		serv_got_alias(gc, passport, store);
 	}
 
-	if (list_op & MSN_LIST_AL_OP)
-	{
-		/* These are users who are allowed to see our status. */
-		purple_privacy_deny_remove(account, passport, TRUE);
-		purple_privacy_permit_add(account, passport, TRUE);
-	}
-
-	if (list_op & MSN_LIST_BL_OP)
-	{
-		/* These are users who are not allowed to see our status. */
-		purple_privacy_permit_remove(account, passport, TRUE);
-		purple_privacy_deny_add(account, passport, TRUE);
-	}
-
 	if (list_op & MSN_LIST_RL_OP)
 	{
 		/* These are users who have us on their buddy list. */
--- a/libpurple/protocols/myspace/myspace.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Mon Apr 28 00:01:07 2008 +0000
@@ -688,6 +688,13 @@
 	username = msim_msg_get_string(msg, "_username");
 	g_return_val_if_fail(username != NULL, FALSE);
 
+	if (msim_is_userid(username)) {
+		purple_debug_info("msim", "Ignoring message from spambot (%s) on account %s\n",
+				username, purple_account_get_username(session->account));
+		g_free(username);
+		return FALSE;
+	}
+
 	msg_msim_markup = msim_msg_get_string(msg, "msg");
 	g_return_val_if_fail(msg_msim_markup != NULL, FALSE);
 
--- a/libpurple/protocols/oscar/bstream.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/bstream.c	Mon Apr 28 00:01:07 2008 +0000
@@ -45,6 +45,11 @@
 	return 0;
 }
 
+void byte_stream_destroy(ByteStream *bs)
+{
+	g_free(bs->data);
+}
+
 int byte_stream_empty(ByteStream *bs)
 {
 	return bs->len - bs->offset;
--- a/libpurple/protocols/oscar/family_admin.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_admin.c	Mon Apr 28 00:01:07 2008 +0000
@@ -40,18 +40,18 @@
 int
 aim_admin_getinfo(OscarData *od, FlapConnection *conn, guint16 info)
 {
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
-	fr = flap_frame_new(od, 0x02, 14);
+	byte_stream_new(&bs, 4);
 
-	snacid = aim_cachesnac(od, 0x0007, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0007, 0x0002, 0x0000, snacid);
+	byte_stream_put16(&bs, info);
+	byte_stream_put16(&bs, 0x0000);
 
-	byte_stream_put16(&fr->data, info);
-	byte_stream_put16(&fr->data, 0x0000);
+	snacid = aim_cachesnac(od, 0x0007, 0x0002, 0x0000, NULL, 0);	
+	flap_connection_send_snac(od, conn, 0x0007, 0x0002, 0x0000, snacid, &bs);	
 
-	flap_connection_send(conn, fr);
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -120,25 +120,28 @@
  * Subtype 0x0004 - Set screenname formatting.
  *
  */
+/*
+ * Subtype 0x0004 - Set screenname formatting.
+ *
+ */
 int
 aim_admin_setnick(OscarData *od, FlapConnection *conn, const char *newnick)
 {
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
-	fr = flap_frame_new(od, 0x02, 10+2+2+strlen(newnick));
-
-	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid);
+	byte_stream_new(&bs, 2+2+strlen(newnick));
 
 	aim_tlvlist_add_str(&tlvlist, 0x0001, newnick);
 
-	aim_tlvlist_write(&fr->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0007, 0x0004, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -150,14 +153,11 @@
 int
 aim_admin_changepasswd(OscarData *od, FlapConnection *conn, const char *newpw, const char *curpw)
 {
-	FlapFrame *fr;
+	ByteStream bs;
 	GSList *tlvlist = NULL;
 	aim_snacid_t snacid;
 
-	fr = flap_frame_new(od, 0x02, 10+4+strlen(curpw)+4+strlen(newpw));
-
-	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid);
+	byte_stream_new(&bs, 4+strlen(curpw)+4+strlen(newpw));
 
 	/* new password TLV t(0002) */
 	aim_tlvlist_add_str(&tlvlist, 0x0002, newpw);
@@ -165,10 +165,11 @@
 	/* current password TLV t(0012) */
 	aim_tlvlist_add_str(&tlvlist, 0x0012, curpw);
 
-	aim_tlvlist_write(&fr->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0007, 0x0004, 0x0000, snacid, &bs);
 
 	return 0;
 }
@@ -180,21 +181,21 @@
 int
 aim_admin_setemail(OscarData *od, FlapConnection *conn, const char *newemail)
 {
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
-	fr = flap_frame_new(od, 0x02, 10+2+2+strlen(newemail));
-
-	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid);
+	byte_stream_new(&bs, 2+2+strlen(newemail));
 
 	aim_tlvlist_add_str(&tlvlist, 0x0011, newemail);
 
-	aim_tlvlist_write(&fr->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0007, 0x0004, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_alert.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_alert.c	Mon Apr 28 00:01:07 2008 +0000
@@ -41,40 +41,41 @@
 aim_email_sendcookies(OscarData *od)
 {
 	FlapConnection *conn;
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ALERT)))
 		return -EINVAL;
 
-	fr = flap_frame_new(od, 0x02, 10+2+16+16);
-	snacid = aim_cachesnac(od, 0x0018, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0018, 0x0006, 0x0000, snacid);
+	byte_stream_new(&bs, 2+16+16);
 
 	/* Number of cookies to follow */
-	byte_stream_put16(&fr->data, 0x0002);
+	byte_stream_put16(&bs, 0x0002);
 
 	/* Cookie */
-	byte_stream_put16(&fr->data, 0x5d5e);
-	byte_stream_put16(&fr->data, 0x1708);
-	byte_stream_put16(&fr->data, 0x55aa);
-	byte_stream_put16(&fr->data, 0x11d3);
-	byte_stream_put16(&fr->data, 0xb143);
-	byte_stream_put16(&fr->data, 0x0060);
-	byte_stream_put16(&fr->data, 0xb0fb);
-	byte_stream_put16(&fr->data, 0x1ecb);
+	byte_stream_put16(&bs, 0x5d5e);
+	byte_stream_put16(&bs, 0x1708);
+	byte_stream_put16(&bs, 0x55aa);
+	byte_stream_put16(&bs, 0x11d3);
+	byte_stream_put16(&bs, 0xb143);
+	byte_stream_put16(&bs, 0x0060);
+	byte_stream_put16(&bs, 0xb0fb);
+	byte_stream_put16(&bs, 0x1ecb);
 
 	/* Cookie */
-	byte_stream_put16(&fr->data, 0xb380);
-	byte_stream_put16(&fr->data, 0x9ad8);
-	byte_stream_put16(&fr->data, 0x0dba);
-	byte_stream_put16(&fr->data, 0x11d5);
-	byte_stream_put16(&fr->data, 0x9f8a);
-	byte_stream_put16(&fr->data, 0x0060);
-	byte_stream_put16(&fr->data, 0xb0ee);
-	byte_stream_put16(&fr->data, 0x0631);
+	byte_stream_put16(&bs, 0xb380);
+	byte_stream_put16(&bs, 0x9ad8);
+	byte_stream_put16(&bs, 0x0dba);
+	byte_stream_put16(&bs, 0x11d5);
+	byte_stream_put16(&bs, 0x9f8a);
+	byte_stream_put16(&bs, 0x0060);
+	byte_stream_put16(&bs, 0xb0ee);
+	byte_stream_put16(&bs, 0x0631);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0018, 0x0006, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0018, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -171,25 +172,26 @@
 aim_email_activate(OscarData *od)
 {
 	FlapConnection *conn;
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_ALERT)))
 		return -EINVAL;
 
-	fr = flap_frame_new(od, 0x02, 10+1+16);
-	snacid = aim_cachesnac(od, 0x0018, 0x0016, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0018, 0x0016, 0x0000, snacid);
+	byte_stream_new(&bs, 1+16);
 
 	/* I would guess this tells AIM that you want updates for your mail accounts */
 	/* ...but I really have no idea */
-	byte_stream_put8(&fr->data, 0x02);
-	byte_stream_put32(&fr->data, 0x04000000);
-	byte_stream_put32(&fr->data, 0x04000000);
-	byte_stream_put32(&fr->data, 0x04000000);
-	byte_stream_put32(&fr->data, 0x00000000);
+	byte_stream_put8(&bs, 0x02);
+	byte_stream_put32(&bs, 0x04000000);
+	byte_stream_put32(&bs, 0x04000000);
+	byte_stream_put32(&bs, 0x04000000);
+	byte_stream_put32(&bs, 0x00000000);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0018, 0x0016, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0018, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_bart.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_bart.c	Mon Apr 28 00:01:07 2008 +0000
@@ -40,25 +40,26 @@
 aim_bart_upload(OscarData *od, const guint8 *icon, guint16 iconlen)
 {
 	FlapConnection *conn;
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0010)) || !icon || !iconlen)
 		return -EINVAL;
 
-	fr = flap_frame_new(od, 0x02, 10 + 2 + 2+iconlen);
-	snacid = aim_cachesnac(od, 0x0010, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0010, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, 2 + 2 + iconlen);
 
 	/* The reference number for the icon */
-	byte_stream_put16(&fr->data, 1);
+	byte_stream_put16(&bs, 1);
 
 	/* The icon */
-	byte_stream_put16(&fr->data, iconlen);
-	byte_stream_putraw(&fr->data, icon, iconlen);
+	byte_stream_put16(&bs, iconlen);
+	byte_stream_putraw(&bs, icon, iconlen);
 
-	flap_connection_send(conn, fr);
-
+	snacid = aim_cachesnac(od, 0x0010, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0010, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -98,30 +99,31 @@
 aim_bart_request(OscarData *od, const char *sn, guint8 iconcsumtype, const guint8 *iconcsum, guint16 iconcsumlen)
 {
 	FlapConnection *conn;
-	FlapFrame *fr;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0010)) || !sn || !strlen(sn) || !iconcsum || !iconcsumlen)
 		return -EINVAL;
 
-	fr = flap_frame_new(od, 0x02, 10 + 1+strlen(sn) + 4 + 1+iconcsumlen);
-	snacid = aim_cachesnac(od, 0x0010, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0010, 0x0004, 0x0000, snacid);
+	byte_stream_new(&bs, 1+strlen(sn) + 4 + 1+iconcsumlen);
 
 	/* Screen name */
-	byte_stream_put8(&fr->data, strlen(sn));
-	byte_stream_putstr(&fr->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	/* Some numbers.  You like numbers, right? */
-	byte_stream_put8(&fr->data, 0x01);
-	byte_stream_put16(&fr->data, 0x0001);
-	byte_stream_put8(&fr->data, iconcsumtype);
+	byte_stream_put8(&bs, 0x01);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put8(&bs, iconcsumtype);
 
 	/* Icon string */
-	byte_stream_put8(&fr->data, iconcsumlen);
-	byte_stream_putraw(&fr->data, iconcsum, iconcsumlen);
+	byte_stream_put8(&bs, iconcsumlen);
+	byte_stream_putraw(&bs, iconcsum, iconcsumlen);
 
-	flap_connection_send(conn, fr);
+	snacid = aim_cachesnac(od, 0x0010, 0x0004, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0010, 0x0004, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_bos.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_bos.c	Mon Apr 28 00:01:07 2008 +0000
@@ -114,7 +114,7 @@
  */
 int aim_bos_changevisibility(OscarData *od, FlapConnection *conn, int changetype, const char *denylist)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	int packlen = 0;
 	guint16 subtype;
 	char *localcpy = NULL, *tmpptr = NULL;
@@ -139,24 +139,24 @@
 	localcpy = g_strdup(denylist);
 
 	listcount = aimutil_itemcnt(localcpy, '&');
-	packlen = aimutil_tokslen(localcpy, 99, '&') + listcount + 9;
+	packlen = aimutil_tokslen(localcpy, 99, '&') + listcount-1;
 
-	frame = flap_frame_new(od, 0x02, packlen);
-
-	snacid = aim_cachesnac(od, 0x0009, subtype, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0009, subtype, 0x00, snacid);
+	byte_stream_new(&bs, packlen);
 
 	for (i = 0; (i < (listcount - 1)) && (i < 99); i++) {
 		tmpptr = aimutil_itemindex(localcpy, i, '&');
 
-		byte_stream_put8(&frame->data, strlen(tmpptr));
-		byte_stream_putstr(&frame->data, tmpptr);
+		byte_stream_put8(&bs, strlen(tmpptr));
+		byte_stream_putstr(&bs, tmpptr);
 
 		g_free(tmpptr);
 	}
 	g_free(localcpy);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0009, subtype, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0009, subtype, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_buddy.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_buddy.c	Mon Apr 28 00:01:07 2008 +0000
@@ -97,21 +97,21 @@
 int
 aim_buddylist_addbuddy(OscarData *od, FlapConnection *conn, const char *sn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!sn || !strlen(sn))
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+1+strlen(sn));
+	byte_stream_new(&bs, 1+strlen(sn));
+
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	snacid = aim_cachesnac(od, 0x0003, 0x0004, 0x0000, sn, strlen(sn)+1);
-	aim_putsnac(&frame->data, 0x0003, 0x0004, 0x0000, snacid);
+	flap_connection_send_snac(od, conn, 0x0003, 0x0004, 0x0000, snacid, &bs);
 
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
-
-	flap_connection_send(conn, frame);
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -129,7 +129,7 @@
 int
 aim_buddylist_set(OscarData *od, FlapConnection *conn, const char *buddy_list)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int len = 0;
 	char *localcpy = NULL;
@@ -145,10 +145,7 @@
 		tmpptr = strtok(NULL, "&");
 	}
 
-	frame = flap_frame_new(od, 0x02, 10+len);
-
-	snacid = aim_cachesnac(od, 0x0003, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0003, 0x0004, 0x0000, snacid);
+	byte_stream_new(&bs, len);
 
 	strncpy(localcpy, buddy_list, strlen(buddy_list) + 1);
 
@@ -157,12 +154,15 @@
 		purple_debug_misc("oscar", "---adding: %s (%" G_GSIZE_FORMAT
 				")\n", tmpptr, strlen(tmpptr));
 
-		byte_stream_put8(&frame->data, strlen(tmpptr));
-		byte_stream_putstr(&frame->data, tmpptr);
+		byte_stream_put8(&bs, strlen(tmpptr));
+		byte_stream_putstr(&bs, tmpptr);
 		tmpptr = strtok(NULL, "&");
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0003, 0x0004, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0003, 0x0004, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	g_free(localcpy);
 
@@ -179,21 +179,21 @@
 int
 aim_buddylist_removebuddy(OscarData *od, FlapConnection *conn, const char *sn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!sn || !strlen(sn))
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+1+strlen(sn));
+	byte_stream_new(&bs, 1 + strlen(sn));
+
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	snacid = aim_cachesnac(od, 0x0003, 0x0005, 0x0000, sn, strlen(sn)+1);
-	aim_putsnac(&frame->data, 0x0003, 0x0005, 0x0000, snacid);
+	flap_connection_send_snac(od, conn, 0x0003, 0x0005, 0x0000, snacid, &bs);
 
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
-
-	flap_connection_send(conn, frame);
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_chat.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_chat.c	Mon Apr 28 00:01:07 2008 +0000
@@ -353,7 +353,7 @@
 aim_chat_send_im(OscarData *od, FlapConnection *conn, guint16 flags, const gchar *msg, int msglen, const char *encoding, const char *language)
 {
 	int i;
-	FlapFrame *frame;
+	ByteStream bs;
 	IcbmCookie *cookie;
 	aim_snacid_t snacid;
 	guint8 ckstr[8];
@@ -362,10 +362,9 @@
 	if (!od || !conn || !msg || (msglen <= 0))
 		return 0;
 
-	frame = flap_frame_new(od, 0x02, 1152);
+	byte_stream_new(&bs, 1142);
 
 	snacid = aim_cachesnac(od, 0x000e, 0x0005, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x000e, 0x0005, 0x0000, snacid);
 
 	/*
 	 * Cookie
@@ -382,8 +381,8 @@
 	aim_cachecookie(od, cookie);
 
 	/* ICBM Header */
-	byte_stream_putraw(&frame->data, ckstr, 8); /* Cookie */
-	byte_stream_put16(&frame->data, 0x0003); /* Channel */
+	byte_stream_putraw(&bs, ckstr, 8); /* Cookie */
+	byte_stream_put16(&bs, 0x0003); /* Channel */
 
 	/*
 	 * Type 1: Flag meaning this message is destined to the room.
@@ -428,13 +427,15 @@
 	 */
 	aim_tlvlist_add_frozentlvlist(&tlvlist, 0x0005, &inner_tlvlist);
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x000e, 0x0005, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/family_chatnav.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_chatnav.c	Mon Apr 28 00:01:07 2008 +0000
@@ -91,17 +91,16 @@
 	static const char ck[] = {"create"};
 	static const char lang[] = {"en"};
 	static const char charset[] = {"us-ascii"};
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
-	frame = flap_frame_new(od, 0x02, 1152);
+	byte_stream_new(&bs, 1142);
 
 	snacid = aim_cachesnac(od, 0x000d, 0x0008, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x000d, 0x0008, 0x0000, snacid);
 
 	/* exchange */
-	byte_stream_put16(&frame->data, exchange);
+	byte_stream_put16(&bs, exchange);
 
 	/*
 	 * This looks to be a big hack.  You'll note that this entire
@@ -114,8 +113,8 @@
 	 * AOL style, I'm going to guess that it is the latter, and that
 	 * the value of the room name in create requests is ignored.
 	 */
-	byte_stream_put8(&frame->data, strlen(ck));
-	byte_stream_putstr(&frame->data, ck);
+	byte_stream_put8(&bs, strlen(ck));
+	byte_stream_putstr(&bs, ck);
 
 	/*
 	 * instance
@@ -123,22 +122,24 @@
 	 * Setting this to 0xffff apparently assigns the last instance.
 	 *
 	 */
-	byte_stream_put16(&frame->data, 0xffff);
+	byte_stream_put16(&bs, 0xffff);
 
 	/* detail level */
-	byte_stream_put8(&frame->data, 0x01);
+	byte_stream_put8(&bs, 0x01);
 
 	aim_tlvlist_add_str(&tlvlist, 0x00d3, name);
 	aim_tlvlist_add_str(&tlvlist, 0x00d6, charset);
 	aim_tlvlist_add_str(&tlvlist, 0x00d7, lang);
 
 	/* tlvcount */
-	byte_stream_put16(&frame->data, aim_tlvlist_count(tlvlist));
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	byte_stream_put16(&bs, aim_tlvlist_count(tlvlist));
+	aim_tlvlist_write(&bs, &tlvlist);
 
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x000d, 0x0008, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_feedbag.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1241,21 +1241,21 @@
 int aim_ssi_reqifchanged(OscarData *od, time_t timestamp, guint16 numitems)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)))
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+4+2);
+	byte_stream_new(&bs, 4+2);
+
+	byte_stream_put32(&bs, timestamp);
+	byte_stream_put16(&bs, numitems);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED, 0x0000, snacid, &bs);
 
-	aim_putsnac(&frame->data, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_REQIFCHANGED, 0x0000, snacid);
-	byte_stream_put32(&frame->data, timestamp);
-	byte_stream_put16(&frame->data, numitems);
-
-	flap_connection_send(conn, frame);
+	byte_stream_destroy(&bs);
 
 	/* Free any current data, just in case */
 	aim_ssi_freelist(od);
@@ -1343,42 +1343,42 @@
 static int aim_ssi_addmoddel(OscarData *od)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
-	int snaclen;
+	int bslen;
 	struct aim_ssi_tmp *cur;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)) || !od->ssi.pending || !od->ssi.pending->item)
 		return -EINVAL;
 
 	/* Calculate total SNAC size */
-	snaclen = 10; /* For family, subtype, flags, and SNAC ID */
+	bslen = 0;
 	for (cur=od->ssi.pending; cur; cur=cur->next) {
-		snaclen += 10; /* For length, GID, BID, type, and length */
+		bslen += 10; /* For length, GID, BID, type, and length */
 		if (cur->item->name)
-			snaclen += strlen(cur->item->name);
+			bslen += strlen(cur->item->name);
 		if (cur->item->data)
-			snaclen += aim_tlvlist_size(cur->item->data);
+			bslen += aim_tlvlist_size(cur->item->data);
 	}
 
-	frame = flap_frame_new(od, 0x02, snaclen);
+	byte_stream_new(&bs, bslen);
+
+	for (cur=od->ssi.pending; cur; cur=cur->next) {
+		byte_stream_put16(&bs, cur->item->name ? strlen(cur->item->name) : 0);
+		if (cur->item->name)
+			byte_stream_putstr(&bs, cur->item->name);
+		byte_stream_put16(&bs, cur->item->gid);
+		byte_stream_put16(&bs, cur->item->bid);
+		byte_stream_put16(&bs, cur->item->type);
+		byte_stream_put16(&bs, cur->item->data ? aim_tlvlist_size(cur->item->data) : 0);
+		if (cur->item->data)
+			aim_tlvlist_write(&bs, &cur->item->data);
+	}
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, 0x0000, snacid);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, od->ssi.pending->action, 0x0000, snacid, &bs);
 
-	for (cur=od->ssi.pending; cur; cur=cur->next) {
-		byte_stream_put16(&frame->data, cur->item->name ? strlen(cur->item->name) : 0);
-		if (cur->item->name)
-			byte_stream_putstr(&frame->data, cur->item->name);
-		byte_stream_put16(&frame->data, cur->item->gid);
-		byte_stream_put16(&frame->data, cur->item->bid);
-		byte_stream_put16(&frame->data, cur->item->type);
-		byte_stream_put16(&frame->data, cur->item->data ? aim_tlvlist_size(cur->item->data) : 0);
-		if (cur->item->data)
-			aim_tlvlist_write(&frame->data, &cur->item->data);
-	}
-
-	flap_connection_send(conn, frame);
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1684,32 +1684,32 @@
 int aim_ssi_sendauth(OscarData *od, char *sn, char *msg)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)) || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+1+strlen(sn)+2+(msg ? strlen(msg)+1 : 0)+2);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, snacid);
+	byte_stream_new(&bs, 1+strlen(sn)+2+(msg ? strlen(msg)+1 : 0)+2);
 
 	/* Screen name */
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	/* Message (null terminated) */
-	byte_stream_put16(&frame->data, msg ? strlen(msg) : 0);
+	byte_stream_put16(&bs, msg ? strlen(msg) : 0);
 	if (msg) {
-		byte_stream_putstr(&frame->data, msg);
-		byte_stream_put8(&frame->data, 0x00);
+		byte_stream_putstr(&bs, msg);
+		byte_stream_put8(&bs, 0x00);
 	}
 
 	/* Unknown */
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTH, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1758,32 +1758,32 @@
 int aim_ssi_sendauthrequest(OscarData *od, char *sn, const char *msg)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)) || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+1+strlen(sn)+2+(msg ? strlen(msg)+1 : 0)+2);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, snacid);
+	byte_stream_new(&bs, 1+strlen(sn) + 2+(msg ? (strlen(msg)+1) : 0) + 2);
 
 	/* Screen name */
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	/* Message (null terminated) */
-	byte_stream_put16(&frame->data, msg ? strlen(msg) : 0);
+	byte_stream_put16(&bs, msg ? strlen(msg) : 0);
 	if (msg) {
-		byte_stream_putstr(&frame->data, msg);
-		byte_stream_put8(&frame->data, 0x00);
+		byte_stream_putstr(&bs, msg);
+		byte_stream_put8(&bs, 0x00);
 	}
 
 	/* Unknown */
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREQ, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1835,36 +1835,36 @@
 int aim_ssi_sendauthreply(OscarData *od, char *sn, guint8 reply, const char *msg)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_FEEDBAG)) || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10 + 1+strlen(sn) + 1 + 2+(msg ? strlen(msg)+1 : 0) + 2);
-
-	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, snacid);
+	byte_stream_new(&bs, 1+strlen(sn) + 1 + 2+(msg ? (strlen(msg)+1) : 0) + 2);
 
 	/* Screen name */
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	/* Grant or deny */
-	byte_stream_put8(&frame->data, reply);
+	byte_stream_put8(&bs, reply);
 
 	/* Message (null terminated) */
-	byte_stream_put16(&frame->data, msg ? (strlen(msg)+1) : 0);
+	byte_stream_put16(&bs, msg ? (strlen(msg)+1) : 0);
 	if (msg) {
-		byte_stream_putstr(&frame->data, msg);
-		byte_stream_put8(&frame->data, 0x00);
+		byte_stream_putstr(&bs, msg);
+		byte_stream_put8(&bs, 0x00);
 	}
 
 	/* Unknown */
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_FEEDBAG, SNAC_SUBTYPE_FEEDBAG_SENDAUTHREP, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/family_icbm.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Mon Apr 28 00:01:07 2008 +0000
@@ -161,7 +161,7 @@
 int aim_im_setparams(OscarData *od, struct aim_icbmparameters *params)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
@@ -170,23 +170,23 @@
 	if (!params)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+16);
-
-	snacid = aim_cachesnac(od, 0x0004, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, 16);
 
 	/* This is read-only (see Parameter Reply). Must be set to zero here. */
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
 
 	/* These are all read-write */
-	byte_stream_put32(&frame->data, params->flags);
-	byte_stream_put16(&frame->data, params->maxmsglen);
-	byte_stream_put16(&frame->data, params->maxsenderwarn);
-	byte_stream_put16(&frame->data, params->maxrecverwarn);
-	byte_stream_put32(&frame->data, params->minmsginterval);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put32(&bs, params->flags);
+	byte_stream_put16(&bs, params->maxmsglen);
+	byte_stream_put16(&bs, params->maxsenderwarn);
+	byte_stream_put16(&bs, params->maxrecverwarn);
+	byte_stream_put32(&bs, params->minmsginterval);
+
+	snacid = aim_cachesnac(od, 0x0004, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -413,7 +413,7 @@
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, args->destsn, strlen(args->destsn)+1);
 
 	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &data);
-	g_free(data.data);
+	byte_stream_destroy(&data);
 
 	/* clean out SNACs over 60sec old */
 	aim_cleansnacs(od, 60);
@@ -454,7 +454,7 @@
 int aim_im_sendch2_chatinvite(OscarData *od, const char *sn, const char *msg, guint16 exchange, const char *roomname, guint16 instance)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	IcbmCookie *msgcookie;
 	struct aim_invite_priv *priv;
@@ -470,10 +470,9 @@
 
 	aim_icbm_makecookie(cookie);
 
-	frame = flap_frame_new(od, 0x02, 1152+strlen(sn)+strlen(roomname)+strlen(msg));
+	byte_stream_new(&bs, 1142+strlen(sn)+strlen(roomname)+strlen(msg));
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, sn, strlen(sn)+1);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* XXX should be uncached by an unwritten 'invite accept' handler */
 	priv = g_malloc(sizeof(struct aim_invite_priv));
@@ -488,7 +487,7 @@
 		g_free(priv);
 
 	/* ICBM Header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	/*
 	 * TLV t(0005)
@@ -513,14 +512,16 @@
 	aim_tlvlist_write(&hdrbs, &inner_tlvlist);
 
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
-	g_free(hdrbs.data);
-
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	byte_stream_destroy(&hdrbs);
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -534,7 +535,7 @@
 int aim_im_sendch2_icon(OscarData *od, const char *sn, const guint8 *icon, int iconlen, time_t stamp, guint16 iconsum)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	guchar cookie[8];
 
@@ -546,51 +547,52 @@
 
 	aim_icbm_makecookie(cookie);
 
-	frame = flap_frame_new(od, 0x02, 10+8+2+1+strlen(sn)+2+2+2+8+16+2+2+2+2+2+2+2+4+4+4+iconlen+strlen(AIM_ICONIDENT)+2+2);
+	byte_stream_new(&bs, 8+2+1+strlen(sn)+2+2+2+8+16+2+2+2+2+2+2+2+4+4+4+iconlen+strlen(AIM_ICONIDENT)+2+2);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	/*
 	 * TLV t(0005)
 	 *
 	 * Encompasses everything below.
 	 */
-	byte_stream_put16(&frame->data, 0x0005);
-	byte_stream_put16(&frame->data, 2+8+16+6+4+4+iconlen+4+4+4+strlen(AIM_ICONIDENT));
-
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_putraw(&frame->data, cookie, 8);
-	byte_stream_putcaps(&frame->data, OSCAR_CAPABILITY_BUDDYICON);
+	byte_stream_put16(&bs, 0x0005);
+	byte_stream_put16(&bs, 2+8+16+6+4+4+iconlen+4+4+4+strlen(AIM_ICONIDENT));
+
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_putraw(&bs, cookie, 8);
+	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_BUDDYICON);
 
 	/* TLV t(000a) */
-	byte_stream_put16(&frame->data, 0x000a);
-	byte_stream_put16(&frame->data, 0x0002);
-	byte_stream_put16(&frame->data, 0x0001);
+	byte_stream_put16(&bs, 0x000a);
+	byte_stream_put16(&bs, 0x0002);
+	byte_stream_put16(&bs, 0x0001);
 
 	/* TLV t(000f) */
-	byte_stream_put16(&frame->data, 0x000f);
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x000f);
+	byte_stream_put16(&bs, 0x0000);
 
 	/* TLV t(2711) */
-	byte_stream_put16(&frame->data, 0x2711);
-	byte_stream_put16(&frame->data, 4+4+4+iconlen+strlen(AIM_ICONIDENT));
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_put16(&frame->data, iconsum);
-	byte_stream_put32(&frame->data, iconlen);
-	byte_stream_put32(&frame->data, stamp);
-	byte_stream_putraw(&frame->data, icon, iconlen);
-	byte_stream_putstr(&frame->data, AIM_ICONIDENT);
+	byte_stream_put16(&bs, 0x2711);
+	byte_stream_put16(&bs, 4+4+4+iconlen+strlen(AIM_ICONIDENT));
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_put16(&bs, iconsum);
+	byte_stream_put32(&bs, iconlen);
+	byte_stream_put32(&bs, stamp);
+	byte_stream_putraw(&bs, icon, iconlen);
+	byte_stream_putstr(&bs, AIM_ICONIDENT);
 
 	/* TLV t(0003) */
-	byte_stream_put16(&frame->data, 0x0003);
-	byte_stream_put16(&frame->data, 0x0000);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put16(&bs, 0x0003);
+	byte_stream_put16(&bs, 0x0000);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -612,7 +614,7 @@
 int aim_im_sendch2_rtfmsg(OscarData *od, struct aim_sendrtfmsg_args *args)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	guchar cookie[8];
 	const char rtfcap[] = {"{97B12751-243C-4334-AD22-D6ABF73F1492}"}; /* OSCAR_CAPABILITY_ICQRTF capability in string form */
@@ -628,61 +630,62 @@
 
 	aim_icbm_makecookie(cookie);
 
-	frame = flap_frame_new(od, 0x02, 10+128+servdatalen);
+	byte_stream_new(&bs, 128+servdatalen);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, args->destsn);
+	aim_im_puticbm(&bs, cookie, 0x0002, args->destsn);
 
 	/* TLV t(0005) - Encompasses everything below. */
-	byte_stream_put16(&frame->data, 0x0005);
-	byte_stream_put16(&frame->data, 2+8+16  +  2+2+2  +  2+2  +  2+2+servdatalen);
-
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_putraw(&frame->data, cookie, 8);
-	byte_stream_putcaps(&frame->data, OSCAR_CAPABILITY_ICQSERVERRELAY);
+	byte_stream_put16(&bs, 0x0005);
+	byte_stream_put16(&bs, 2+8+16  +  2+2+2  +  2+2  +  2+2+servdatalen);
+
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_putraw(&bs, cookie, 8);
+	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_ICQSERVERRELAY);
 
 	/* t(000a) l(0002) v(0001) */
-	byte_stream_put16(&frame->data, 0x000a);
-	byte_stream_put16(&frame->data, 0x0002);
-	byte_stream_put16(&frame->data, 0x0001);
+	byte_stream_put16(&bs, 0x000a);
+	byte_stream_put16(&bs, 0x0002);
+	byte_stream_put16(&bs, 0x0001);
 
 	/* t(000f) l(0000) v() */
-	byte_stream_put16(&frame->data, 0x000f);
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x000f);
+	byte_stream_put16(&bs, 0x0000);
 
 	/* Service Data TLV */
-	byte_stream_put16(&frame->data, 0x2711);
-	byte_stream_put16(&frame->data, servdatalen);
-
-	byte_stream_putle16(&frame->data, 11 + 16 /* 11 + (sizeof CLSID) */);
-	byte_stream_putle16(&frame->data, 9);
-	byte_stream_putcaps(&frame->data, OSCAR_CAPABILITY_EMPTY);
-	byte_stream_putle16(&frame->data, 0);
-	byte_stream_putle32(&frame->data, 0);
-	byte_stream_putle8(&frame->data, 0);
-	byte_stream_putle16(&frame->data, 0x03ea); /* trid1 */
-
-	byte_stream_putle16(&frame->data, 14);
-	byte_stream_putle16(&frame->data, 0x03eb); /* trid2 */
-	byte_stream_putle32(&frame->data, 0);
-	byte_stream_putle32(&frame->data, 0);
-	byte_stream_putle32(&frame->data, 0);
-
-	byte_stream_putle16(&frame->data, 0x0001);
-	byte_stream_putle32(&frame->data, 0);
-	byte_stream_putle16(&frame->data, strlen(args->rtfmsg)+1);
-	byte_stream_putraw(&frame->data, (const guint8 *)args->rtfmsg, strlen(args->rtfmsg)+1);
-
-	byte_stream_putle32(&frame->data, args->fgcolor);
-	byte_stream_putle32(&frame->data, args->bgcolor);
-	byte_stream_putle32(&frame->data, strlen(rtfcap)+1);
-	byte_stream_putraw(&frame->data, (const guint8 *)rtfcap, strlen(rtfcap)+1);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put16(&bs, 0x2711);
+	byte_stream_put16(&bs, servdatalen);
+
+	byte_stream_putle16(&bs, 11 + 16 /* 11 + (sizeof CLSID) */);
+	byte_stream_putle16(&bs, 9);
+	byte_stream_putcaps(&bs, OSCAR_CAPABILITY_EMPTY);
+	byte_stream_putle16(&bs, 0);
+	byte_stream_putle32(&bs, 0);
+	byte_stream_putle8(&bs, 0);
+	byte_stream_putle16(&bs, 0x03ea); /* trid1 */
+
+	byte_stream_putle16(&bs, 14);
+	byte_stream_putle16(&bs, 0x03eb); /* trid2 */
+	byte_stream_putle32(&bs, 0);
+	byte_stream_putle32(&bs, 0);
+	byte_stream_putle32(&bs, 0);
+
+	byte_stream_putle16(&bs, 0x0001);
+	byte_stream_putle32(&bs, 0);
+	byte_stream_putle16(&bs, strlen(args->rtfmsg)+1);
+	byte_stream_putraw(&bs, (const guint8 *)args->rtfmsg, strlen(args->rtfmsg)+1);
+
+	byte_stream_putle32(&bs, args->fgcolor);
+	byte_stream_putle32(&bs, args->bgcolor);
+	byte_stream_putle32(&bs, strlen(rtfcap)+1);
+	byte_stream_putraw(&bs, (const guint8 *)rtfcap, strlen(rtfcap)+1);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -695,7 +698,7 @@
 {
 	OscarData *od;
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
@@ -705,13 +708,12 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 128+strlen(peer_conn->sn));
+	byte_stream_new(&bs, 118+strlen(peer_conn->sn));
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, peer_conn->cookie, 0x0002, peer_conn->sn);
+	aim_im_puticbm(&bs, peer_conn->cookie, 0x0002, peer_conn->sn);
 
 	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);
 
@@ -728,12 +730,14 @@
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
 	g_free(hdrbs.data);
 
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /**
@@ -745,7 +749,7 @@
 {
 	OscarData *od;
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	od = peer_conn->od;
@@ -753,21 +757,22 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 10 + 11+strlen(peer_conn->sn) + 4+2+8+16);
+	byte_stream_new(&bs, 11+strlen(peer_conn->sn) + 4+2+8+16);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, peer_conn->cookie, 0x0002, peer_conn->sn);
-
-	byte_stream_put16(&frame->data, 0x0005);
-	byte_stream_put16(&frame->data, 0x001a);
-	byte_stream_put16(&frame->data, AIM_RENDEZVOUS_CONNECTED);
-	byte_stream_putraw(&frame->data, peer_conn->cookie, 8);
-	byte_stream_putcaps(&frame->data, peer_conn->type);
-
-	flap_connection_send(conn, frame);
+	aim_im_puticbm(&bs, peer_conn->cookie, 0x0002, peer_conn->sn);
+
+	byte_stream_put16(&bs, 0x0005);
+	byte_stream_put16(&bs, 0x001a);
+	byte_stream_put16(&bs, AIM_RENDEZVOUS_CONNECTED);
+	byte_stream_putraw(&bs, peer_conn->cookie, 8);
+	byte_stream_putcaps(&bs, peer_conn->type);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);	
 }
 
 /**
@@ -781,7 +786,7 @@
 aim_im_sendch2_odc_requestdirect(OscarData *od, guchar *cookie, const char *sn, const guint8 *ip, guint16 port, guint16 requestnumber)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
@@ -790,13 +795,12 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 256+strlen(sn));
+	byte_stream_new(&bs, 246+strlen(sn));
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);
 
@@ -814,14 +818,16 @@
 	aim_tlvlist_write(&hdrbs, &inner_tlvlist);
 
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
-	g_free(hdrbs.data);
-
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	byte_stream_destroy(&hdrbs);
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /**
@@ -832,7 +838,7 @@
 aim_im_sendch2_odc_requestproxy(OscarData *od, guchar *cookie, const char *sn, const guint8 *ip, guint16 pin, guint16 requestnumber)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
@@ -842,13 +848,12 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 256+strlen(sn));
+	byte_stream_new(&bs, 246+strlen(sn));
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);
 
@@ -876,14 +881,16 @@
 	aim_tlvlist_write(&hdrbs, &inner_tlvlist);
 
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
-	g_free(hdrbs.data);
-
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	byte_stream_destroy(&hdrbs);
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /**
@@ -894,7 +901,7 @@
 aim_im_sendch2_sendfile_requestdirect(OscarData *od, guchar *cookie, const char *sn, const guint8 *ip, guint16 port, guint16 requestnumber, const gchar *filename, guint32 size, guint16 numfiles)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
@@ -903,13 +910,12 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 1024);
+	byte_stream_new(&bs, 1014);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);
 
@@ -952,20 +958,22 @@
 		byte_stream_put8(&bs, 0x00);
 
 		aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, bs.len, bs.data);
-		g_free(bs.data);
+		byte_stream_destroy(&bs);
 		/* End TLV t(2711) */
 	}
 
 	aim_tlvlist_write(&hdrbs, &inner_tlvlist);
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
-	g_free(hdrbs.data);
-
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	byte_stream_destroy(&hdrbs);
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /**
@@ -976,7 +984,7 @@
 aim_im_sendch2_sendfile_requestproxy(OscarData *od, guchar *cookie, const char *sn, const guint8 *ip, guint16 pin, guint16 requestnumber, const gchar *filename, guint32 size, guint16 numfiles)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *outer_tlvlist = NULL, *inner_tlvlist = NULL;
 	ByteStream hdrbs;
@@ -986,13 +994,12 @@
 	if (conn == NULL)
 		return;
 
-	frame = flap_frame_new(od, 0x02, 1024);
+	byte_stream_new(&bs, 1014);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);
 
@@ -1030,34 +1037,36 @@
 
 	if (filename != NULL)
 	{
-		ByteStream bs;
+		ByteStream filename_bs;
 
 		/* Begin TLV t(2711) */
-		byte_stream_new(&bs, 2+2+4+strlen(filename)+1);
-		byte_stream_put16(&bs, (numfiles > 1) ? 0x0002 : 0x0001);
-		byte_stream_put16(&bs, numfiles);
-		byte_stream_put32(&bs, size);
+		byte_stream_new(&filename_bs, 2+2+4+strlen(filename)+1);
+		byte_stream_put16(&filename_bs, (numfiles > 1) ? 0x0002 : 0x0001);
+		byte_stream_put16(&filename_bs, numfiles);
+		byte_stream_put32(&filename_bs, size);
 
 		/* Filename - NULL terminated, for some odd reason */
-		byte_stream_putstr(&bs, filename);
-		byte_stream_put8(&bs, 0x00);
-
-		aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, bs.len, bs.data);
-		g_free(bs.data);
+		byte_stream_putstr(&filename_bs, filename);
+		byte_stream_put8(&filename_bs, 0x00);
+
+		aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, filename_bs.len, filename_bs.data);
+		byte_stream_destroy(&filename_bs);
 		/* End TLV t(2711) */
 	}
 
 	aim_tlvlist_write(&hdrbs, &inner_tlvlist);
 
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&hdrbs), hdrbs.data);
-	g_free(hdrbs.data);
-
-	aim_tlvlist_write(&frame->data, &outer_tlvlist);
+	byte_stream_destroy(&hdrbs);
+
+	aim_tlvlist_write(&bs, &outer_tlvlist);
 
 	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /**
@@ -1072,7 +1081,7 @@
 int aim_im_sendch2_geticqaway(OscarData *od, const char *sn, int type)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	guchar cookie[8];
 
@@ -1081,79 +1090,80 @@
 
 	aim_icbm_makecookie(cookie);
 
-	frame = flap_frame_new(od, 0x02, 10+8+2+1+strlen(sn) + 4+0x5e + 4);
+	byte_stream_new(&bs, 8+2+1+strlen(sn) + 4+0x5e + 4);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
+	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	/* TLV t(0005) - Encompasses almost everything below. */
-	byte_stream_put16(&frame->data, 0x0005); /* T */
-	byte_stream_put16(&frame->data, 0x005e); /* L */
+	byte_stream_put16(&bs, 0x0005); /* T */
+	byte_stream_put16(&bs, 0x005e); /* L */
 	{ /* V */
-		byte_stream_put16(&frame->data, 0x0000);
+		byte_stream_put16(&bs, 0x0000);
 
 		/* Cookie */
-		byte_stream_putraw(&frame->data, cookie, 8);
+		byte_stream_putraw(&bs, cookie, 8);
 
 		/* Put the 16 byte server relay capability */
-		byte_stream_putcaps(&frame->data, OSCAR_CAPABILITY_ICQSERVERRELAY);
+		byte_stream_putcaps(&bs, OSCAR_CAPABILITY_ICQSERVERRELAY);
 
 		/* TLV t(000a) */
-		byte_stream_put16(&frame->data, 0x000a);
-		byte_stream_put16(&frame->data, 0x0002);
-		byte_stream_put16(&frame->data, 0x0001);
+		byte_stream_put16(&bs, 0x000a);
+		byte_stream_put16(&bs, 0x0002);
+		byte_stream_put16(&bs, 0x0001);
 
 		/* TLV t(000f) */
-		byte_stream_put16(&frame->data, 0x000f);
-		byte_stream_put16(&frame->data, 0x0000);
+		byte_stream_put16(&bs, 0x000f);
+		byte_stream_put16(&bs, 0x0000);
 
 		/* TLV t(2711) */
-		byte_stream_put16(&frame->data, 0x2711);
-		byte_stream_put16(&frame->data, 0x0036);
+		byte_stream_put16(&bs, 0x2711);
+		byte_stream_put16(&bs, 0x0036);
 		{ /* V */
-			byte_stream_putle16(&frame->data, 0x001b); /* L */
-			byte_stream_putle16(&frame->data, 0x0009); /* Protocol version */
-			byte_stream_putcaps(&frame->data, OSCAR_CAPABILITY_EMPTY);
-			byte_stream_putle16(&frame->data, 0x0000); /* Unknown */
-			byte_stream_putle16(&frame->data, 0x0001); /* Client features? */
-			byte_stream_putle16(&frame->data, 0x0000); /* Unknown */
-			byte_stream_putle8(&frame->data, 0x00); /* Unkizown */
-			byte_stream_putle16(&frame->data, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
-
-			byte_stream_putle16(&frame->data, 0x000e); /* L */
-			byte_stream_putle16(&frame->data, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
-			byte_stream_putle32(&frame->data, 0x00000000); /* Unknown */
-			byte_stream_putle32(&frame->data, 0x00000000); /* Unknown */
-			byte_stream_putle32(&frame->data, 0x00000000); /* Unknown */
+			byte_stream_putle16(&bs, 0x001b); /* L */
+			byte_stream_putle16(&bs, 0x0009); /* Protocol version */
+			byte_stream_putcaps(&bs, OSCAR_CAPABILITY_EMPTY);
+			byte_stream_putle16(&bs, 0x0000); /* Unknown */
+			byte_stream_putle16(&bs, 0x0001); /* Client features? */
+			byte_stream_putle16(&bs, 0x0000); /* Unknown */
+			byte_stream_putle8(&bs, 0x00); /* Unkizown */
+			byte_stream_putle16(&bs, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
+
+			byte_stream_putle16(&bs, 0x000e); /* L */
+			byte_stream_putle16(&bs, 0xffff); /* Sequence number?  XXX - This should decrement by 1 with each request */
+			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
+			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
+			byte_stream_putle32(&bs, 0x00000000); /* Unknown */
 
 			/* The type of status message being requested */
 			if (type & AIM_ICQ_STATE_CHAT)
-				byte_stream_putle16(&frame->data, 0x03ec);
+				byte_stream_putle16(&bs, 0x03ec);
 			else if(type & AIM_ICQ_STATE_DND)
-				byte_stream_putle16(&frame->data, 0x03eb);
+				byte_stream_putle16(&bs, 0x03eb);
 			else if(type & AIM_ICQ_STATE_OUT)
-				byte_stream_putle16(&frame->data, 0x03ea);
+				byte_stream_putle16(&bs, 0x03ea);
 			else if(type & AIM_ICQ_STATE_BUSY)
-				byte_stream_putle16(&frame->data, 0x03e9);
+				byte_stream_putle16(&bs, 0x03e9);
 			else if(type & AIM_ICQ_STATE_AWAY)
-				byte_stream_putle16(&frame->data, 0x03e8);
-
-			byte_stream_putle16(&frame->data, 0x0001); /* Status? */
-			byte_stream_putle16(&frame->data, 0x0001); /* Priority of this message? */
-			byte_stream_putle16(&frame->data, 0x0001); /* L */
-			byte_stream_putle8(&frame->data, 0x00); /* String of length L */
+				byte_stream_putle16(&bs, 0x03e8);
+
+			byte_stream_putle16(&bs, 0x0001); /* Status? */
+			byte_stream_putle16(&bs, 0x0001); /* Priority of this message? */
+			byte_stream_putle16(&bs, 0x0001); /* L */
+			byte_stream_putle8(&bs, 0x00); /* String of length L */
 		} /* End TLV t(2711) */
 	} /* End TLV t(0005) */
 
 	/* TLV t(0003) */
-	byte_stream_put16(&frame->data, 0x0003);
-	byte_stream_put16(&frame->data, 0x0000);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put16(&bs, 0x0003);
+	byte_stream_put16(&bs, 0x0000);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -1174,7 +1184,7 @@
 int aim_im_sendch4(OscarData *od, const char *sn, guint16 type, const char *message)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	guchar cookie[8];
 
@@ -1184,44 +1194,45 @@
 	if (!sn || !type || !message)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+8+3+strlen(sn)+12+strlen(message)+1+4);
+	byte_stream_new(&bs, 8+3+strlen(sn)+12+strlen(message)+1+4);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	aim_icbm_makecookie(cookie);
 
 	/* ICBM header */
-	aim_im_puticbm(&frame->data, cookie, 0x0004, sn);
+	aim_im_puticbm(&bs, cookie, 0x0004, sn);
 
 	/*
 	 * TLV t(0005)
 	 *
 	 * ICQ data (the UIN and the message).
 	 */
-	byte_stream_put16(&frame->data, 0x0005);
-	byte_stream_put16(&frame->data, 4 + 2+2+strlen(message)+1);
+	byte_stream_put16(&bs, 0x0005);
+	byte_stream_put16(&bs, 4 + 2+2+strlen(message)+1);
 
 	/*
 	 * Your UIN
 	 */
-	byte_stream_putle32(&frame->data, atoi(od->sn));
+	byte_stream_putle32(&bs, atoi(od->sn));
 
 	/*
 	 * TLV t(type) l(strlen(message)+1) v(message+NULL)
 	 */
-	byte_stream_putle16(&frame->data, type);
-	byte_stream_putle16(&frame->data, strlen(message)+1);
-	byte_stream_putraw(&frame->data, (const guint8 *)message, strlen(message)+1);
+	byte_stream_putle16(&bs, type);
+	byte_stream_putle16(&bs, strlen(message)+1);
+	byte_stream_putraw(&bs, (const guint8 *)message, strlen(message)+1);
 
 	/*
 	 * TLV t(0006) l(0000) v()
 	 */
-	byte_stream_put16(&frame->data, 0x0006);
-	byte_stream_put16(&frame->data, 0x0000);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put16(&bs, 0x0006);
+	byte_stream_put16(&bs, 0x0000);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -2249,22 +2260,23 @@
  */
 int aim_im_warn(OscarData *od, FlapConnection *conn, const char *sn, guint32 flags)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !conn || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, strlen(sn)+13);
+	byte_stream_new(&bs, strlen(sn)+3);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0008, 0x0000, sn, strlen(sn)+1);
-	aim_putsnac(&frame->data, 0x0004, 0x0008, 0x0000, snacid);
-
-	byte_stream_put16(&frame->data, (flags & AIM_WARN_ANON) ? 0x0001 : 0x0000);
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
-
-	flap_connection_send(conn, frame);
+
+	byte_stream_put16(&bs, (flags & AIM_WARN_ANON) ? 0x0001 : 0x0000);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0008, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -2305,29 +2317,30 @@
 int aim_im_denytransfer(OscarData *od, const char *sn, const guchar *cookie, guint16 code)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+8+2+1+strlen(sn)+6);
+	byte_stream_new(&bs, 8+2+1+strlen(sn)+6);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x000b, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x000b, 0x0000, snacid);
-
-	byte_stream_putraw(&frame->data, cookie, 8);
-
-	byte_stream_put16(&frame->data, 0x0002); /* channel */
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+
+	byte_stream_putraw(&bs, cookie, 8);
+
+	byte_stream_put16(&bs, 0x0002); /* channel */
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	aim_tlvlist_add_16(&tlvlist, 0x0003, code);
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0004, 0x000b, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -2662,7 +2675,7 @@
 int aim_im_sendmtn(OscarData *od, guint16 type1, const char *sn, guint16 type2)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0002)))
@@ -2671,38 +2684,39 @@
 	if (!sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+11+strlen(sn)+2);
+	byte_stream_new(&bs, 11+strlen(sn)+2);
 
 	snacid = aim_cachesnac(od, 0x0004, 0x0014, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0004, 0x0014, 0x0000, snacid);
 
 	/*
 	 * 8 days of light
 	 * Er, that is to say, 8 bytes of 0's
 	 */
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_put16(&frame->data, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_put16(&bs, 0x0000);
 
 	/*
 	 * Type 1 (should be 0x0001 for mtn)
 	 */
-	byte_stream_put16(&frame->data, type1);
+	byte_stream_put16(&bs, type1);
 
 	/*
 	 * Dest sn
 	 */
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	/*
 	 * Type 2 (should be 0x0000, 0x0001, or 0x0002 for mtn)
 	 */
-	byte_stream_put16(&frame->data, type2);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_put16(&bs, type2);
+
+	flap_connection_send_snac(od, conn, 0x0004, 0x0014, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/family_icq.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_icq.c	Mon Apr 28 00:01:07 2008 +0000
@@ -29,7 +29,7 @@
 int aim_icq_reqofflinemsgs(OscarData *od)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 
@@ -38,28 +38,29 @@
 
 	bslen = 2 + 4 + 2 + 2;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x003c); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x003c); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
 
 int aim_icq_ackofflinemsgs(OscarData *od)
 {
-	FlapConnection *conn;
+	ByteStream bs;
 	FlapFrame *frame;
 	aim_snacid_t snacid;
 	int bslen;
@@ -69,21 +70,22 @@
 
 	bslen = 2 + 4 + 2 + 2;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x003e); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x003e); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -93,7 +95,7 @@
 aim_icq_setsecurity(OscarData *od, gboolean auth_required, gboolean webaware)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 
@@ -102,30 +104,31 @@
 
 	bslen = 2+4+2+2+2+2+2+1+1+1+1+1+1;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x0c3a); /* shrug. */
-	byte_stream_putle16(&frame->data, 0x030c);
-	byte_stream_putle16(&frame->data, 0x0001);
-	byte_stream_putle8(&frame->data, webaware);
-	byte_stream_putle8(&frame->data, 0xf8);
-	byte_stream_putle8(&frame->data, 0x02);
-	byte_stream_putle8(&frame->data, 0x01);
-	byte_stream_putle8(&frame->data, 0x00);
-	byte_stream_putle8(&frame->data, !auth_required);
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x0c3a); /* shrug. */
+	byte_stream_putle16(&bs, 0x030c);
+	byte_stream_putle16(&bs, 0x0001);
+	byte_stream_putle8(&bs, webaware);
+	byte_stream_putle8(&bs, 0xf8);
+	byte_stream_putle8(&bs, 0x02);
+	byte_stream_putle8(&bs, 0x01);
+	byte_stream_putle8(&bs, 0x00);
+	byte_stream_putle8(&bs, !auth_required);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -141,7 +144,7 @@
 int aim_icq_changepasswd(OscarData *od, const char *passwd)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen, passwdlen;
 
@@ -156,25 +159,26 @@
 		passwdlen = MAXICQPASSLEN;
 	bslen = 2+4+2+2+2+2+passwdlen+1;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x042e); /* shrug. */
-	byte_stream_putle16(&frame->data, passwdlen+1);
-	byte_stream_putstr(&frame->data, passwd);
-	byte_stream_putle8(&frame->data, '\0');
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x042e); /* shrug. */
+	byte_stream_putle16(&bs, passwdlen+1);
+	byte_stream_putstr(&bs, passwd);
+	byte_stream_putle8(&bs, '\0');
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -182,7 +186,7 @@
 int aim_icq_getallinfo(OscarData *od, const char *uin)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 	struct aim_icq_info *info;
@@ -195,23 +199,24 @@
 
 	bslen = 2 + 4 + 2 + 2 + 2 + 4;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x04b2); /* shrug. */
-	byte_stream_putle32(&frame->data, atoi(uin));
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x04b2); /* shrug. */
+	byte_stream_putle32(&bs, atoi(uin));
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	/* Keep track of this request and the ICQ number and request ID */
 	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
@@ -226,7 +231,7 @@
 int aim_icq_getalias(OscarData *od, const char *uin)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 	struct aim_icq_info *info;
@@ -239,24 +244,25 @@
 
 	bslen = 2 + 4 + 2 + 2 + 2 + 4;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x04ba); /* shrug. */
-	byte_stream_putle32(&frame->data, atoi(uin));
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x04ba); /* shrug. */
+	byte_stream_putle32(&bs, atoi(uin));
 
-	flap_connection_send(conn, frame);
-
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
+	
 	/* Keep track of this request and the ICQ number and request ID */
 	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
@@ -270,7 +276,7 @@
 int aim_icq_getsimpleinfo(OscarData *od, const char *uin)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 
@@ -282,23 +288,24 @@
 
 	bslen = 2 + 4 + 2 + 2 + 2 + 4;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x051f); /* shrug. */
-	byte_stream_putle32(&frame->data, atoi(uin));
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x051f); /* shrug. */
+	byte_stream_putle32(&bs, atoi(uin));
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -307,7 +314,7 @@
 int aim_icq_sendxmlreq(OscarData *od, const char *xml)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 
@@ -319,25 +326,26 @@
 
 	bslen = 2 + 10 + 2 + strlen(xml) + 1;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x0998); /* shrug. */
-	byte_stream_putle16(&frame->data, strlen(xml) + 1);
-	byte_stream_putraw(&frame->data, (guint8 *)xml, strlen(xml) + 1);
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x0998); /* shrug. */
+	byte_stream_putle16(&bs, strlen(xml) + 1);
+	byte_stream_putraw(&bs, (guint8 *)xml, strlen(xml) + 1);
 
-	flap_connection_send(conn, frame);
-
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 #endif
@@ -363,7 +371,7 @@
 int aim_icq_sendsms(OscarData *od, const char *name, const char *msg, const char *alias)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen, xmllen;
 	char *xml;
@@ -401,35 +409,36 @@
 
 	bslen = 36 + xmllen;
 
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
 	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
 
 	/* From libicq200-0.3.2/src/SNAC-SRV.cpp */
-	byte_stream_putle16(&frame->data, 0x1482);
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, 0x0016);
-	byte_stream_put32(&frame->data, 0x00000000);
-	byte_stream_put32(&frame->data, 0x00000000);
-	byte_stream_put32(&frame->data, 0x00000000);
-	byte_stream_put32(&frame->data, 0x00000000);
+	byte_stream_putle16(&bs, 0x1482);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, 0x0016);
+	byte_stream_put32(&bs, 0x00000000);
+	byte_stream_put32(&bs, 0x00000000);
+	byte_stream_put32(&bs, 0x00000000);
+	byte_stream_put32(&bs, 0x00000000);
 
-	byte_stream_put16(&frame->data, 0x0000);
-	byte_stream_put16(&frame->data, xmllen);
-	byte_stream_putstr(&frame->data, xml);
-	byte_stream_put8(&frame->data, 0x00);
+	byte_stream_put16(&bs, 0x0000);
+	byte_stream_put16(&bs, xmllen);
+	byte_stream_putstr(&bs, xml);
+	byte_stream_put8(&bs, 0x00);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	g_free(xml);
 	g_free(stripped);
@@ -445,7 +454,7 @@
 int aim_icq_getstatusnote(OscarData *od, const char *uin, guint8 *note_hash, guint16 note_hash_len)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	int bslen;
 
@@ -458,40 +467,39 @@
 	}
 
 	bslen = 2 + 4 + 2 + 2 + 2 + 2 + 58 + strlen(uin);
-
-	frame = flap_frame_new(od, 0x02, 10 + 4 + bslen);
+	byte_stream_new(&bs, 4 + bslen);
 
 	snacid = aim_cachesnac(od, 0x0015, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0015, 0x0002, 0x0000, snacid);
 
-	/* For simplicity, don't bother using a tlvlist */
-	byte_stream_put16(&frame->data, 0x0001);
-	byte_stream_put16(&frame->data, bslen);
+	byte_stream_put16(&bs, 0x0001);
+	byte_stream_put16(&bs, bslen);
 
-	byte_stream_putle16(&frame->data, bslen - 2);
-	byte_stream_putle32(&frame->data, atoi(od->sn));
-	byte_stream_putle16(&frame->data, 0x07d0); /* I command thee. */
-	byte_stream_putle16(&frame->data, snacid); /* eh. */
-	byte_stream_putle16(&frame->data, 0x0fa0); /* shrug. */
-	byte_stream_putle16(&frame->data, 58 + strlen(uin));
+	byte_stream_putle16(&bs, bslen - 2);
+	byte_stream_putle32(&bs, atoi(od->sn));
+	byte_stream_putle16(&bs, 0x07d0); /* I command thee. */
+	byte_stream_putle16(&bs, snacid); /* eh. */
+	byte_stream_putle16(&bs, 0x0fa0); /* shrug. */
+	byte_stream_putle16(&bs, 58 + strlen(uin));
 
-	byte_stream_put32(&frame->data, 0x05b90002);    /* don't ask */
-	byte_stream_put32(&frame->data, 0x80000000);
-	byte_stream_put32(&frame->data, 0x00000006);
-	byte_stream_put32(&frame->data, 0x00010002);
-	byte_stream_put32(&frame->data, 0x00020000);
-	byte_stream_put32(&frame->data, 0x04e30000);
-	byte_stream_put32(&frame->data, 0x00020002);
-	byte_stream_put32(&frame->data, 0x00000001);
+	byte_stream_put32(&bs, 0x05b90002);    /* don't ask */
+	byte_stream_put32(&bs, 0x80000000);
+	byte_stream_put32(&bs, 0x00000006);
+	byte_stream_put32(&bs, 0x00010002);
+	byte_stream_put32(&bs, 0x00020000);
+	byte_stream_put32(&bs, 0x04e30000);
+	byte_stream_put32(&bs, 0x00020002);
+	byte_stream_put32(&bs, 0x00000001);
 
-	byte_stream_put16(&frame->data, 24 + strlen(uin));
-	byte_stream_put32(&frame->data, 0x003c0010);
-	byte_stream_putraw(&frame->data, note_hash, 16); /* status note hash */
-	byte_stream_put16(&frame->data, 0x0032);        /* buddy uin */
-	byte_stream_put16(&frame->data, strlen(uin));
-	byte_stream_putstr(&frame->data, uin);
+	byte_stream_put16(&bs, 24 + strlen(uin));
+	byte_stream_put32(&bs, 0x003c0010);
+	byte_stream_putraw(&bs, note_hash, 16); /* status note hash */
+	byte_stream_put16(&bs, 0x0032);        /* buddy uin */
+	byte_stream_put16(&bs, strlen(uin));
+	byte_stream_putstr(&bs, uin);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0015, 0x0002, 0x000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -768,8 +776,8 @@
 			else
 			{
 				struct aim_icq_info *info;
-				guint32 data_len;
-				FlapFrame *frame;
+				ByteStream bs;
+				guint32 bslen;
 				aim_snacid_t snacid;
 				guchar cookie[8];
 
@@ -783,84 +791,83 @@
 					break;
 				}
 
-				data_len = 13 + strlen(uin) + 30 + 6 + 4 + 55 + 85 + 4;
-				frame = flap_frame_new(od, 0x0002, 10 + 4 + data_len);
+				bslen = 13 + strlen(uin) + 30 + 6 + 4 + 55 + 85 + 4;
+				byte_stream_new(&bs, 4 + bslen);
+
 				snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
 
-				aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
-
 				aim_icbm_makecookie(cookie);
 
-				byte_stream_putraw(&frame->data, cookie, 8); /* ICBM cookie */
-				byte_stream_put16(&frame->data, 0x0002); /* message channel */
-				byte_stream_put8(&frame->data, strlen(uin)); /* uin */
-				byte_stream_putstr(&frame->data, uin);
+				byte_stream_putraw(&bs, cookie, 8); /* ICBM cookie */
+				byte_stream_put16(&bs, 0x0002); /* message channel */
+				byte_stream_put8(&bs, strlen(uin)); /* uin */
+				byte_stream_putstr(&bs, uin);
 
-				byte_stream_put16(&frame->data, 0x0005); /* rendez vous data */
-				byte_stream_put16(&frame->data, 0x00b2);
-				byte_stream_put16(&frame->data, 0x0000); /* request */
-				byte_stream_putraw(&frame->data, cookie, 8); /* ICBM cookie */
-				byte_stream_put32(&frame->data, 0x09461349); /* ICQ server relaying */
-				byte_stream_put16(&frame->data, 0x4c7f);
-				byte_stream_put16(&frame->data, 0x11d1);
-				byte_stream_put32(&frame->data, 0x82224445);
-				byte_stream_put32(&frame->data, 0x53540000);
+				byte_stream_put16(&bs, 0x0005); /* rendez vous data */
+				byte_stream_put16(&bs, 0x00b2);
+				byte_stream_put16(&bs, 0x0000); /* request */
+				byte_stream_putraw(&bs, cookie, 8); /* ICBM cookie */
+				byte_stream_put32(&bs, 0x09461349); /* ICQ server relaying */
+				byte_stream_put16(&bs, 0x4c7f);
+				byte_stream_put16(&bs, 0x11d1);
+				byte_stream_put32(&bs, 0x82224445);
+				byte_stream_put32(&bs, 0x53540000);
 
-				byte_stream_put16(&frame->data, 0x000a); /* unknown TLV */
-				byte_stream_put16(&frame->data, 0x0002);
-				byte_stream_put16(&frame->data, 0x0001);
+				byte_stream_put16(&bs, 0x000a); /* unknown TLV */
+				byte_stream_put16(&bs, 0x0002);
+				byte_stream_put16(&bs, 0x0001);
 
-				byte_stream_put16(&frame->data, 0x000f); /* unknown TLV */
-				byte_stream_put16(&frame->data, 0x0000);
+				byte_stream_put16(&bs, 0x000f); /* unknown TLV */
+				byte_stream_put16(&bs, 0x0000);
 
-				byte_stream_put16(&frame->data, 0x2711); /* extended data */
-				byte_stream_put16(&frame->data, 0x008a);
-				byte_stream_putle16(&frame->data, 0x001b); /* length */
-				byte_stream_putle16(&frame->data, 0x0009); /* version */
-				byte_stream_putle32(&frame->data, 0x00000000); /* plugin: none */
-				byte_stream_putle32(&frame->data, 0x00000000);
-				byte_stream_putle32(&frame->data, 0x00000000);
-				byte_stream_putle32(&frame->data, 0x00000000);
-				byte_stream_putle16(&frame->data, 0x0000); /* unknown */
-				byte_stream_putle32(&frame->data, 0x00000000); /* client capabilities flags */
-				byte_stream_put8(&frame->data, 0x00); /* unknown */
-				byte_stream_putle16(&frame->data, 0x0064); /* downcounter? */
-				byte_stream_putle16(&frame->data, 0x000e); /* length */
-				byte_stream_putle16(&frame->data, 0x0064); /* downcounter? */
-				byte_stream_putle32(&frame->data, 0x00000000); /* unknown */
-				byte_stream_putle32(&frame->data, 0x00000000);
-				byte_stream_putle32(&frame->data, 0x00000000);
-				byte_stream_put8(&frame->data, 0x1a); /* message type: plugin message descibed by text string */
-				byte_stream_put8(&frame->data, 0x00); /* message flags */
-				byte_stream_putle16(&frame->data, 0x0000); /* status code */
-				byte_stream_putle16(&frame->data, 0x0001); /* priority code */
-				byte_stream_putle16(&frame->data, 0x0000); /* text length */
+				byte_stream_put16(&bs, 0x2711); /* extended data */
+				byte_stream_put16(&bs, 0x008a);
+				byte_stream_putle16(&bs, 0x001b); /* length */
+				byte_stream_putle16(&bs, 0x0009); /* version */
+				byte_stream_putle32(&bs, 0x00000000); /* plugin: none */
+				byte_stream_putle32(&bs, 0x00000000);
+				byte_stream_putle32(&bs, 0x00000000);
+				byte_stream_putle32(&bs, 0x00000000);
+				byte_stream_putle16(&bs, 0x0000); /* unknown */
+				byte_stream_putle32(&bs, 0x00000000); /* client capabilities flags */
+				byte_stream_put8(&bs, 0x00); /* unknown */
+				byte_stream_putle16(&bs, 0x0064); /* downcounter? */
+				byte_stream_putle16(&bs, 0x000e); /* length */
+				byte_stream_putle16(&bs, 0x0064); /* downcounter? */
+				byte_stream_putle32(&bs, 0x00000000); /* unknown */
+				byte_stream_putle32(&bs, 0x00000000);
+				byte_stream_putle32(&bs, 0x00000000);
+				byte_stream_put8(&bs, 0x1a); /* message type: plugin message descibed by text string */
+				byte_stream_put8(&bs, 0x00); /* message flags */
+				byte_stream_putle16(&bs, 0x0000); /* status code */
+				byte_stream_putle16(&bs, 0x0001); /* priority code */
+				byte_stream_putle16(&bs, 0x0000); /* text length */
 
-				byte_stream_put8(&frame->data, 0x3a); /* message dump */
-				byte_stream_put32(&frame->data, 0x00811a18);
-				byte_stream_put32(&frame->data, 0xbc0e6c18);
-				byte_stream_put32(&frame->data, 0x47a5916f);
-				byte_stream_put32(&frame->data, 0x18dcc76f);
-				byte_stream_put32(&frame->data, 0x1a010013);
-				byte_stream_put32(&frame->data, 0x00000041);
-				byte_stream_put32(&frame->data, 0x77617920);
-				byte_stream_put32(&frame->data, 0x53746174);
-				byte_stream_put32(&frame->data, 0x7573204d);
-				byte_stream_put32(&frame->data, 0x65737361);
-				byte_stream_put32(&frame->data, 0x67650100);
-				byte_stream_put32(&frame->data, 0x00000000);
-				byte_stream_put32(&frame->data, 0x00000000);
-				byte_stream_put32(&frame->data, 0x00000000);
-				byte_stream_put32(&frame->data, 0x00000015);
-				byte_stream_put32(&frame->data, 0x00000000);
-				byte_stream_put32(&frame->data, 0x0000000d);
-				byte_stream_put32(&frame->data, 0x00000074);
-				byte_stream_put32(&frame->data, 0x6578742f);
-				byte_stream_put32(&frame->data, 0x782d616f);
-				byte_stream_put32(&frame->data, 0x6c727466);
+				byte_stream_put8(&bs, 0x3a); /* message dump */
+				byte_stream_put32(&bs, 0x00811a18);
+				byte_stream_put32(&bs, 0xbc0e6c18);
+				byte_stream_put32(&bs, 0x47a5916f);
+				byte_stream_put32(&bs, 0x18dcc76f);
+				byte_stream_put32(&bs, 0x1a010013);
+				byte_stream_put32(&bs, 0x00000041);
+				byte_stream_put32(&bs, 0x77617920);
+				byte_stream_put32(&bs, 0x53746174);
+				byte_stream_put32(&bs, 0x7573204d);
+				byte_stream_put32(&bs, 0x65737361);
+				byte_stream_put32(&bs, 0x67650100);
+				byte_stream_put32(&bs, 0x00000000);
+				byte_stream_put32(&bs, 0x00000000);
+				byte_stream_put32(&bs, 0x00000000);
+				byte_stream_put32(&bs, 0x00000015);
+				byte_stream_put32(&bs, 0x00000000);
+				byte_stream_put32(&bs, 0x0000000d);
+				byte_stream_put32(&bs, 0x00000074);
+				byte_stream_put32(&bs, 0x6578742f);
+				byte_stream_put32(&bs, 0x782d616f);
+				byte_stream_put32(&bs, 0x6c727466);
 
-				byte_stream_put16(&frame->data, 0x0003); /* server ACK requested */
-				byte_stream_put16(&frame->data, 0x0000);
+				byte_stream_put16(&bs, 0x0003); /* server ACK requested */
+				byte_stream_put16(&bs, 0x0000);
 
 				info->uin = atoi(uin);
 				info->status_note_title = status_note_title;
@@ -870,7 +877,9 @@
 				info->next = od->icq_info;
 				od->icq_info = info;
 
-				flap_connection_send(conn, frame);
+				flap_connection_send_snac(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs);
+
+				byte_stream_destroy(&bs);
 			}
 
 			g_free(uin);
--- a/libpurple/protocols/oscar/family_locate.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1047,7 +1047,7 @@
 				  const char *awaymsg_encoding, const gchar *awaymsg, const int awaymsg_len)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 	char *encoding;
@@ -1092,15 +1092,16 @@
 			aim_tlvlist_add_noval(&tlvlist, 0x0004);
 	}
 
-	frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(tlvlist));
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0002, 0x004, 0x0000, snacid);
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0002, 0x0004, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1112,7 +1113,7 @@
 aim_locate_setcaps(OscarData *od, guint32 caps)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -1121,15 +1122,16 @@
 
 	aim_tlvlist_add_caps(&tlvlist, 0x0005, caps);
 
-	frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(tlvlist));
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x0004, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0002, 0x004, 0x0000, snacid);
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0002, 0x0004, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1147,22 +1149,23 @@
 aim_locate_getinfo(OscarData *od, const char *sn, guint16 infotype)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)) || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 12+1+strlen(sn));
+	byte_stream_new(&bs, 2+1+strlen(sn));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x0005, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, 0x0002, 0x0005, 0x0000, snacid);
-	byte_stream_put16(&frame->data, infotype);
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put16(&bs, infotype);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0002, 0x0005, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1238,7 +1241,7 @@
 int aim_locate_setdirinfo(OscarData *od, const char *first, const char *middle, const char *last, const char *maiden, const char *nickname, const char *street, const char *city, const char *state, const char *zip, int country, guint16 privacy)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -1269,15 +1272,16 @@
 	if (street)
 		aim_tlvlist_add_str(&tlvlist, 0x0021, street);
 
-	frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist));
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x0009, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, 0x0002, 0x0009, 0x0000, snacid);
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0002, 0x0009, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1288,7 +1292,7 @@
 int aim_locate_000b(OscarData *od, const char *sn)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 		return -EINVAL;
@@ -1296,15 +1300,16 @@
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)) || !sn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+1+strlen(sn));
+	byte_stream_new(&bs, 1+strlen(sn));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x000b, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, 0x0002, 0x000b, 0x0000, snacid);
-	byte_stream_put8(&frame->data, strlen(sn));
-	byte_stream_putstr(&frame->data, sn);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, 0x0002, 0x000b, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -1319,7 +1324,7 @@
 aim_locate_setinterests(OscarData *od, const char *interest1, const char *interest2, const char *interest3, const char *interest4, const char *interest5, guint16 privacy)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -1340,21 +1345,21 @@
 	if (interest5)
 		aim_tlvlist_add_str(&tlvlist, 0x0000b, interest5);
 
-	frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist));
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
 	snacid = aim_cachesnac(od, 0x0002, 0x000f, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, 0x0002, 0x000f, 0x0000, 0);
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
-
+	flap_connection_send_snac(od, conn, 0x0002, 0x000f, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
 	return 0;
 }
 
 /*
- * Subtype 0x0015 - Request the info a user using the short method.  This is
+ * Subtype 0x0015 - Request the info of a user using the short method.  This is
  * what iChat uses.  It normally is VERY leniently rate limited.
  *
  * @param sn The screen name whose info you wish to request.
@@ -1369,21 +1374,21 @@
 aim_locate_getinfoshort(OscarData *od, const char *sn, guint32 flags)
 {
 	FlapConnection *conn;
-	ByteStream data;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !(conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE)) || !sn)
 		return -EINVAL;
 
-	byte_stream_new(&data, 4 + 1 + strlen(sn));
-	byte_stream_put32(&data, flags);
-	byte_stream_put8(&data, strlen(sn));
-	byte_stream_putstr(&data, sn);
+	byte_stream_new(&bs, 4 + 1 + strlen(sn));
+	byte_stream_put32(&bs, flags);
+	byte_stream_put8(&bs, strlen(sn));
+	byte_stream_putstr(&bs, sn);
 
 	snacid = aim_cachesnac(od, 0x0002, 0x0015, 0x0000, sn, strlen(sn)+1);
-	flap_connection_send_snac(od, conn, 0x0002, 0x0015, 0x0000, snacid, &data);
+	flap_connection_send_snac(od, conn, 0x0002, 0x0015, 0x0000, snacid, &bs);
 
-	g_free(data.data);
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
--- a/libpurple/protocols/oscar/family_odir.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_odir.c	Mon Apr 28 00:01:07 2008 +0000
@@ -41,7 +41,7 @@
 int aim_odir_email(OscarData *od, const char *region, const char *email)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -53,14 +53,15 @@
 	aim_tlvlist_add_16(&tlvlist, 0x000a, 0x0001); /* Type of search */
 	aim_tlvlist_add_str(&tlvlist, 0x0005, email);
 
-	frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist));
-	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x000f, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x000f, 0x0002, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 
 	return 0;
 }
@@ -89,7 +90,7 @@
 int aim_odir_name(OscarData *od, const char *region, const char *first, const char *middle, const char *last, const char *maiden, const char *nick, const char *city, const char *state, const char *country, const char *zip, const char *address)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -120,15 +121,16 @@
 	if (address)
 		aim_tlvlist_add_str(&tlvlist, 0x0021, address);
 
-	frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist));
-	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x000f, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x000f, 0x0002, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -143,7 +145,7 @@
 int aim_odir_interest(OscarData *od, const char *region, const char *interest)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -156,15 +158,16 @@
 	if (interest)
 		aim_tlvlist_add_str(&tlvlist, 0x0001, interest);
 
-	frame = flap_frame_new(od, 0x02, 10+aim_tlvlist_size(tlvlist));
-	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x000f, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
-
+	snacid = aim_cachesnac(od, 0x000f, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x000f, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/family_oservice.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_oservice.c	Mon Apr 28 00:01:07 2008 +0000
@@ -31,14 +31,11 @@
 void
 aim_clientready(OscarData *od, FlapConnection *conn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *cur;
 
-	frame = flap_frame_new(od, 0x02, 1152);
-
-	snacid = aim_cachesnac(od, 0x0001, 0x0002, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x0002, 0x0000, snacid);
+	byte_stream_new(&bs, 1142);
 
 	/*
 	 * Send only the tool versions that the server cares about (that it
@@ -50,14 +47,17 @@
 
 		if ((mod = aim__findmodulebygroup(od, GPOINTER_TO_UINT(cur->data))))
 		{
-			byte_stream_put16(&frame->data, mod->family);
-			byte_stream_put16(&frame->data, mod->version);
-			byte_stream_put16(&frame->data, mod->toolid);
-			byte_stream_put16(&frame->data, mod->toolversion);
+			byte_stream_put16(&bs, mod->family);
+			byte_stream_put16(&bs, mod->version);
+			byte_stream_put16(&bs, mod->toolid);
+			byte_stream_put16(&bs, mod->toolversion);
 		}
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0002, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x0002, 0x0000, snacid, &bs);
+	
+	byte_stream_destroy(&bs);
 }
 
 /*
@@ -121,7 +121,7 @@
 aim_chat_join(OscarData *od, guint16 exchange, const char *roomname, guint16 instance)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 	struct chatsnacinfo csi;
@@ -130,27 +130,27 @@
 	if (!conn || !roomname || !strlen(roomname))
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 512);
+	byte_stream_new(&bs, 502);
 
 	memset(&csi, 0, sizeof(csi));
 	csi.exchange = exchange;
 	strncpy(csi.name, roomname, sizeof(csi.name));
 	csi.instance = instance;
 
-	snacid = aim_cachesnac(od, 0x0001, 0x0004, 0x0000, &csi, sizeof(csi));
-	aim_putsnac(&frame->data, 0x0001, 0x0004, 0x0000, snacid);
-
 	/*
 	 * Requesting service chat (0x000e)
 	 */
-	byte_stream_put16(&frame->data, 0x000e);
+	byte_stream_put16(&bs, 0x000e);
 
 	aim_tlvlist_add_chatroom(&tlvlist, 0x0001, exchange, roomname, instance);
-	aim_tlvlist_write(&frame->data, &tlvlist);
+	aim_tlvlist_write(&bs, &tlvlist);
 	aim_tlvlist_free(tlvlist);
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0004, 0x0000, &csi, sizeof(csi));
+	flap_connection_send_snac(od, conn, 0x0001, 0x0004, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -376,46 +376,46 @@
 void
 aim_srv_rates_addparam(OscarData *od, FlapConnection *conn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tmp;
 
-	frame = flap_frame_new(od, 0x02, 512);
-
-	snacid = aim_cachesnac(od, 0x0001, 0x0008, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x0008, 0x0000, snacid);
+	byte_stream_new(&bs, 502);
 
 	for (tmp = conn->rateclasses; tmp != NULL; tmp = tmp->next)
 	{
 		struct rateclass *rateclass;
 		rateclass = tmp->data;
-		byte_stream_put16(&frame->data, rateclass->classid);
+		byte_stream_put16(&bs, rateclass->classid);
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0008, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x0008, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);	
 }
 
 /* Subtype 0x0009 - Delete Rate Parameter */
 void
 aim_srv_rates_delparam(OscarData *od, FlapConnection *conn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tmp;
 
-	frame = flap_frame_new(od, 0x02, 512);
-
-	snacid = aim_cachesnac(od, 0x0001, 0x0009, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x0009, 0x0000, snacid);
+	byte_stream_new(&bs, 502);
 
 	for (tmp = conn->rateclasses; tmp != NULL; tmp = tmp->next)
 	{
 		struct rateclass *rateclass;
 		rateclass = tmp->data;
-		byte_stream_put16(&frame->data, rateclass->classid);
+		byte_stream_put16(&bs, rateclass->classid);
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0009, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x0009, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);	
 }
 
 /* Subtype 0x000a - Rate Change */
@@ -489,14 +489,11 @@
 void
 aim_srv_sendpauseack(OscarData *od, FlapConnection *conn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *cur;
 
-	frame = flap_frame_new(od, 0x02, 1024);
-
-	snacid = aim_cachesnac(od, 0x0001, 0x000c, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x000c, 0x0000, snacid);
+	byte_stream_new(&bs, 1014);
 
 	/*
 	 * This list should have all the groups that the original
@@ -504,9 +501,12 @@
 	 * we want them all back after the migration.
 	 */
 	for (cur = conn->groups; cur != NULL; cur = cur->next)
-		byte_stream_put16(&frame->data, GPOINTER_TO_UINT(cur->data));
+		byte_stream_put16(&bs, GPOINTER_TO_UINT(cur->data));
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x000c, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x000c, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /* Subtype 0x000d - Service Resume */
@@ -732,14 +732,11 @@
 void
 aim_srv_setversions(OscarData *od, FlapConnection *conn)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *cur;
 
-	frame = flap_frame_new(od, 0x02, 1152);
-
-	snacid = aim_cachesnac(od, 0x0001, 0x0017, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x0017, 0x0000, snacid);
+	byte_stream_new(&bs, 1142);
 
 	/*
 	 * Send only the versions that the server cares about (that it
@@ -751,12 +748,15 @@
 
 		if ((mod = aim__findmodulebygroup(od, GPOINTER_TO_UINT(cur->data))))
 		{
-			byte_stream_put16(&frame->data, mod->family);
-			byte_stream_put16(&frame->data, mod->version);
+			byte_stream_put16(&bs, mod->family);
+			byte_stream_put16(&bs, mod->version);
 		}
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0017, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x0017, 0x0000, snacid, &bs);
+
+	byte_stream_destroy(&bs);
 }
 
 /* Subtype 0x0018 - Host versions */
@@ -803,7 +803,7 @@
 		gboolean setavailmsg, const char *availmsg, const char *itmsurl)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 	GSList *tlvlist = NULL;
 
@@ -853,19 +853,19 @@
 
 		aim_tlvlist_add_raw(&tlvlist, 0x001d,
 				byte_stream_curpos(&tmpbs), tmpbs.data);
-		g_free(tmpbs.data);
+		byte_stream_destroy(&tmpbs);
 	}
 
-	frame = flap_frame_new(od, 0x02, 10 + aim_tlvlist_size(tlvlist));
+	byte_stream_new(&bs, aim_tlvlist_size(tlvlist));
+
+	aim_tlvlist_write(&bs, &tlvlist);
+	aim_tlvlist_free(tlvlist);
 
 	snacid = aim_cachesnac(od, 0x0001, 0x001e, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, 0x0001, 0x001e, 0x0000, snacid);
+	flap_connection_send_snac(od, conn, 0x0001, 0x001e, 0x0000, snacid, &bs);
 
-	aim_tlvlist_write(&frame->data, &tlvlist);
-	aim_tlvlist_free(tlvlist);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
@@ -937,22 +937,19 @@
 int
 aim_sendmemblock(OscarData *od, FlapConnection *conn, guint32 offset, guint32 len, const guint8 *buf, guint8 flag)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!od || !conn)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+2+16);
+	byte_stream_new(&bs, 2+16);
 
-	snacid = aim_cachesnac(od, 0x0001, 0x0020, 0x0000, NULL, 0);
-
-	aim_putsnac(&frame->data, 0x0001, 0x0020, 0x0000, snacid);
-	byte_stream_put16(&frame->data, 0x0010); /* md5 is always 16 bytes */
+	byte_stream_put16(&bs, 0x0010); /* md5 is always 16 bytes */
 
 	if ((flag == AIM_SENDMEMBLOCK_FLAG_ISHASH) && buf && (len == 0x10)) { /* we're getting a hash */
 
-		byte_stream_putraw(&frame->data, buf, 0x10);
+		byte_stream_putraw(&bs, buf, 0x10);
 
 	} else if (buf && (len > 0)) { /* use input buffer */
 		PurpleCipher *cipher;
@@ -966,7 +963,7 @@
 		purple_cipher_context_digest(context, 16, digest, NULL);
 		purple_cipher_context_destroy(context);
 
-		byte_stream_putraw(&frame->data, digest, 0x10);
+		byte_stream_putraw(&bs, digest, 0x10);
 
 	} else if (len == 0) { /* no length, just hash NULL (buf is optional) */
 		PurpleCipher *cipher;
@@ -985,7 +982,7 @@
 		purple_cipher_context_digest(context, 16, digest, NULL);
 		purple_cipher_context_destroy(context);
 
-		byte_stream_putraw(&frame->data, digest, 0x10);
+		byte_stream_putraw(&bs, digest, 0x10);
 
 	} else {
 
@@ -999,15 +996,15 @@
 		if ((offset == 0x03ffffff) && (len == 0x03ffffff)) {
 
 #if 1 /* with "AnrbnrAqhfzcd" */
-			byte_stream_put32(&frame->data, 0x44a95d26);
-			byte_stream_put32(&frame->data, 0xd2490423);
-			byte_stream_put32(&frame->data, 0x93b8821f);
-			byte_stream_put32(&frame->data, 0x51c54b01);
+			byte_stream_put32(&bs, 0x44a95d26);
+			byte_stream_put32(&bs, 0xd2490423);
+			byte_stream_put32(&bs, 0x93b8821f);
+			byte_stream_put32(&bs, 0x51c54b01);
 #else /* no filename */
-			byte_stream_put32(&frame->data, 0x1df8cbae);
-			byte_stream_put32(&frame->data, 0x5523b839);
-			byte_stream_put32(&frame->data, 0xa0e10db3);
-			byte_stream_put32(&frame->data, 0xa46d3b39);
+			byte_stream_put32(&bs, 0x1df8cbae);
+			byte_stream_put32(&bs, 0x5523b839);
+			byte_stream_put32(&bs, 0xa0e10db3);
+			byte_stream_put32(&bs, 0xa46d3b39);
 #endif
 
 		} else
@@ -1015,8 +1012,11 @@
 
 	}
 
-	flap_connection_send(conn, frame);
+	snacid = aim_cachesnac(od, 0x0001, 0x0020, 0x0000, NULL, 0);
+	flap_connection_send_snac(od, conn, 0x0001, 0x0020, 0x0000, snacid, &bs);
 
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/family_userlookup.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/family_userlookup.c	Mon Apr 28 00:01:07 2008 +0000
@@ -62,7 +62,7 @@
 int aim_search_address(OscarData *od, const char *address)
 {
 	FlapConnection *conn;
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_USERLOOKUP);
@@ -70,15 +70,15 @@
 	if (!conn || !address)
 		return -EINVAL;
 
-	frame = flap_frame_new(od, 0x02, 10+strlen(address));
+	byte_stream_new(&bs, strlen(address));
+
+	byte_stream_putstr(&bs, address);
 
 	snacid = aim_cachesnac(od, 0x000a, 0x0002, 0x0000, address, strlen(address)+1);
-	aim_putsnac(&frame->data, 0x000a, 0x0002, 0x0000, snacid);
+	flap_connection_send_snac(od, conn, 0x000a, 0x0002, 0x0000, snacid, &bs);
 
-	byte_stream_putstr(&frame->data, address);
-
-	flap_connection_send(conn, frame);
-
+	byte_stream_destroy(&bs);
+	
 	return 0;
 }
 
--- a/libpurple/protocols/oscar/flap_connection.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Mon Apr 28 00:01:07 2008 +0000
@@ -115,6 +115,7 @@
 	conn = data;
 	gettimeofday(&now, NULL);
 
+	purple_debug_info("oscar", "Attempting to send %i queued SNACs for %p\n", g_queue_get_length(conn->queued_snacs), conn);
 	while (!g_queue_is_empty(conn->queued_snacs))
 	{
 		QueuedSnac *queued_snac;
@@ -189,6 +190,8 @@
 		/* (Add 100ms padding to account for inaccuracies in the calculation) */
 		if (new_current < rateclass->alert + 100)
 		{
+			purple_debug_info("oscar", "Current rate for conn %p would be %u, but we alert at %u; enqueueing\n", conn, new_current, (rateclass->alert + 100));
+
 			enqueue = TRUE;
 		}
 		else
@@ -197,6 +200,8 @@
 			rateclass->last.tv_sec = now.tv_sec;
 			rateclass->last.tv_usec = now.tv_usec;
 		}
+	} else {
+		purple_debug_warning("oscar", "No rate class found for family %u subtype %u\n", family, subtype);
 	}
 
 	if (enqueue)
@@ -983,7 +988,7 @@
 	byte_stream_rewind(&bs);
 	flap_connection_send_byte_stream(&bs, conn, bslen);
 
-	g_free(bs.data); /* XXX byte_stream_free */
+	byte_stream_destroy(&bs);
 }
 
 void
--- a/libpurple/protocols/oscar/misc.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/misc.c	Mon Apr 28 00:01:07 2008 +0000
@@ -42,11 +42,7 @@
 	FlapFrame *frame;
 	aim_snacid_t snacid = 0x00000000;
 
-	frame = flap_frame_new(od, 0x02, 10);
-
-	aim_putsnac(&frame->data, family, subtype, 0x0000, snacid);
-
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
 }
 
 void
@@ -55,18 +51,15 @@
 	FlapFrame *frame;
 	aim_snacid_t snacid;
 
-	frame = flap_frame_new(od, 0x02, 10);
+	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
 
-	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
-	aim_putsnac(&frame->data, family, subtype, 0x0000, snacid);
-
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
 }
 
 void
 aim_genericreq_l(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint32 *longdata)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!longdata)
@@ -75,20 +68,21 @@
 		return;
 	}
 
-	frame = flap_frame_new(od, 0x02, 10+4);
+	byte_stream_new(&bs, 4);
 
 	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, family, subtype, 0x0000, snacid);
-	byte_stream_put32(&frame->data, *longdata);
+	byte_stream_put32(&bs, *longdata);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+
+	byte_stream_destroy(&bs);
 }
 
 void
 aim_genericreq_s(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *shortdata)
 {
-	FlapFrame *frame;
+	ByteStream bs;
 	aim_snacid_t snacid;
 
 	if (!shortdata)
@@ -97,14 +91,15 @@
 		return;
 	}
 
-	frame = flap_frame_new(od, 0x02, 10+2);
+	byte_stream_new(&bs, 2);
 
 	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
 
-	aim_putsnac(&frame->data, family, subtype, 0x0000, snacid);
-	byte_stream_put16(&frame->data, *shortdata);
+	byte_stream_put16(&bs, *shortdata);
 
-	flap_connection_send(conn, frame);
+	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+
+	byte_stream_destroy(&bs);
 }
 
 /*
--- a/libpurple/protocols/oscar/odc.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/odc.c	Mon Apr 28 00:01:07 2008 +0000
@@ -121,7 +121,7 @@
 
 	peer_connection_send(conn, &bs);
 
-	g_free(bs.data);
+	byte_stream_destroy(&bs);
 }
 
 /**
--- a/libpurple/protocols/oscar/oft.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/oft.c	Mon Apr 28 00:01:07 2008 +0000
@@ -304,7 +304,7 @@
 
 	peer_connection_send(conn, &bs);
 
-	g_free(bs.data);
+	byte_stream_destroy(&bs);
 }
 
 void
--- a/libpurple/protocols/oscar/oscar.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Apr 28 00:01:07 2008 +0000
@@ -2274,19 +2274,6 @@
 }
 
 static void
-purple_auth_dontrequest(struct name_data *data)
-{
-	PurpleConnection *gc = data->gc;
-	PurpleBuddy *b = purple_find_buddy(purple_connection_get_account(gc), data->name);
-
-	/* Remove from local list */
-	purple_blist_remove_buddy(b);
-
-	oscar_free_name_data(data);
-}
-
-
-static void
 purple_auth_sendrequest(PurpleConnection *gc, const char *name)
 {
 	struct name_data *data;
@@ -2298,12 +2285,11 @@
 	purple_request_input(data->gc, NULL, _("Authorization Request Message:"),
 					   NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(purple_auth_request),
-					   _("_Cancel"), G_CALLBACK(purple_auth_dontrequest),
+					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
 					   purple_connection_get_account(gc), name, NULL,
 					   data);
 }
 
-
 static void
 purple_auth_sendrequest_menu(PurpleBlistNode *node, gpointer ignored)
 {
@@ -3629,7 +3615,11 @@
 	if (purple_account_get_user_info(account) != NULL)
 		serv_set_info(gc, purple_account_get_user_info(account));
 
-	if (!od->icq)
+	if (!od->icq && strcmp(purple_account_get_username(account), purple_connection_get_display_name(gc)) != 0)
+		/*
+		 * Format the screen name for AIM accounts if it's different
+		 * than what's currently set.
+		 */
 		oscar_format_screenname(gc, account->username);
 
 	/* Set our available message based on the current status */
@@ -4800,12 +4790,6 @@
 
 	oscar_set_extendedstatus(gc);
 
-	/* Activate SSI */
-	/* Sending the enable causes other people to be able to see you, and you to see them */
-	/* Make sure your privacy setting/invisibility is set how you want it before this! */
-	purple_debug_info("oscar", "ssi: activating server-stored buddy list\n");
-	aim_ssi_enable(od);
-
 	return 1;
 }
 
@@ -5298,7 +5282,7 @@
 	else
 		nombre = g_strdup(sn);
 
-	dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list.  Do you want to add them?"), nombre);
+	dialog_msg = g_strdup_printf(_("The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"), nombre);
 	g_free(nombre);
 
 	data = g_new(struct name_data, 1);
--- a/libpurple/protocols/oscar/oscar.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Mon Apr 28 00:01:07 2008 +0000
@@ -1549,6 +1549,7 @@
 /* bstream.c */
 int byte_stream_new(ByteStream *bs, guint32 len);
 int byte_stream_init(ByteStream *bs, guint8 *data, int len);
+void byte_stream_destroy(ByteStream *bs);
 int byte_stream_empty(ByteStream *bs);
 int byte_stream_curpos(ByteStream *bs);
 int byte_stream_setpos(ByteStream *bs, unsigned int off);
--- a/libpurple/protocols/oscar/peer_proxy.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/peer_proxy.c	Mon Apr 28 00:01:07 2008 +0000
@@ -48,7 +48,7 @@
 
 	peer_connection_send(conn, &bs);
 
-	g_free(bs.data);
+	byte_stream_destroy(&bs);
 }
 
 /**
--- a/libpurple/protocols/oscar/tlv.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/oscar/tlv.c	Mon Apr 28 00:01:07 2008 +0000
@@ -231,13 +231,13 @@
 	aim_tlvlist_write(&bs2, &two);
 
 	if (memcmp(bs1.data, bs2.data, bs1.len)) {
-		g_free(bs1.data);
-		g_free(bs2.data);
+		byte_stream_destroy(&bs1);
+		byte_stream_destroy(&bs2);
 		return 1;
 	}
 
-	g_free(bs1.data);
-	g_free(bs2.data);
+	byte_stream_destroy(&bs1);
+	byte_stream_destroy(&bs2);
 
 	return 0;
 }
@@ -445,7 +445,7 @@
 
 	len = aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
 
-	g_free(bs.data);
+	byte_stream_destroy(&bs);
 
 	return len;
 }
@@ -494,7 +494,7 @@
 
 	aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
 
-	g_free(bs.data);
+	byte_stream_destroy(&bs);
 
 	return buflen;
 }
--- a/libpurple/protocols/silc/silc.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/silc/silc.c	Mon Apr 28 00:01:07 2008 +0000
@@ -380,14 +380,6 @@
 
 	client = sg->client;
 
-	/* Progress */
-	if (params.detach_data) {
-		purple_connection_update_progress(gc, _("Resuming session"), 2, 5);
-		sg->resuming = TRUE;
-	} else {
-		purple_connection_update_progress(gc, _("Performing key exchange"), 2, 5);
-	}
-
 	/* Get session detachment data, if available */
 	memset(&params, 0, sizeof(params));
 	dfile = silcpurple_session_file(purple_account_get_username(sg->account));
@@ -397,6 +389,14 @@
 	params.ignore_requested_attributes = FALSE;
 	params.pfs = purple_account_get_bool(sg->account, "pfs", FALSE);
 
+	/* Progress */
+	if (params.detach_data) {
+		purple_connection_update_progress(gc, _("Resuming session"), 2, 5);
+		sg->resuming = TRUE;
+	} else {
+		purple_connection_update_progress(gc, _("Performing key exchange"), 2, 5);
+	}
+
 	/* Perform SILC Key Exchange. */
 	silc_client_key_exchange(sg->client, &params, sg->public_key,
 				 sg->private_key, stream, SILC_CONN_SERVER,
@@ -433,6 +433,83 @@
 				      silcpurple_stream_created, gc);
 }
 
+static void silcpurple_continue_running(SilcPurple sg)
+{
+	PurpleConnection *gc = sg->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+
+	/* Connect to the SILC server */
+	if (purple_proxy_connect(gc, account,
+				 purple_account_get_string(account, "server",
+							   "silc.silcnet.org"),
+				 purple_account_get_int(account, "port", 706),
+				 silcpurple_login_connected, gc) == NULL)
+	{
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+		                             _("Unable to create connection"));
+		gc->proto_data = NULL;
+		silc_free(sg);
+		return;
+	}
+}
+
+static void silcpurple_got_password_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	SilcPurple sg = (SilcPurple)gc->proto_data;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	char pkd[256], prd[256];
+	const char *password;
+	gboolean remember;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
+		return;
+
+	password = purple_request_fields_get_string(fields, "password");
+	remember = purple_request_fields_get_bool(fields, "remember");
+
+	if (!password || !*password)
+	{
+		purple_notify_error(gc, NULL, _("Password is required to sign on."), NULL);
+		gc->proto_data = NULL;
+		silc_free(sg);
+		return;
+	}
+
+	if (remember)
+		purple_account_set_remember_password(account, TRUE);
+
+	purple_account_set_password(account, password);
+
+	/* Load SILC key pair */
+	g_snprintf(pkd, sizeof(pkd), "%s" G_DIR_SEPARATOR_S "public_key.pub", silcpurple_silcdir());
+	g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.prv", silcpurple_silcdir());
+	if (!silc_load_key_pair((char *)purple_account_get_string(account, "public-key", pkd),
+				(char *)purple_account_get_string(account, "private-key", prd),
+				password,
+				&sg->public_key, &sg->private_key)) {
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+		                             _("Could not load SILC key pair"));
+		gc->proto_data = NULL;
+		silc_free(sg);
+		return;
+	}
+	silcpurple_continue_running(sg);
+}
+
+static void silcpurple_no_password_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	SilcPurple sg;
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
+		return;
+	sg = gc->proto_data;
+	purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
+			_("Could not load SILC key pair"));
+	gc->proto_data = NULL;
+	silc_free(sg);
+}
+
 static void silcpurple_running(SilcClient client, void *context)
 {
 	SilcPurple sg = context;
@@ -451,26 +528,18 @@
 				(char *)purple_account_get_string(account, "private-key", prd),
 				(gc->password == NULL) ? "" : gc->password,
 				&sg->public_key, &sg->private_key)) {
+		if (!purple_account_get_password(account)) {
+			purple_account_request_password(account, G_CALLBACK(silcpurple_got_password_cb),
+											G_CALLBACK(silcpurple_no_password_cb), gc);
+			return;
+		}
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR,
 		                             _("Could not load SILC key pair"));
 		gc->proto_data = NULL;
 		silc_free(sg);
 		return;
 	}
-
-	/* Connect to the SILC server */
-	if (purple_proxy_connect(gc, account,
-				 purple_account_get_string(account, "server",
-							   "silc.silcnet.org"),
-				 purple_account_get_int(account, "port", 706),
-				 silcpurple_login_connected, gc) == NULL)
-	{
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-		                             _("Unable to create connection"));
-		gc->proto_data = NULL;
-		silc_free(sg);
-		return;
-	}
+	silcpurple_continue_running(sg);
 }
 
 static void
@@ -550,8 +619,12 @@
 		                             _("Cannot initialize SILC protocol"));
 		gc->proto_data = NULL;
 		silc_free(sg);
+		free(hostname);
+		free(username);
 		return;
 	}
+	free(hostname);
+	free(username);
 
 	/* Check the ~/.silc dir and create it, and new key pair if necessary. */
 	if (!silcpurple_check_silc_dir(gc)) {
@@ -1188,11 +1261,11 @@
 static void
 silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new)
 {
-        char prd[256];
+	char prd[256];
 	g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir());
 	silc_change_private_key_passphrase(purple_account_get_string(gc->account,
 								     "private-key",
-								     prd), old, new);
+								     prd), old ? old : "", new ? new : "");
 }
 
 static void
--- a/libpurple/protocols/silc10/silc.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/silc10/silc.c	Mon Apr 28 00:01:07 2008 +0000
@@ -962,11 +962,11 @@
 static void
 silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new)
 {
-        char prd[256];
+	char prd[256];
 	g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir());
 	silc_change_private_key_passphrase(purple_account_get_string(gc->account,
 								   "private-key",
-								   prd), old, new);
+								   prd), old ? old : "", new ? new : "");
 }
 
 static void
--- a/libpurple/protocols/yahoo/yahoo.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Apr 28 00:01:07 2008 +0000
@@ -346,7 +346,7 @@
 			break;
 
 		default:
-			purple_debug(PURPLE_DEBUG_ERROR, "yahoo",
+			purple_debug_warning("yahoo",
 					   "Unknown status key %d\n", pair->key);
 			break;
 		}
@@ -518,7 +518,7 @@
 
 			} else {
 				/* This buddy is on the ignore list (and therefore in no group) */
-				purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found",
+				purple_debug_info("yahoo", "%s adding %s to the deny list because of the ignore list / no group was found\n",
 								  account->username, norm_bud);
 				purple_privacy_deny_add(account, norm_bud, 1);
 			}
--- a/libpurple/protocols/yahoo/yahoo.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.h	Mon Apr 28 00:01:07 2008 +0000
@@ -76,14 +76,9 @@
 
 #define YAHOO_CLIENT_VERSION_ID "2097087"
 #define YAHOO_CLIENT_VERSION "8.1.0.421"
-#define YAHOOJP_CLIENT_VERSION "6,0,0,1710"
 
-#if 0
-/* The following were observed with the Yahoo Japan client current as of January
- * 2008, but appear not to work correctly for file transfer.  Here as reference */
-# define YAHOOJP_CLIENT_VERSION_ID "524223"
-# define YAHOOJP_CLIENT_VERSION "7,0,1,1"
-#endif
+#define YAHOOJP_CLIENT_VERSION_ID "524223"
+#define YAHOOJP_CLIENT_VERSION "7,0,1,1"
 
 
 /* Index into attention types list. */
--- a/libpurple/protocols/yahoo/yahoo_packet.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_packet.h	Mon Apr 28 00:01:07 2008 +0000
@@ -123,7 +123,7 @@
 
 #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
 #define YAHOO_PROTO_VER 0x000f
-#define YAHOO_PROTO_VER_JAPAN 0x000c
+#define YAHOO_PROTO_VER_JAPAN 0x000f
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
 
--- a/libpurple/savedstatuses.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/savedstatuses.c	Mon Apr 28 00:01:07 2008 +0000
@@ -1128,10 +1128,12 @@
 
 	g_list_free(accounts);
 
-	purple_savedstatus_set_idleaway(FALSE);
-
-	purple_signal_emit(purple_savedstatuses_get_handle(), "savedstatus-changed",
-					 saved_status, old);
+	if (purple_savedstatus_is_idleaway()) {
+		purple_savedstatus_set_idleaway(FALSE);
+	} else {
+		purple_signal_emit(purple_savedstatuses_get_handle(), "savedstatus-changed",
+					 	   saved_status, old);
+	}
 }
 
 void
@@ -1250,6 +1252,7 @@
 	}
 
 	g_hash_table_destroy(creation_times);
+	creation_times = NULL;
 
 	purple_signals_unregister_by_instance(purple_savedstatuses_get_handle());
 }
--- a/libpurple/server.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/server.c	Mon Apr 28 00:01:07 2008 +0000
@@ -705,7 +705,7 @@
 	if (conv == NULL)
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
 
-	purple_conv_im_write(PURPLE_CONV_IM(conv), NULL, message, flags, mtime);
+	purple_conv_im_write(PURPLE_CONV_IM(conv), name, message, flags, mtime);
 	g_free(message);
 
 	/*
--- a/libpurple/status.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/status.c	Mon Apr 28 00:01:07 2008 +0000
@@ -130,14 +130,15 @@
 	-100,   /* away                     */
 	-200,   /* extended away            */
 	-400,   /* mobile                   */
+	0,      /* tune                     */
 	-10,    /* idle, special case.      */
 	-5,     /* idle time, special case. */
 	10      /* Offline messageable      */
 };
 
-#define SCORE_IDLE      8
-#define SCORE_IDLE_TIME 9
-#define SCORE_OFFLINE_MESSAGE 10
+#define SCORE_IDLE      9
+#define SCORE_IDLE_TIME 10
+#define SCORE_OFFLINE_MESSAGE 11
 
 /**************************************************************************
  * PurpleStatusPrimitive API
@@ -1547,14 +1548,37 @@
 	return purple_presence_is_online(presence) ? presence->login_time : 0;
 }
 
+static int
+purple_presence_compute_score(const PurplePresence *presence)
+{
+	GList *l;
+	int score = 0;
+
+	for (l = purple_presence_get_statuses(presence); l != NULL; l = l->next) {
+		PurpleStatus *status = (PurpleStatus *)l->data;
+		PurpleStatusType *type = purple_status_get_type(status);
+
+		if (purple_status_is_active(status)) {
+			score += primitive_scores[purple_status_type_get_primitive(type)];
+			if (!purple_status_is_online(status)) {
+				PurpleBuddy *b = purple_presence_get_buddy(presence);
+				if (b && purple_account_supports_offline_message(purple_buddy_get_account(b), b))
+					score += primitive_scores[SCORE_OFFLINE_MESSAGE];
+			}
+		}
+	}
+	score += purple_account_get_int(purple_presence_get_account(presence), "score", 0);
+	if (purple_presence_is_idle(presence))
+		score += primitive_scores[SCORE_IDLE];
+	return score;
+}
+
 gint
 purple_presence_compare(const PurplePresence *presence1,
 		const PurplePresence *presence2)
 {
-	gboolean idle1, idle2;
 	time_t idle_time_1, idle_time_2;
 	int score1 = 0, score2 = 0;
-	GList *l;
 
 	if (presence1 == presence2)
 		return 0;
@@ -1563,49 +1587,18 @@
 	else if (presence2 == NULL)
 		return -1;
 
-	/* Compute the score of the first set of statuses. */
-	for (l = purple_presence_get_statuses(presence1); l != NULL; l = l->next)
-	{
-		PurpleStatus *status = (PurpleStatus *)l->data;
-		PurpleStatusType *type = purple_status_get_type(status);
+	if (purple_presence_is_online(presence1) &&
+			!purple_presence_is_online(presence2))
+		return -1;
+	else if (purple_presence_is_online(presence2) &&
+			!purple_presence_is_online(presence1))
+		return 1;
 
-		if (purple_status_is_active(status)) {
-			score1 += primitive_scores[purple_status_type_get_primitive(type)];
-			if (!purple_status_is_online(status)) {
-				PurpleBuddy *b = purple_presence_get_buddy(presence1);
-				if (b && purple_account_supports_offline_message(purple_buddy_get_account(b),b))
-					score1 += primitive_scores[SCORE_OFFLINE_MESSAGE];
-			}
-		}
-	}
-	score1 += purple_account_get_int(purple_presence_get_account(presence1), "score", 0);
+	/* Compute the score of the first set of statuses. */
+	score1 = purple_presence_compute_score(presence1);
 
 	/* Compute the score of the second set of statuses. */
-	for (l = purple_presence_get_statuses(presence2); l != NULL; l = l->next)
-	{
-		PurpleStatus *status = (PurpleStatus *)l->data;
-		PurpleStatusType *type = purple_status_get_type(status);
-
-		if (purple_status_is_active(status)) {
-			score2 += primitive_scores[purple_status_type_get_primitive(type)];
-			if (!purple_status_is_online(status)) {
-				PurpleBuddy *b = purple_presence_get_buddy(presence2);
-				if (b && purple_account_supports_offline_message(purple_buddy_get_account(b),b))
-					score2 += primitive_scores[SCORE_OFFLINE_MESSAGE];
-			}
-
-		}
-	}
-	score2 += purple_account_get_int(purple_presence_get_account(presence2), "score", 0);
-
-	idle1 = purple_presence_is_idle(presence1);
-	idle2 = purple_presence_is_idle(presence2);
-
-	if (idle1)
-		score1 += primitive_scores[SCORE_IDLE];
-
-	if (idle2)
-		score2 += primitive_scores[SCORE_IDLE];
+	score2 = purple_presence_compute_score(presence2);
 
 	idle_time_1 = time(NULL) - purple_presence_get_idle_time(presence1);
 	idle_time_2 = time(NULL) - purple_presence_get_idle_time(presence2);
--- a/libpurple/status.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/status.h	Mon Apr 28 00:01:07 2008 +0000
@@ -96,7 +96,8 @@
  */
 /*
  * If you add a value to this enum, make sure you update
- * the status_primitive_map array in status.c.
+ * the status_primitive_map array in status.c and the special-cases for idle
+ * and offline-messagable just below it.
  */
 typedef enum
 {
@@ -110,7 +111,6 @@
 	PURPLE_STATUS_MOBILE,
 	PURPLE_STATUS_TUNE,
 	PURPLE_STATUS_NUM_PRIMITIVES
-
 } PurpleStatusPrimitive;
 
 #include "account.h"
--- a/libpurple/util.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/util.h	Mon Apr 28 00:01:07 2008 +0000
@@ -476,7 +476,8 @@
  *
  * @param str The string to strip HTML from.
  *
- * @return The new string without HTML. This must be freed.
+ * @return The new string without HTML.  You must g_free this string
+ *         when finished with it.
  */
 char *purple_markup_strip_html(const char *str);
 
@@ -485,7 +486,9 @@
  *
  * @param str The string to linkify.
  *
- * @return The linkified text.
+ * @return The new string with all URIs surrounded in standard
+ *         HTML <a href="whatever"></a> tags.  You must g_free this
+ *         string when finished with it.
  */
 char *purple_markup_linkify(const char *str);
 
@@ -497,7 +500,8 @@
  *
  * @param html The string in which to unescape any HTML entities
  *
- * @return the text with HTML entities literalized
+ * @return The text with HTML entities literalized.  You must g_free
+ *         this string when finished with it.
  */
 char *purple_unescape_html(const char *html);
 
@@ -707,8 +711,11 @@
 char *purple_util_get_image_checksum(gconstpointer image_data, size_t image_len);
 
 /**
- * Returns a SHA-1 hash string of the data passed in with the correct file
- * extention appended.
+ * @return A hex encoded version of the SHA-1 hash of the data passed
+ *         in with the correct file extention appended.  The file
+ *         extension is determined by calling
+ *         purple_util_get_image_extension().  This return value must
+ *         be g_freed by the caller.
  */
 char *purple_util_get_image_filename(gconstpointer image_data, size_t image_len);
 
--- a/libpurple/win32/giowin32.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/giowin32.c	Mon Apr 28 00:01:07 2008 +0000
@@ -37,8 +37,8 @@
 #include <glib.h>
 
 #include <stdlib.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <winsock.h>          /* Not everybody has winsock2 */
 #include <fcntl.h>
 #include <io.h>
 #include <process.h>
@@ -541,7 +541,7 @@
   g_io_channel_unref (watch->channel);
 }
 
-GSourceFuncs g_io_watch_funcs = {
+static GSourceFuncs wp_g_io_watch_funcs = {
   g_io_win32_prepare,
   g_io_win32_check,
   g_io_win32_dispatch,
@@ -559,7 +559,7 @@
   GSource *source;
   char send_buffer[] = "c";
 
-  source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
+  source = g_source_new (&wp_g_io_watch_funcs, sizeof (GIOWin32Watch));
   watch = (GIOWin32Watch *)source;
   
   watch->channel = channel;
--- a/libpurple/win32/global.mak	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/global.mak	Mon Apr 28 00:01:07 2008 +0000
@@ -110,3 +110,6 @@
 PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
 PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
 MINGW_MAKEFILE := Makefile.mingw
+
+INSTALL_PIXMAPS ?= 1
+
--- a/libpurple/win32/libc_interface.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/libc_interface.c	Mon Apr 28 00:01:07 2008 +0000
@@ -319,23 +319,23 @@
 	if (errornum > WSABASEERR) {
 		switch(errornum) {
 			case WSAECONNABORTED: /* 10053 */
-				snprintf(errbuf, sizeof(errbuf), _("Connection interrupted by other software on your computer."));
+				g_snprintf(errbuf, sizeof(errbuf), _("Connection interrupted by other software on your computer."));
 				break;
 			case WSAECONNRESET: /* 10054 */
-				snprintf(errbuf, sizeof(errbuf), _("Remote host closed connection."));
+				g_snprintf(errbuf, sizeof(errbuf), _("Remote host closed connection."));
 				break;
 			case WSAETIMEDOUT: /* 10060 */
-				snprintf(errbuf, sizeof(errbuf), _("Connection timed out."));
+				g_snprintf(errbuf, sizeof(errbuf), _("Connection timed out."));
 				break;
 			case WSAECONNREFUSED: /*10061 */
-				snprintf(errbuf, sizeof(errbuf), _("Connection refused."));
+				g_snprintf(errbuf, sizeof(errbuf), _("Connection refused."));
 				break;
 			default:
-				snprintf(errbuf, sizeof(errbuf), "Windows socket error #%d", errornum);
+				g_snprintf(errbuf, sizeof(errbuf), "Windows socket error #%d", errornum);
 		}
 	} else {
 		const char *tmp = g_strerror(errornum);
-		snprintf(errbuf, sizeof(errbuf), tmp);
+		g_snprintf(errbuf, sizeof(errbuf), tmp);
 	}
 	return errbuf;
 }
@@ -368,7 +368,7 @@
 		}
 	} else {
 		/* fd is not a socket handle.. pass it off to read */
-		return read(fd, buf, size);
+		return _read(fd, buf, size);
 	}
 }
 
@@ -391,7 +391,7 @@
 	if(wpurple_is_socket(fd))
 		return wpurple_send(fd, buf, size, 0);
 	else
-		return write(fd, buf, size);
+		return _write(fd, buf, size);
 }
 
 int wpurple_recv(int fd, void *buf, size_t len, int flags) {
@@ -419,7 +419,7 @@
 			return 0;
 	}
 	else
-		return close(fd);
+		return _close(fd);
 }
 
 int wpurple_gethostname(char *name, size_t size) {
@@ -454,6 +454,14 @@
 /* stdio.h */
 
 int wpurple_rename (const char *oldname, const char *newname) {
+
+#if GLIB_CHECK_VERSION(2,8,5)
+
+	return g_rename(oldname, newname);
+
+#else
+
+	/* This is a ugly, but we still compile with 2.6.10 but use newer runtimes */
 	struct stat oldstat, newstat;
 
 	/* As of Glib 2.8.5, g_rename() uses MoveFileEx() with MOVEFILE_REPLACE_EXISTING to behave more sanely */
@@ -503,6 +511,8 @@
 		return -1;
 	}
 
+#endif
+
 }
 
 /* time.h */
@@ -1080,7 +1090,6 @@
 	return "";
 }
 
-#if !GLIB_CHECK_VERSION(2,8,0)
 /**
  * g_access:
  * @filename: a pathname in the GLib file name encoding (UTF-8 on Windows)
@@ -1105,6 +1114,12 @@
 wpurple_g_access (const gchar *filename,
 	  int          mode)
 {
+#if GLIB_CHECK_VERSION(2,8,0)
+
+	return g_access(filename, mode);
+
+#else
+
   if (G_WIN32_HAVE_WIDECHAR_API ())
     {
       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
@@ -1145,7 +1160,8 @@
       errno = save_errno;
       return retval;
     }
+
+#endif
 }
-#endif
 
 
--- a/libpurple/win32/libc_interface.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/libc_interface.h	Mon Apr 28 00:01:07 2008 +0000
@@ -44,8 +44,8 @@
 #endif
 
 /* sys/socket.h */
-#define socket( namespace, style, protocol ) \
-wpurple_socket( namespace, style, protocol )
+#define socket( domain, style, protocol ) \
+wpurple_socket( domain, style, protocol )
 
 #define connect( socket, addr, length ) \
 wpurple_connect( socket, addr, length )
--- a/libpurple/win32/libc_internal.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/libc_internal.h	Mon Apr 28 00:01:07 2008 +0000
@@ -30,7 +30,7 @@
 #endif /* __cplusplus */
 
 /* sys/socket.h */
-int wpurple_socket(int namespace, int style, int protocol);
+int wpurple_socket(int domain, int style, int protocol);
 int wpurple_connect(int socket, struct sockaddr *addr, u_long length);
 int wpurple_getsockopt(int socket, int level, int optname, void *optval, socklen_t *optlenptr);
 int wpurple_setsockopt(int socket, int level, int optname, const void *optval, socklen_t optlen);
--- a/libpurple/win32/targets.mak	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/targets.mak	Mon Apr 28 00:01:07 2008 +0000
@@ -12,11 +12,10 @@
 	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@
 
 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
-	cp $@.in $@
 	awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \
-	  /^m4_define..purple_major_version/ {system("sed -i -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@");} \
-	  /^m4_define..purple_minor_version/ {system("sed -i -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@");} \
-	  /^m4_define..purple_micro_version/ {system("sed -i -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
+	  /^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \
+	  /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@");} \
+	  /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
 
 $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll
--- a/libpurple/win32/win32dep.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/win32dep.c	Mon Apr 28 00:01:07 2008 +0000
@@ -23,23 +23,12 @@
  *
  */
 #define _WIN32_IE 0x500
-#include <windows.h>
-#include <io.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "internal.h"
 #include <winuser.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-
-#include "internal.h"
 #include "debug.h"
 #include "notify.h"
 
-#include <libintl.h>
-
-#include "win32dep.h"
-
 /*
  *  DEFINES & MACROS
  */
--- a/libpurple/win32/win32dep.h	Mon Mar 31 21:23:57 2008 +0000
+++ b/libpurple/win32/win32dep.h	Mon Apr 28 00:01:07 2008 +0000
@@ -22,8 +22,9 @@
  */
 #ifndef _WIN32DEP_H_
 #define _WIN32DEP_H_
+#include <winsock2.h>
+#include <windows.h>
 #include <shlobj.h>
-#include <winsock2.h>
 #include <process.h>
 #include "wpurpleerror.h"
 #include "libc_interface.h"
--- a/pidgin/gtkblist.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkblist.c	Mon Apr 28 00:01:07 2008 +0000
@@ -696,6 +696,7 @@
 	{
 		purple_blist_node_set_bool(node, "show_offline",
 		                           !purple_blist_node_get_bool(node, "show_offline"));
+		pidgin_blist_update(purple_get_blist(), node);
 	}
 	else if (PURPLE_BLIST_NODE_IS_CONTACT(node))
 	{
@@ -705,6 +706,7 @@
 		purple_blist_node_set_bool(node, "show_offline", setting);
 		for (bnode = node->child; bnode != NULL; bnode = bnode->next) {
 			purple_blist_node_set_bool(bnode, "show_offline", setting);
+			pidgin_blist_update(purple_get_blist(), bnode);
 		}
 	} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
 		PurpleBlistNode *cnode, *bnode;
@@ -715,10 +717,10 @@
 			purple_blist_node_set_bool(cnode, "show_offline", setting);
 			for (bnode = cnode->child; bnode != NULL; bnode = bnode->next) {
 				purple_blist_node_set_bool(bnode, "show_offline", setting);
+				pidgin_blist_update(purple_get_blist(), bnode);
 			}
 		}
 	}
-	pidgin_blist_update(purple_get_blist(), node);
 }
 
 static void gtk_blist_show_systemlog_cb(void)
@@ -1034,6 +1036,7 @@
 		g_free(title);
 
 		purple_blist_node_set_bool(node, "collapsed", FALSE);
+		pidgin_blist_tooltip_destroy();
 	}
 }
 
@@ -1071,7 +1074,7 @@
 				pidgin_blist_update_contact(NULL, cnode);
 			}
 		}
-
+		pidgin_blist_tooltip_destroy();
 	} else if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		pidgin_blist_collapse_contact_cb(NULL, node);
 	}
@@ -3167,11 +3170,16 @@
 					chat->account);
 			g_free(chat_name);
 		}
-		if (conv && prpl_info && (prpl_info->options & OPT_PROTO_CHAT_TOPIC) &&
-				!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
-			char *topic = g_markup_escape_text(purple_conv_chat_get_topic(PURPLE_CONV_CHAT(conv)), -1);
-			g_string_append_printf(str, _("\n<b>Topic:</b> %s"), topic ? topic : _("(no topic set)"));
-			g_free(topic);
+
+		if (conv && !purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
+			g_string_append_printf(str, _("\n<b>Occupants:</b> %d"),
+					g_list_length(purple_conv_chat_get_users(PURPLE_CONV_CHAT(conv))));
+
+			if (prpl_info && (prpl_info->options & OPT_PROTO_CHAT_TOPIC)) {
+				char *topic = g_markup_escape_text(purple_conv_chat_get_topic(PURPLE_CONV_CHAT(conv)), -1);
+				g_string_append_printf(str, _("\n<b>Topic:</b> %s"), topic ? topic : _("(no topic set)"));
+				g_free(topic);
+			}
 		}
 
 		if (prpl_info->chat_info != NULL)
@@ -4432,9 +4440,10 @@
 }
 
 static gboolean
-headline_click_callback(gpointer data)
-{
-	((GSourceFunc)gtkblist->headline_callback)(gtkblist->headline_data);
+headline_click_callback(gpointer unused)
+{
+	if (gtkblist->headline_callback)
+		((GSourceFunc) gtkblist->headline_callback)(gtkblist->headline_data);
 	reset_headline(gtkblist);
 	return FALSE;
 }
@@ -4444,7 +4453,7 @@
 {
 	gtk_widget_hide(gtkblist->headline_hbox);
 	if (gtkblist->headline_callback && !headline_hover_close((int)event->x, (int)event->y))
-		g_idle_add((GSourceFunc)headline_click_callback, gtkblist->headline_data);
+		g_idle_add(headline_click_callback, NULL);
 	else {
 		if (gtkblist->headline_destroy)
 			gtkblist->headline_destroy(gtkblist->headline_data);
--- a/pidgin/gtkconv.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkconv.c	Mon Apr 28 00:01:07 2008 +0000
@@ -101,6 +101,9 @@
 #define DEFAULT_HIGHLIGHT_COLOR "#AF7F00"
 #define DEFAULT_ACTION_COLOR "#062585"
 
+#define BUDDYICON_SIZE_MIN    32
+#define BUDDYICON_SIZE_MAX    96
+
 /* Undef this to turn off "custom-smiley" debug messages */
 #define DEBUG_CUSTOM_SMILEY
 
@@ -169,7 +172,7 @@
 		int width, int height);
 static gboolean pidgin_conv_xy_to_right_infopane(PidginWindow *win, int x, int y);
 
-static GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name) {
+static const GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name) {
 	static GdkColor col;
 	GtkStyle *style = gtk_widget_get_style(gtkconv->imhtml);
 	float scale;
@@ -1811,6 +1814,22 @@
 }
 
 static void
+activate_list_cb(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *column, PidginConversation *gtkconv)
+{
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	gchar *who;
+	
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+
+	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);
+	chat_do_im(gtkconv, who);
+
+	g_free(who);
+}
+
+static void
 move_to_next_unread_tab(PidginConversation *gtkconv, gboolean forward)
 {
 	PidginConversation *next_gtkconv = NULL, *most_active = NULL;
@@ -2489,14 +2508,18 @@
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")) {
 		emblem = pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL);
-		gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
+	} else {
+		emblem = NULL;
+	}
+
+	gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
 			&(gtkconv->infopane_iter),
 			CONV_PROTOCOL_ICON_COLUMN, emblem, -1);
-		if (emblem)
-			g_object_unref(emblem);
-	}
+	if (emblem)
+		g_object_unref(emblem);
 
 	/* XXX seanegan Why do I have to do this? */
+	gtk_widget_queue_resize(gtkconv->infopane);
 	gtk_widget_queue_draw(gtkconv->infopane);
 
 	if (status != NULL)
@@ -2539,6 +2562,7 @@
 	GdkPixbuf *scale;
 	gint delay;
 	int scale_width, scale_height;
+	int size;
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	account = purple_conversation_get_account(conv);
@@ -2553,17 +2577,22 @@
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 	buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
 
- 	scale_width = gdk_pixbuf_get_width(buf);
-        scale_height = gdk_pixbuf_get_height(buf);
-        if (scale_width == scale_height) {
-		scale_width = scale_height = 32;
+	scale_width = gdk_pixbuf_get_width(buf);
+	scale_height = gdk_pixbuf_get_height(buf);
+
+	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+	size = MIN(size, MIN(scale_width, scale_height));
+	size = CLAMP(size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
+
+	if (scale_width == scale_height) {
+		scale_width = scale_height = size;
 	} else if (scale_height > scale_width) {
-                scale_width = 32 * scale_width / scale_height;
-                scale_height = 32;
-        } else {
-                scale_height = 32 * scale_height / scale_width;
-                scale_width = 32;
-        }
+		scale_width = size * scale_width / scale_height;
+		scale_height = size;
+	} else {
+		scale_height = size * scale_height / scale_width;
+		scale_width = size;
+	}
 
 	scale = gdk_pixbuf_scale_simple(buf, scale_width, scale_height,
 		GDK_INTERP_BILINEAR);
@@ -2683,6 +2712,33 @@
 }
 
 static void
+change_size_cb(GtkWidget *widget, PidginConversation *gtkconv)
+{
+	int size = 0;
+	PurpleConversation *conv = gtkconv->active_conv;
+	GSList *buddies;
+
+	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+
+	if (size == BUDDYICON_SIZE_MAX) {
+		size = BUDDYICON_SIZE_MIN;
+	} else {
+		size = BUDDYICON_SIZE_MAX;
+	}
+
+	gtk_widget_set_size_request(gtkconv->infopane_hbox, -1, size);
+	pidgin_conv_update_buddy_icon(conv);
+
+	buddies = purple_find_buddies(purple_conversation_get_account(conv),
+			purple_conversation_get_name(conv));
+	for (; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
+		PurpleBuddy *buddy = buddies->data;
+		PurpleContact *contact = purple_buddy_get_contact(buddy);
+		purple_blist_node_set_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize", size);
+	}
+}
+
+static void
 remove_custom_icon_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	PurpleConversation *conv;
@@ -2743,8 +2799,14 @@
 	PurpleConversation *conv;
 	PurpleBuddy *buddy;
 
-	if (e->button != 3 || e->type != GDK_BUTTON_PRESS)
+	if (e->button == 1 && e->type == GDK_BUTTON_PRESS) {
+		change_size_cb(NULL, gtkconv);
+		return TRUE;
+	}
+
+	if (e->button != 3 || e->type != GDK_BUTTON_PRESS) {
 		return FALSE;
+	}
 
 	/*
 	 * If a menu already exists, destroy it before creating a new one,
@@ -2774,6 +2836,10 @@
 							 G_CALLBACK(set_custom_icon_cb), gtkconv,
 							 0, 0, NULL);
 
+	pidgin_new_item_from_stock(menu, _("Change Size"), NULL,
+							 G_CALLBACK(change_size_cb), gtkconv,
+							 0, 0, NULL);
+
 	/* Is there a custom icon for this person? */
 	conv = gtkconv->active_conv;
 	buddy = purple_find_buddy(purple_conversation_get_account(conv),
@@ -3409,9 +3475,13 @@
 static void
 update_typing_message(PidginConversation *gtkconv, const char *message)
 {
-	GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml));
+	GtkTextBuffer *buffer;
 	GtkTextMark *stmark, *enmark;
 
+	if (g_object_get_data(G_OBJECT(gtkconv->imhtml), "disable-typing-notification"))
+		return;
+
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml));
 	stmark = gtk_text_buffer_get_mark(buffer, "typing-notification-start");
 	enmark = gtk_text_buffer_get_mark(buffer, "typing-notification-end");
 	if (stmark && enmark) {
@@ -3614,6 +3684,20 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 }
 
+static gboolean
+compare_buddy_presence(PurplePresence *p1, PurplePresence *p2)
+{
+	/* This is necessary because multiple PurpleBuddy's don't share the same
+	 * PurplePresence anymore.
+	 */
+	PurpleBuddy *b1 = purple_presence_get_buddy(p1);
+	PurpleBuddy *b2 = purple_presence_get_buddy(p2);
+	if (purple_buddy_get_account(b1) == purple_buddy_get_account(b2) &&
+			strcmp(purple_buddy_get_name(b1), purple_buddy_get_name(b2)) == 0)
+		return FALSE;
+	return TRUE;
+}
+
 static void
 generate_send_to_items(PidginWindow *win)
 {
@@ -3648,8 +3732,7 @@
 
 		if (buds == NULL)
 		{
-			/* The user isn't on the buddy list. */
-			create_sendto_item(menu, sg, &group, NULL, gtkconv->active_conv->account, gtkconv->active_conv->name);
+			/* The user isn't on the buddy list. So we don't create any sendto menu. */
 		}
 		else
 		{
@@ -3673,20 +3756,22 @@
 					{
 						/* Use the PurplePresence to get unique buddies. */
 						PurplePresence *presence = purple_buddy_get_presence(buddy);
-						if (!g_list_find(list, presence))
+						if (!g_list_find_custom(list, presence, (GCompareFunc)compare_buddy_presence))
 							list = g_list_prepend(list, presence);
 					}
 				}
 			}
 
-			/* Loop over the list backwards so we get the items in the right order,
-			 * since we did a g_list_prepend() earlier. */
-			for (iter = g_list_last(list); iter != NULL; iter = iter->prev)
-			{
-				PurplePresence *pre = iter->data;
-				PurpleBuddy *buddy = purple_presence_get_buddy(pre);
-				create_sendto_item(menu, sg, &group, buddy,
+			/* Create the sendto menu only if it has more than one item to show */
+			if (list && list->next) {
+				/* Loop over the list backwards so we get the items in the right order,
+				 * since we did a g_list_prepend() earlier. */
+				for (iter = g_list_last(list); iter != NULL; iter = iter->prev) {
+					PurplePresence *pre = iter->data;
+					PurpleBuddy *buddy = purple_presence_get_buddy(pre);
+					create_sendto_item(menu, sg, &group, buddy,
 							purple_buddy_get_account(buddy), purple_buddy_get_name(buddy));
+				}
 			}
 			g_list_free(list);
 			g_slist_free(buds);
@@ -4361,33 +4446,35 @@
 {
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
-	int wrapped_lines;
 	int lines;
 	GdkRectangle oneline;
 	int height, diff;
 	int pad_top, pad_inside, pad_bottom;
 	int max_height = gtkconv->tab_cont->allocation.height / 2;
 
-	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
-
-	wrapped_lines = 1;
-	gtk_text_buffer_get_start_iter(buffer, &iter);
-	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(gtkconv->entry), &iter, &oneline);
-	while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(gtkconv->entry), &iter))
-		wrapped_lines++;
-
-	lines = gtk_text_buffer_get_line_count(buffer);
-
-	/* Show at least two lines */
-	wrapped_lines = MAX(wrapped_lines, 2);
-
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));
 
-	height = (oneline.height + pad_top + pad_bottom) * lines;
-	if (wrapped_lines > lines)
-		height += (oneline.height + pad_inside) * (wrapped_lines - lines);
+	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
+	gtk_text_buffer_get_start_iter(buffer, &iter);
+	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(gtkconv->entry), &iter, &oneline);
+
+	lines = gtk_text_buffer_get_line_count(buffer);
+
+	height = 0;
+	do {
+		int lineheight = 0;
+		gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(gtkconv->entry), &iter, NULL, &lineheight);
+		height += lineheight;
+		lines--;
+	} while (gtk_text_iter_forward_line(&iter));
+	height += lines * (oneline.height + pad_top + pad_bottom);
+
+	/* Make sure there's enough room for at least two lines. Allocate enough space to
+	 * prevent scrolling when the second line is a continuation of the first line, or
+	 * is the beginning of a new paragraph. */
+	height = MAX(height, 2 * (oneline.height + MAX(pad_inside, pad_top + pad_bottom)));
 
 	height = MIN(height, max_height);
 
@@ -4517,6 +4604,8 @@
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
+	g_signal_connect(G_OBJECT(list), "row-activated",
+					 G_CALLBACK(activate_list_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);
@@ -4592,8 +4681,10 @@
 	GtkCellRenderer *rend;
 	GtkTreePath *path;
 	PurpleConversation *conv = gtkconv->active_conv;
+	PurpleBuddy *buddy;
 	gboolean chat = (conv->type == PURPLE_CONV_TYPE_CHAT);
 	GtkPolicyType imhtml_sw_hscroll;
+	int buddyicon_size = 0;
 
 	/* Setup the top part of the pane */
 	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -4621,12 +4712,22 @@
 	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));
+	g_object_unref(gtkconv->infopane_model);
 	gtk_list_store_append(gtkconv->infopane_model, &(gtkconv->infopane_iter));
 	gtk_box_pack_start(GTK_BOX(gtkconv->infopane_hbox), gtkconv->infopane, TRUE, TRUE, 0);
 	path = gtk_tree_path_new_from_string("0");
 	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(gtkconv->infopane), path);
 	gtk_tree_path_free(path);
-	gtk_widget_set_size_request(gtkconv->infopane_hbox, -1, 32);
+
+	if ((buddy = purple_find_buddy(purple_conversation_get_account(conv),
+					purple_conversation_get_name(conv))) != NULL) {
+		PurpleContact *contact = purple_buddy_get_contact(buddy);
+		if (contact) {
+			buddyicon_size = purple_blist_node_get_int((PurpleBlistNode*)contact, "pidgin-infopane-iconsize");
+		}
+	}
+	buddyicon_size = CLAMP(buddyicon_size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
+	gtk_widget_set_size_request(gtkconv->infopane_hbox, -1, buddyicon_size);
 	gtk_widget_show(gtkconv->infopane);
 
 	rend = gtk_cell_renderer_pixbuf_new();
@@ -4896,6 +4997,40 @@
 	return FALSE;
 }
 
+static void set_typing_font(GtkWidget *widget, GtkStyle *style, PidginConversation *gtkconv)
+{
+	static PangoFontDescription *font_desc = NULL;
+	static GdkColor *color = NULL;
+	static gboolean enable = TRUE;
+
+	if (font_desc == NULL) {
+		char *string = NULL;
+		gtk_widget_style_get(widget,
+				"typing-notification-font", &string,
+				"typing-notification-color", &color,
+				"typing-notification-enable", &enable,
+				NULL);
+		font_desc = pango_font_description_from_string(string);
+		g_free(string);
+		if (color == NULL) {
+			GdkColor def = {0, 0x8888, 0x8888, 0x8888};
+			color = gdk_color_copy(&def);
+		}
+	}
+
+	gtk_text_buffer_create_tag(GTK_IMHTML(widget)->text_buffer, "TYPING-NOTIFICATION",
+			"foreground-gdk", color,
+			"font-desc", font_desc,
+			NULL);
+
+	if (!enable) {
+		g_object_set_data(G_OBJECT(widget), "disable-typing-notification", GINT_TO_POINTER(TRUE));
+		/* or may be 'gtkconv->disable_typing = TRUE;' instead? */
+	}
+
+	g_signal_handlers_disconnect_by_func(G_OBJECT(widget), set_typing_font, gtkconv);
+}
+
 /**************************************************************************
  * Conversation UI operations
  **************************************************************************/
@@ -4977,12 +5112,7 @@
 	g_signal_connect(G_OBJECT(gtkconv->entry), "drag_data_received",
 	                 G_CALLBACK(conv_dnd_recv), gtkconv);
 
-	gtk_text_buffer_create_tag(GTK_IMHTML(gtkconv->imhtml)->text_buffer, "TYPING-NOTIFICATION",
-			"foreground", "#888888",
-			"justification", GTK_JUSTIFY_LEFT,  /* XXX: RTL'ify */
-			"weight", PANGO_WEIGHT_LIGHT,
-			"scale", PANGO_SCALE_SMALL,
-			NULL);
+	g_signal_connect(gtkconv->imhtml, "style-set", G_CALLBACK(set_typing_font), gtkconv);
 
 	/* Setup the container for the tab. */
 	gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -5379,7 +5509,7 @@
 	account = purple_conversation_get_account(conv);
 	g_return_if_fail(account != NULL);
 	gc = purple_account_get_connection(account);
-	g_return_if_fail(gc != NULL);
+	g_return_if_fail(gc != NULL || !(flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)));
 
 	/* Make sure URLs are clickable */
 	if(flags & PURPLE_MESSAGE_NO_LINKIFY)
@@ -5412,7 +5542,7 @@
 	}
 
 	win = gtkconv->win;
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
 
 	line_count = gtk_text_buffer_get_line_count(
 			gtk_text_view_get_buffer(GTK_TEXT_VIEW(
@@ -5577,8 +5707,8 @@
 				if(col) {
 					g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 						col->red >> 8, col->green >> 8, col->blue >> 8);
-				}
-				else {
+					gdk_color_free(col);
+				} else {
 					if (flags & PURPLE_MESSAGE_NICK)
 						strcpy(color, DEFAULT_HIGHLIGHT_COLOR);
 					else
@@ -5601,14 +5731,14 @@
 					if(col) {
 						g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 							col->red >> 8, col->green >> 8, col->blue >> 8);
-					}
-					else {
+						gdk_color_free(col);
+					} else {
 						strcpy(color, DEFAULT_HIGHLIGHT_COLOR);
 					}
 				}
 				else if (flags & PURPLE_MESSAGE_RECV) {
 					if (type == PURPLE_CONV_TYPE_CHAT) {
-						GdkColor *col = get_nick_color(gtkconv, name);
+						const GdkColor *col = get_nick_color(gtkconv, name);
 
 						g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 							   col->red >> 8, col->green >> 8, col->blue >> 8);
@@ -5618,8 +5748,8 @@
 						if(col) {
 							g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 								col->red >> 8, col->green >> 8, col->blue >> 8);
-						}
-						else {
+							gdk_color_free(col);
+						} else {
 							strcpy(color, DEFAULT_RECV_COLOR);
 						}
 					}
@@ -5630,8 +5760,8 @@
 					if(col) {
 						g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 							col->red >> 8, col->green >> 8, col->blue >> 8);
-					}
-					else {
+						gdk_color_free(col);
+					} else {
 						strcpy(color, DEFAULT_SEND_COLOR);
 					}
 				}
@@ -5645,7 +5775,7 @@
 		g_free(alias_escaped);
 
 		/* Are we in a chat where we can tell which users are buddies? */
-		if  (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME) &&
+		if  (prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME) &&
 		     purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 
 			/* Bold buddies to make them stand out from non-buddies. */
@@ -6385,7 +6515,9 @@
 				markup = title;
 			}
 		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
-			const char *topic = gtkconv->u.chat->topic_text ? gtk_entry_get_text(GTK_ENTRY(gtkconv->u.chat->topic_text)) : NULL;
+			const char *topic = gtkconv->u.chat->topic_text
+				? gtk_entry_get_text(GTK_ENTRY(gtkconv->u.chat->topic_text))
+				: NULL;
 			char *esc = NULL, *tmp;
 #if GTK_CHECK_VERSION(2,6,0)
 			esc = topic ? g_markup_escape_text(topic, -1) : NULL;
@@ -6395,20 +6527,22 @@
 			int len = 0;
 			char *c;
 
-			tmp = g_strdup(topic);
-			c = tmp;
-			while(*c && len < 72) {
-				c = g_utf8_next_char(c);
-				len++;
+			if (topic != NULL) {
+				tmp = g_strdup(topic);
+				c = tmp;
+				while(*c && len < 72) {
+					c = g_utf8_next_char(c);
+					len++;
+				}
+				if (len == 72) {
+					*c = '\0';
+					c = g_strdup_printf("%s...", tmp);
+					g_free(tmp);
+					tmp = c;
+				}
+				esc = g_markup_escape_text(tmp, -1);
+				g_free(tmp);
 			}
-			if (len == 72) {
-				*c = '\0';
-				c = g_strdup_printf("%s...", tmp);
-				g_free(tmp);
-				tmp = c;
-			}
-			esc = tmp ? g_markup_escape_text(tmp, -1) : NULL;
-			g_free(tmp);
 #endif
 			tmp = g_markup_escape_text(purple_conversation_get_title(conv), -1);
 			markup = g_strdup_printf("%s%s<span color='%s' size='smaller'>%s</span>",
@@ -6606,6 +6740,7 @@
 	GtkWidget *event;
 	GdkPixbuf *scale;
 	int scale_width, scale_height;
+	int size = 0;
 
 	PurpleAccount *account;
 	PurplePluginProtocolInfo *prpl_info = NULL;
@@ -6718,14 +6853,20 @@
 
 	scale_width = gdk_pixbuf_get_width(buf);
 	scale_height = gdk_pixbuf_get_height(buf);
+
+	gtk_widget_get_size_request(gtkconv->infopane_hbox, NULL, &size);
+	size = MIN(size, MIN(scale_width, scale_height));
+
+	/* Some sanity checks */
+	size = CLAMP(size, BUDDYICON_SIZE_MIN, BUDDYICON_SIZE_MAX);
 	if (scale_width == scale_height) {
-		scale_width = scale_height = 32;
+		scale_width = scale_height = size;
 	} else if (scale_height > scale_width) {
-		scale_width = 32 * scale_width / scale_height;
-		scale_height = 32;
+		scale_width = size * scale_width / scale_height;
+		scale_height = size;
 	} else {
-		scale_height = 32 * scale_height / scale_width;
-		scale_width = 32;
+		scale_height = size * scale_height / scale_width;
+		scale_width = size;
 	}
 	scale = gdk_pixbuf_scale_simple(buf, scale_width, scale_height,
 				GDK_INTERP_BILINEAR);
@@ -7565,7 +7706,7 @@
 								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",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/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);
@@ -8108,7 +8249,7 @@
 		} else {
 			page_num = 0;
 			to_right = pidgin_conv_xy_to_right_infopane(dest_win, e->x_root, e->y_root);
-			tab = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num)->infopane;
+			tab = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num)->infopane_hbox;
 		}
 
 		if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP ||
@@ -8418,7 +8559,7 @@
 
 			gtk_window_get_size(GTK_WINDOW(dest_win->window),
 			                    &win_width, &win_height);
-#ifdef WIN32  /* only override window manager placement on Windows */
+#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));
@@ -8854,7 +8995,9 @@
 			conv_y = 100;
 
 		/* ...and move it back. */
+#ifdef _WIN32  /* only override window manager placement on Windows */
 		gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y);
+#endif
 		gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height);
 	}
 }
@@ -8889,7 +9032,13 @@
 	if (!gtk_get_current_event_state(&state))
 		gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE);
 #endif
+	/* Etan: I really think this entire function call should happen only
+	 * when we are on Windows but I was informed that back before we used
+	 * to save the window position we stored the window size, so I'm
+	 * leaving it for now. */
+#if TRUE || defined(_WIN32)
 	pidgin_conv_restore_position(win);
+#endif
 
 	if (available_list == NULL) {
 		create_icon_lists(win->window);
--- a/pidgin/gtkimhtml.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkimhtml.c	Mon Apr 28 00:01:07 2008 +0000
@@ -359,17 +359,17 @@
 	GtkTextIter iter;
 	gboolean scroll = TRUE;
 
-        gtk_text_buffer_get_end_iter(imhtml->text_buffer, &iter);
+	gtk_text_buffer_get_end_iter(imhtml->text_buffer, &iter);
 
 	gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(widget), &rect);
-        gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
-
-	if(((y + height) - (rect.y + rect.height)) > height
-           && gtk_text_buffer_get_char_count(imhtml->text_buffer)){
-                scroll = FALSE;
-        }
-
-	if(imhtml->old_rect.width != rect.width || imhtml->old_rect.height != rect.height){
+	gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
+
+	if (((y + height) - (rect.y + rect.height)) > height &&
+			gtk_text_buffer_get_char_count(imhtml->text_buffer)) {
+		scroll = FALSE;
+	}
+
+	if(imhtml->old_rect.width != rect.width || imhtml->old_rect.height != rect.height) {
 		GList *iter = GTK_IMHTML(widget)->scalables;
 
 		xminus = gtk_text_view_get_left_margin(GTK_TEXT_VIEW(widget)) +
@@ -386,11 +386,11 @@
 
 	imhtml->old_rect = rect;
 	parent_size_allocate(widget, alloc);
-	
+
 	/* Don't scroll here if we're in the middle of a smooth scroll */
 	if (scroll && imhtml->scroll_time == NULL &&
- 	    GTK_WIDGET_REALIZED(imhtml)) 
-		gtk_imhtml_scroll_to_end(imhtml, FALSE);	
+	    GTK_WIDGET_REALIZED(imhtml))
+		gtk_imhtml_scroll_to_end(imhtml, FALSE);
 }
 
 static gint
@@ -576,11 +576,11 @@
 	/* If we don't have a tip from a URL, let's see if we have a tip from a smiley */
 	anchor = gtk_text_iter_get_child_anchor(&iter);
 	if (anchor) {
-		tip = g_object_get_data(G_OBJECT(anchor), "gtkimhtml_plaintext");
+		tip = g_object_get_data(G_OBJECT(anchor), "gtkimhtml_tiptext");
 		hand = FALSE;
 	}
 
-	if (tip){
+	if (tip && *tip) {
 		if (!GTK_IMHTML(imhtml)->editable && hand)
 			gdk_window_set_cursor(win, GTK_IMHTML(imhtml)->hand_cursor);
 		GTK_IMHTML(imhtml)->tip_timer = g_timeout_add (TOOLTIP_TIMEOUT,
@@ -758,6 +758,7 @@
 
 		
 			rect.height = tag_area.y + tag_area.height - rect.y
+				+ gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(widget))
 				+ gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(widget));
 
 			color = tag->name + 11;
@@ -1201,16 +1202,20 @@
 }
 
 static void
-gtk_imhtml_undo(GtkIMHtml *imhtml) {
+gtk_imhtml_undo(GtkIMHtml *imhtml)
+{
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
-	if (imhtml->editable)
+	if (imhtml->editable &&
+			gtk_source_undo_manager_can_undo(imhtml->undo_manager))
 		gtk_source_undo_manager_undo(imhtml->undo_manager);
 }
 
 static void
-gtk_imhtml_redo(GtkIMHtml *imhtml) {
+gtk_imhtml_redo(GtkIMHtml *imhtml)
+{
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
-	if (imhtml->editable)
+	if (imhtml->editable &&
+			gtk_source_undo_manager_can_redo(imhtml->undo_manager))
 		gtk_source_undo_manager_redo(imhtml->undo_manager);
 
 }
@@ -1416,6 +1421,24 @@
 	                                        _("Color to draw the name of an action message."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 
+	/* Customizable typing notification ... sort of. Example:
+	 *   GtkIMHtml::typing-notification-font = "monospace italic light 8.0"
+	 *   GtkIMHtml::typing-notification-color = "#ff0000"
+	 *   GtkIMHtml::typing-notification-enable = 1
+	 */
+	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("typing-notification-color",
+	                                        _("Typing notification color"),
+	                                        _("The color to use for the typing notification font"),
+	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
+	gtk_widget_class_install_style_property(widget_class, g_param_spec_string("typing-notification-font",
+	                                        _("Typing notification font"),
+	                                        _("The font to use for the typing notification"),
+	                                        "light 8.0", G_PARAM_READABLE));
+	gtk_widget_class_install_style_property(widget_class, g_param_spec_boolean("typing-notification-enable",
+	                                        _("Enable typing notification"),
+	                                        _("Enable typing notification"),
+	                                        TRUE, G_PARAM_READABLE));
+
 	binding_set = gtk_binding_set_by_class (parent_class);
 	gtk_binding_entry_add_signal (binding_set, GDK_b, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_BOLD);
 	gtk_binding_entry_add_signal (binding_set, GDK_i, GDK_CONTROL_MASK, "format_function_toggle", 1, G_TYPE_INT, GTK_IMHTML_ITALIC);
@@ -1441,7 +1464,8 @@
 	gtk_text_buffer_get_end_iter (imhtml->text_buffer, &iter);
 	gtk_text_view_set_buffer(GTK_TEXT_VIEW(imhtml), imhtml->text_buffer);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(imhtml), GTK_WRAP_WORD_CHAR);
-	gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(imhtml), 5);
+	gtk_text_view_set_pixels_above_lines(GTK_TEXT_VIEW(imhtml), 2);
+	gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(imhtml), 3);
 	gtk_text_view_set_left_margin(GTK_TEXT_VIEW(imhtml), 2);
 	gtk_text_view_set_right_margin(GTK_TEXT_VIEW(imhtml), 2);
 	/*gtk_text_view_set_indent(GTK_TEXT_VIEW(imhtml), -15);*/
@@ -2250,8 +2274,7 @@
 					 GSList *unused)
 {
 	GtkTextIter iter, ins, sel;
-	GdkRectangle rect;
-	int y, height, ins_offset = 0, sel_offset = 0;
+	int ins_offset = 0, sel_offset = 0;
 	gboolean fixins = FALSE, fixsel = FALSE;
 
 	g_return_if_fail (imhtml != NULL);
@@ -2272,13 +2295,17 @@
 		sel_offset = gtk_text_iter_get_offset(&sel);
 	}
 
-	gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(imhtml), &rect);
-	gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
-
-
-	if(((y + height) - (rect.y + rect.height)) > height
-	   && gtk_text_buffer_get_char_count(imhtml->text_buffer)){
-		options |= GTK_IMHTML_NO_SCROLL;
+	if (!(options & GTK_IMHTML_NO_SCROLL)) {
+		GdkRectangle rect;
+		int y, height;
+
+		gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(imhtml), &rect);
+		gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
+
+		if (((y + height) - (rect.y + rect.height)) > height &&
+				gtk_text_buffer_get_char_count(imhtml->text_buffer)) {
+			options |= GTK_IMHTML_NO_SCROLL;
+		}
 	}
 
 	gtk_imhtml_insert_html_at_iter(imhtml, text, options, &iter);
@@ -2404,6 +2431,7 @@
 	ws = g_malloc(len + 1);
 	ws[0] = 0;
 
+	gtk_text_buffer_begin_user_action(imhtml->text_buffer);
 	while (pos < len) {
 		if (*c == '<' && gtk_imhtml_is_tag (c + 1, &tag, &tlen, &type)) {
 			c++;
@@ -2676,8 +2704,11 @@
 
 						if (sml)
 							font->sml = sml;
-						else if (oldfont && oldfont->sml)
-							font->sml = g_strdup(oldfont->sml);
+						else {
+							g_free(sml);
+							if (oldfont && oldfont->sml)
+								font->sml = g_strdup(oldfont->sml);
+						}
 
 						if (size && !(options & GTK_IMHTML_NO_SIZES) && (imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK))) {
 							if (*size == '+') {
@@ -2729,7 +2760,7 @@
 				case 46:	/* IMG (opt) */
 				case 59:	/* IMG */
 					{
-						const char *id;
+						char *id;
 
 						gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 						ws[0] = '\0'; wpos = 0;
@@ -2741,6 +2772,7 @@
 						if (!id)
 							break;
 						gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter);
+						g_free(id);
 						break;
 					}
 				case 47:	/* P (opt) */
@@ -3128,6 +3160,7 @@
 	g_signal_emit(object, signals[UPDATE_FORMAT], 0);
 	g_object_unref(object);
 
+	gtk_text_buffer_end_user_action(imhtml->text_buffer);
 }
 
 void gtk_imhtml_remove_smileys(GtkIMHtml *imhtml)
@@ -4695,8 +4728,11 @@
 	}
 
 	if (icon) {
+		char *text = g_strdup(unescaped); /* Do not g_free 'text'.
+		                                     It will be destroyed when 'anchor' is destroyed. */
 		anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
-		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
+		g_object_set_data(G_OBJECT(anchor), "gtkimhtml_tiptext", text);
 		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);
 
 		/* This catches the expose events generated by animated
@@ -4714,9 +4750,11 @@
 		imhtml_smiley->anchors = g_slist_append(imhtml_smiley->anchors, anchor);
 		if (ebox) {
 			GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_MENU);
+			char *text = g_strdup(unescaped);
 			gtk_container_add(GTK_CONTAINER(ebox), img);
 			gtk_widget_show(img);
-			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
+			g_object_set_data(G_OBJECT(anchor), "gtkimhtml_tiptext", text);
 			gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox, anchor);
 		}
 	} else {
--- a/pidgin/gtkmain.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkmain.c	Mon Apr 28 00:01:07 2008 +0000
@@ -27,6 +27,7 @@
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
+#include "dbus-maybe.h"
 #include "debug.h"
 #include "eventloop.h"
 #include "ft.h"
@@ -300,7 +301,7 @@
 	purple_sound_set_ui_ops(pidgin_sound_get_ui_ops());
 	purple_connections_set_ui_ops(pidgin_connections_get_ui_ops());
 	purple_whiteboard_set_ui_ops(pidgin_whiteboard_get_ui_ops());
-#ifdef USE_SCREENSAVER
+#if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
 	purple_idle_set_ui_ops(pidgin_idle_get_ui_ops());
 #endif
 
@@ -786,6 +787,15 @@
 	}
 
 	if (opt_si && !purple_core_ensure_single_instance()) {
+#ifdef HAVE_DBUS
+		DBusConnection *conn = purple_dbus_get_connection();
+		DBusMessage *message = dbus_message_new_method_call(DBUS_SERVICE_PURPLE, DBUS_PATH_PURPLE,
+				DBUS_INTERFACE_PURPLE, "PurpleBlistSetVisible");
+		gboolean tr = TRUE;
+		dbus_message_append_args(message, DBUS_TYPE_UINT32, &tr, DBUS_TYPE_INVALID);
+		dbus_connection_send_with_reply_and_block(conn, message, -1, NULL);
+		dbus_message_unref(message);
+#endif
 		purple_debug_info("main", "exiting because another libpurple client is already running\n");
 		purple_core_quit();
 #ifdef HAVE_SIGNAL_H
--- a/pidgin/gtkmenutray.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkmenutray.c	Mon Apr 28 00:01:07 2008 +0000
@@ -134,8 +134,6 @@
 	if(!GTK_IS_WIDGET(menu_tray->tray))
 		menu_tray->tray = gtk_hbox_new(FALSE, 0);
 
-	menu_tray->tooltips = gtk_tooltips_new();
-
 #if GTK_CHECK_VERSION(2,2,0)
 	settings =
 		gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
@@ -235,7 +233,7 @@
 pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
 {
 	if (!menu_tray->tooltips)
-		return;
+		menu_tray->tooltips = gtk_tooltips_new();
 
 	/* Should we check whether widget is a child of menu_tray? */
 
--- a/pidgin/gtkplugin.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkplugin.c	Mon Apr 28 00:01:07 2008 +0000
@@ -42,7 +42,15 @@
 
 static GtkWidget *expander = NULL;
 static GtkWidget *plugin_dialog = NULL;
-static GtkWidget *plugin_details = NULL;
+
+static GtkLabel *plugin_name = NULL;
+static GtkTextBuffer *plugin_desc = NULL;
+static GtkLabel *plugin_error = NULL;
+static GtkLabel *plugin_author = NULL;
+static GtkLabel *plugin_website = NULL;
+static gchar *plugin_website_uri = NULL;
+static GtkLabel *plugin_filename = NULL;
+
 static GtkWidget *pref_button = NULL;
 static GHashTable *plugin_pref_dialogs = NULL;
 
@@ -301,9 +309,6 @@
 
 static void plugin_toggled_stage_two(PurplePlugin *plug, GtkTreeModel *model, GtkTreeIter *iter, gboolean unload)
 {
-	gchar *name = NULL;
-	gchar *description = NULL;
-
 	if (unload)
 	{
 		pidgin_set_cursor(plugin_dialog, GDK_WATCH);
@@ -337,30 +342,30 @@
 		 || (plug->info->prefs_info
 			&& plug->info->prefs_info->get_plugin_pref_frame)));
 
-	name = g_markup_escape_text(_(plug->info->name), -1);
-	description = g_markup_escape_text(_(plug->info->description), -1);
+	if (plug->error != NULL)
+	{
+		gchar *name = g_markup_escape_text(_(plug->info->name), -1);
 
-	if (plug->error != NULL) {
 		gchar *error = g_markup_escape_text(plug->error, -1);
-		gchar *desc;
-		gchar *text = g_strdup_printf(
-				   "<span size=\"larger\">%s %s</span>\n\n"
-				   "<span weight=\"bold\" color=\"red\">%s</span>\n\n"
-				   "%s",
-				   name, plug->info->version, error, description);
-		desc = g_strdup_printf("<b>%s</b> %s\n<span weight=\"bold\" color=\"red\"%s</span>",
-			       plug->info->name, plug->info->version, error);
+		gchar *text;
+
+		text = g_strdup_printf(
+			"<b>%s</b> %s\n<span weight=\"bold\" color=\"red\"%s</span>",
+			plug->info->name, plug->info->version, error);
 		gtk_list_store_set(GTK_LIST_STORE (model), iter,
-				   1, desc,
+				   1, text,
 				   -1);
-		g_free(desc);
+		g_free(text);
+
+		text = g_strdup_printf(
+			"<span weight=\"bold\" color=\"red\">%s</span>",
+			error);
+		gtk_label_set_markup(plugin_error, text);
+		g_free(text);
+
 		g_free(error);
-		gtk_label_set_markup(GTK_LABEL(plugin_details), text);
-		g_free(text);
+		g_free(name);
 	}
-	g_free(name);
-	g_free(description);
-
 
 	gtk_list_store_set(GTK_LIST_STORE (model), iter,
 	                   0, purple_plugin_is_loaded(plug),
@@ -387,15 +392,13 @@
 
 static void prefs_plugin_sel (GtkTreeSelection *sel, GtkTreeModel *model)
 {
-	gchar *buf, *pname, *pdesc, *pauth, *pweb;
+	gchar *buf, *tmp, *name, *version;
 	GtkTreeIter  iter;
 	GValue val;
 	PurplePlugin *plug;
 
 	if (!gtk_tree_selection_get_selected (sel, &model, &iter))
 	{
-		/* Clear the old plugin details */
-		gtk_label_set_markup(GTK_LABEL(plugin_details), "");
 		gtk_widget_set_sensitive(pref_button, FALSE);
 
 		/* Collapse and disable the expander widget */
@@ -411,32 +414,51 @@
 	gtk_tree_model_get_value (model, &iter, 2, &val);
 	plug = g_value_get_pointer(&val);
 
-	pname = g_markup_escape_text(_(plug->info->name), -1);
-	pdesc = (plug->info->description) ?
-			g_markup_escape_text(_(plug->info->description), -1) : NULL;
-	pauth = (plug->info->author) ?
-			g_markup_escape_text(_(plug->info->author), -1) : NULL;
-	pweb = (plug->info->homepage) ?
-		   g_markup_escape_text(_(plug->info->homepage), -1) : NULL;
+	name = g_markup_escape_text(_(plug->info->name), -1);
+	version = g_markup_escape_text(plug->info->version, -1);
 	buf = g_strdup_printf(
-		   _("%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"),
-		   pdesc ? pdesc : "", pdesc ? "\n\n" : "",
-		   pauth ? pauth : "", pweb ? pweb : "", plug->path);
+		"<span size=\"larger\" weight=\"bold\">%s</span> "
+		"<span size=\"smaller\">%s</span>",
+		name, version);
+	gtk_label_set_markup(plugin_name, buf);
+	g_free(buf);
+
+	gtk_text_buffer_set_text(plugin_desc, plug->info->description, -1);
+	gtk_label_set_text(plugin_author, plug->info->author);
+	gtk_label_set_text(plugin_filename, plug->path);
 
-	if (plug->error != NULL)
+	g_free(plugin_website_uri);
+	plugin_website_uri = g_strdup(plug->info->homepage);
+	if (plugin_website_uri)
+	{
+		tmp = g_markup_escape_text(plugin_website_uri, -1);
+		buf = g_strdup_printf("<span underline=\"single\" "
+			"foreground=\"blue\">%s</span>", tmp);
+		gtk_label_set_markup(plugin_website, buf);
+		g_free(tmp);
+		g_free(buf);
+	}
+	else
 	{
-		char *tmp = g_strdup_printf(
-			_("%s\n"
-			  "<span foreground=\"#ff0000\" weight=\"bold\">"
+		gtk_label_set_text(plugin_website, NULL);
+	}
+
+	if (plug->error == NULL)
+	{
+		gtk_label_set_text(plugin_error, NULL);
+	}
+	else
+	{
+		tmp = g_markup_escape_text(plug->error, -1);
+		buf = g_strdup_printf(
+			_("<span foreground=\"red\" weight=\"bold\">"
 			  "Error: %s\n"
 			  "Check the plugin website for an update."
 			  "</span>"),
-			buf, plug->error);
+			tmp);
+		gtk_label_set_markup(plugin_error, buf);
 		g_free(buf);
-		buf = tmp;
+		g_free(tmp);
 	}
 
 	gtk_widget_set_sensitive(pref_button,
@@ -446,18 +468,10 @@
 		 || (plug->info->prefs_info
 			&& plug->info->prefs_info->get_plugin_pref_frame)));
 
-	gtk_label_set_markup(GTK_LABEL(plugin_details), buf);
-
 	/* Make sure the selected plugin is still visible */
 	g_idle_add(ensure_plugin_visible, sel);
 
-
 	g_value_unset(&val);
-	g_free(buf);
-	g_free(pname);
-	g_free(pdesc);
-	g_free(pauth);
-	g_free(pweb);
 }
 
 static void plugin_dialog_response_cb(GtkWidget *d, int response, GtkTreeSelection *sel)
@@ -588,6 +602,102 @@
 	return TRUE;
 }
 
+static gboolean
+website_button_motion_cb(GtkWidget *button, GdkEventCrossing *event,
+                          gpointer unused)
+{
+	if (plugin_website_uri) {
+		pidgin_set_cursor(button, GDK_HAND2);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+website_button_clicked_cb(GtkButton *button, GdkEventButton *event,
+                          gpointer unused)
+{
+	if (plugin_website_uri) {
+		purple_notify_uri(NULL, plugin_website_uri);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static GtkWidget *
+create_details()
+{
+	GtkBox *vbox = GTK_BOX(gtk_vbox_new(FALSE, 3));
+	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+	GtkWidget *label, *view, *website_button;
+
+	plugin_name = GTK_LABEL(gtk_label_new(NULL));
+	gtk_misc_set_alignment(GTK_MISC(plugin_name), 0, 0);
+	gtk_label_set_line_wrap(plugin_name, FALSE);
+	gtk_label_set_selectable(plugin_name, TRUE);
+	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_name), FALSE, FALSE, 0);
+
+	view = gtk_text_view_new();
+	plugin_desc = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+	g_object_set(view, "wrap-mode", GTK_WRAP_WORD,
+	                   "editable",  FALSE,
+	                   "left-margin",  PIDGIN_HIG_CAT_SPACE,
+	                   "right-margin", PIDGIN_HIG_CAT_SPACE,
+	                   NULL);
+	gtk_box_pack_start(vbox, view, TRUE, TRUE, 0);
+
+	plugin_error = GTK_LABEL(gtk_label_new(NULL));
+	gtk_misc_set_alignment(GTK_MISC(plugin_error), 0, 0);
+	gtk_label_set_line_wrap(plugin_error, FALSE);
+	gtk_label_set_selectable(plugin_error, TRUE);
+	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_error), FALSE, FALSE, 0);
+
+	plugin_author = GTK_LABEL(gtk_label_new(NULL));
+	gtk_label_set_line_wrap(plugin_author, FALSE);
+	gtk_misc_set_alignment(GTK_MISC(plugin_author), 0, 0);
+	gtk_label_set_selectable(plugin_author, TRUE);
+	pidgin_add_widget_to_vbox(vbox, "", sg,
+		GTK_WIDGET(plugin_author), TRUE, &label);
+	gtk_label_set_markup(GTK_LABEL(label), _("<b>Written by:</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+
+	website_button = gtk_event_box_new();
+#if GTK_CHECK_VERSION(2,4,0)
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(website_button), FALSE);
+#endif
+
+	plugin_website = GTK_LABEL(gtk_label_new(NULL));
+#if GTK_CHECK_VERSION(2,6,0)
+	g_object_set(G_OBJECT(plugin_website),
+		"ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
+#endif
+	gtk_misc_set_alignment(GTK_MISC(plugin_website), 0, 0);
+	gtk_container_add(GTK_CONTAINER(website_button),
+		GTK_WIDGET(plugin_website));
+	g_signal_connect(website_button, "button-release-event",
+		G_CALLBACK(website_button_clicked_cb), NULL);
+	g_signal_connect(website_button, "enter-notify-event",
+		G_CALLBACK(website_button_motion_cb), NULL);
+	g_signal_connect(website_button, "leave-notify-event",
+		G_CALLBACK(pidgin_clear_cursor), NULL);
+
+	pidgin_add_widget_to_vbox(vbox, "", sg, website_button, TRUE, &label);
+	gtk_label_set_markup(GTK_LABEL(label), _("<b>Web site:</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+
+	plugin_filename = GTK_LABEL(gtk_label_new(NULL));
+	gtk_label_set_line_wrap(plugin_filename, FALSE);
+	gtk_misc_set_alignment(GTK_MISC(plugin_filename), 0, 0);
+	gtk_label_set_selectable(plugin_filename, TRUE);
+	pidgin_add_widget_to_vbox(vbox, "", sg,
+		GTK_WIDGET(plugin_filename), TRUE, &label);
+	gtk_label_set_markup(GTK_LABEL(label), _("<b>Filename:</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+
+	return GTK_WIDGET(vbox);
+}
+
+
 void pidgin_plugin_dialog_show()
 {
 	GtkWidget *sw;
@@ -674,16 +784,17 @@
 			pidgin_plugins_create_tooltip,
 			pidgin_plugins_paint_tooltip);
 
+
 	expander = gtk_expander_new(_("<b>Plugin Details</b>"));
 	gtk_expander_set_use_markup(GTK_EXPANDER(expander), TRUE);
-	plugin_details = gtk_label_new(NULL);
-	gtk_label_set_line_wrap(GTK_LABEL(plugin_details), TRUE);
-	gtk_container_add(GTK_CONTAINER(expander), plugin_details);
 	gtk_widget_set_sensitive(expander, FALSE);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(plugin_dialog)->vbox), expander, FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(expander), create_details());
+	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(plugin_dialog)->vbox), expander,
+		FALSE, FALSE, 0);
+
 
 	g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
 	g_signal_connect(G_OBJECT(plugin_dialog), "response", G_CALLBACK(plugin_dialog_response_cb), sel);
-	gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 430);
+	gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 530);
 	gtk_widget_show_all(plugin_dialog);
 }
--- a/pidgin/gtksourceundomanager.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtksourceundomanager.c	Mon Apr 28 00:01:07 2008 +0000
@@ -41,10 +41,12 @@
 typedef struct _GtkSourceUndoAction  			GtkSourceUndoAction;
 typedef struct _GtkSourceUndoInsertAction		GtkSourceUndoInsertAction;
 typedef struct _GtkSourceUndoDeleteAction		GtkSourceUndoDeleteAction;
+typedef struct _GtkSourceUndoInsertAnchorAction GtkSourceUndoInsertAnchorAction;
 
 typedef enum {
 	GTK_SOURCE_UNDO_ACTION_INSERT,
-	GTK_SOURCE_UNDO_ACTION_DELETE
+	GTK_SOURCE_UNDO_ACTION_DELETE,
+	GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR,
 } GtkSourceUndoActionType;
 
 /* 
@@ -68,6 +70,12 @@
 	gboolean forward;
 };
 
+struct _GtkSourceUndoInsertAnchorAction
+{
+	gint pos;
+	GtkTextChildAnchor *anchor;
+};
+
 struct _GtkSourceUndoAction
 {
 	GtkSourceUndoActionType action_type;
@@ -75,6 +83,7 @@
 	union {
 		GtkSourceUndoInsertAction  insert;
 		GtkSourceUndoDeleteAction  delete;
+		GtkSourceUndoInsertAnchorAction insert_anchor;
 	} action;
 
 	gint order_in_group;
@@ -139,6 +148,10 @@
 		                             		 	 const 	gchar 			*text, 
 							 	 gint 				 length, 
 							 	 GtkSourceUndoManager 		*um);
+static void gtk_source_undo_manager_insert_anchor_handler (GtkTextBuffer *buffer,
+			                   GtkTextIter            *pos,
+			                   GtkTextChildAnchor     *anchor,
+			                   GtkSourceUndoManager   *um);
 static void gtk_source_undo_manager_delete_range_handler 	(GtkTextBuffer 			*buffer, 
 							 	 GtkTextIter 			*start,
                         		      		 	 GtkTextIter 			*end,
@@ -275,6 +288,10 @@
 			  um);
 	
 	g_signal_handlers_disconnect_by_func (G_OBJECT (um->priv->document),
+			  G_CALLBACK (gtk_source_undo_manager_insert_anchor_handler), 
+			  um);
+	
+	g_signal_handlers_disconnect_by_func (G_OBJECT (um->priv->document),
 			  G_CALLBACK (gtk_source_undo_manager_begin_user_action_handler), 
 			  um);
 
@@ -297,6 +314,10 @@
 			  G_CALLBACK (gtk_source_undo_manager_insert_text_handler), 
 			  um);
 
+	g_signal_connect (G_OBJECT (buffer), "insert_child_anchor",
+			  G_CALLBACK (gtk_source_undo_manager_insert_anchor_handler), 
+			  um);
+
 	g_signal_connect (G_OBJECT (buffer), "delete_range",
 			  G_CALLBACK (gtk_source_undo_manager_delete_range_handler), 
 			  um);
@@ -403,6 +424,15 @@
 }
 
 static void 
+insert_anchor (GtkTextBuffer *buffer, gint pos, GtkTextChildAnchor *anchor)
+{
+	GtkTextIter iter;
+	
+	gtk_text_buffer_get_iter_at_offset (buffer, &iter, pos);
+	gtk_text_buffer_insert_child_anchor (buffer, &iter, anchor);
+}
+
+static void 
 delete_text (GtkTextBuffer *buffer, gint start, gint end)
 {
 	GtkTextIter start_iter;
@@ -497,6 +527,13 @@
 					undo_action->action.insert.pos);
 				break;
 
+			case GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR:
+				delete_text (
+					um->priv->document,
+					undo_action->action.insert_anchor.pos,
+					undo_action->action.insert_anchor.pos + 1);
+				undo_action->action.insert_anchor.anchor->segment = NULL; /* XXX: This may be a bug in GTK+ */
+				break;
 			default:
 				/* Unknown action type. */
 				g_return_if_reached ();
@@ -588,6 +625,17 @@
 
 				break;
 
+			case GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR:
+				set_cursor (
+					um->priv->document,
+					undo_action->action.insert_anchor.pos);
+
+				insert_anchor (
+					um->priv->document,
+					undo_action->action.insert_anchor.pos,
+					undo_action->action.insert_anchor.anchor);
+				break;
+
 			default:
 				/* Unknown action type */
 				++um->priv->next_redo;
@@ -633,6 +681,8 @@
 		g_free (action->action.insert.text);
 	else if (action->action_type == GTK_SOURCE_UNDO_ACTION_DELETE)
 		g_free (action->action.delete.text);
+	else if (action->action_type == GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR)
+		g_object_unref(action->action.insert_anchor.anchor);
 	else
 		g_return_if_reached ();
 
@@ -695,6 +745,27 @@
 	gtk_source_undo_manager_add_action (um, &undo_action);
 }
 
+static void gtk_source_undo_manager_insert_anchor_handler (GtkTextBuffer *buffer,
+			                   GtkTextIter            *pos,
+			                   GtkTextChildAnchor     *anchor,
+			                   GtkSourceUndoManager   *um)
+{
+	GtkSourceUndoAction undo_action;
+
+	if (um->priv->running_not_undoable_actions > 0)
+		return;
+
+	undo_action.action_type = GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR;
+
+	undo_action.action.insert_anchor.pos    = gtk_text_iter_get_offset (pos);
+	undo_action.action.insert_anchor.anchor = g_object_ref (anchor);
+
+	undo_action.mergeable = FALSE;
+	undo_action.modified = FALSE;
+
+	gtk_source_undo_manager_add_action (um, &undo_action);
+}
+
 static void 
 gtk_source_undo_manager_delete_range_handler (GtkTextBuffer 		*buffer, 
 					      GtkTextIter 		*start,
@@ -775,6 +846,10 @@
 			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 if (action->action_type == GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR)
+		{
+			/* Nothing needs to be done */
+		}
 		else
 		{
 			g_free (action);
@@ -998,6 +1073,10 @@
 		last_action->action.insert.chars += undo_action->action.insert.chars;
 
 	}
+	else if (undo_action->action_type == GTK_SOURCE_UNDO_ACTION_INSERT_ANCHOR)
+	{
+		/* Nothing needs to be done */
+	}
 	else
 		/* Unknown action inside undo merge encountered */
 		g_return_val_if_reached (TRUE);
--- a/pidgin/gtkstatusbox.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkstatusbox.c	Mon Apr 28 00:01:07 2008 +0000
@@ -74,6 +74,7 @@
 static void remove_typing_cb(PidginStatusBox *box);
 static void update_size (PidginStatusBox *box);
 static gint get_statusbox_index(PidginStatusBox *box, PurpleSavedStatus *saved_status);
+static PurpleAccount* check_active_accounts_for_identical_statuses(void);
 
 static void pidgin_status_box_pulse_typing(PidginStatusBox *status_box);
 static void pidgin_status_box_refresh(PidginStatusBox *status_box);
@@ -497,6 +498,10 @@
 		break;
 	case PROP_ACCOUNT:
 		statusbox->account = g_value_get_pointer(value);
+		if (statusbox->account)
+			statusbox->token_status_account = NULL;
+		else
+			statusbox->token_status_account = check_active_accounts_for_identical_statuses();
 
 		pidgin_status_box_regenerate(statusbox);
 
@@ -628,7 +633,7 @@
 	GdkPixbuf *pixbuf, *emblem = NULL;
 	GtkTreePath *path;
 	gboolean account_status = FALSE;
-	PurpleAccount *acct = (status_box->token_status_account) ? status_box->token_status_account : status_box->account;
+	PurpleAccount *acct = (status_box->account) ? status_box->account : status_box->token_status_account;
 
 	icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
 
@@ -1135,7 +1140,7 @@
 				                  GTK_DIR_TAB_BACKWARD: GTK_DIR_TAB_FORWARD);
 		return TRUE;
 	}
-	if (!status_box->typing != 0)
+	if (status_box->typing == 0)
 		return FALSE;
 
 	/* Reset the status if Escape was pressed */
@@ -1228,9 +1233,13 @@
 								     icon_size, "PidginStatusBox");
 }
 
-static void account_enabled_cb(PurpleAccount *acct, PidginStatusBox *status_box) {
+static void account_enabled_cb(PurpleAccount *acct, PidginStatusBox *status_box)
+{
 	PurpleAccount *initial_token_acct = status_box->token_status_account;
 
+	if (status_box->account)
+		return;
+
 	status_box->token_status_account = check_active_accounts_for_identical_statuses();
 
 	/* Regenerate the list if it has changed */
@@ -1686,6 +1695,17 @@
 }
 
 static void
+imhtml_cursor_moved_cb(gpointer data, GtkMovementStep step, gint count, gboolean extend,
+		GtkWidget *widget)
+{
+	/* Restart the typing timeout if arrow keys are pressed while editing the message */
+	PidginStatusBox *status_box = data;
+	if (status_box->typing == 0)
+		return;
+	imhtml_changed_cb(NULL, status_box);
+}
+
+static void
 pidgin_status_box_init (PidginStatusBox *status_box)
 {
 	GtkCellRenderer *text_rend;
@@ -1714,6 +1734,8 @@
 	gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store));
 	gtk_list_store_append(status_box->store, &(status_box->iter));
 
+	atk_object_set_name(gtk_widget_get_accessible(status_box->toggle_button), _("Status Selector"));
+
 	gtk_container_add(GTK_CONTAINER(status_box->toggle_button), status_box->hbox);
 	gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->cell_view, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(status_box->hbox), status_box->vsep, FALSE, FALSE, 0);
@@ -1825,6 +1847,8 @@
 	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",
 			 G_CALLBACK(imhtml_format_changed_cb), status_box);
+	g_signal_connect_swapped(G_OBJECT(status_box->imhtml), "move_cursor",
+			 G_CALLBACK(imhtml_cursor_moved_cb), status_box);
 	g_signal_connect(G_OBJECT(status_box->imhtml), "key_press_event",
 			 G_CALLBACK(imhtml_remove_focus), status_box);
 	g_signal_connect_swapped(G_OBJECT(status_box->imhtml), "message_send", G_CALLBACK(remove_typing_cb), status_box);
--- a/pidgin/gtkutils.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/gtkutils.c	Mon Apr 28 00:01:07 2008 +0000
@@ -2262,7 +2262,7 @@
 	if (widget->window == NULL)
 		return;
 
-	cursor = gdk_cursor_new(GDK_WATCH);
+	cursor = gdk_cursor_new(cursor_type);
 	gdk_window_set_cursor(widget->window, cursor);
 	gdk_cursor_unref(cursor);
 
--- a/pidgin/minidialog.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/minidialog.c	Mon Apr 28 00:01:07 2008 +0000
@@ -406,6 +406,7 @@
 	priv->title = GTK_LABEL(gtk_label_new(NULL));
 	gtk_widget_set_size_request(GTK_WIDGET(priv->title), label_width, -1);
 	gtk_label_set_line_wrap(priv->title, TRUE);
+	gtk_label_set_selectable(priv->title, TRUE);
 	gtk_misc_set_alignment(GTK_MISC(priv->title), 0, 0);
 
 	gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->icon), FALSE, FALSE, 0);
@@ -415,6 +416,7 @@
 	gtk_widget_set_size_request(GTK_WIDGET(priv->desc), label_width, -1);
 	gtk_label_set_line_wrap(priv->desc, TRUE);
 	gtk_misc_set_alignment(GTK_MISC(priv->desc), 0, 0);
+	gtk_label_set_selectable(priv->desc, TRUE);
 	/* make calling show_all() on the minidialog not affect desc even though
 	 * it's packed inside it.
 	 */
--- a/pidgin/pixmaps/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Mon Apr 28 00:01:07 2008 +0000
@@ -538,7 +538,9 @@
 		status/48/person.png
 
 STATUS_48_RTL = \
-		status/48/rtl/extended-away.png
+		status/48/rtl/extended-away.png \
+		status/48/rtl/login.png \
+		status/48/rtl/logout.png
 
 TOOLBAR_11 = \
 		toolbar/11/message-new.png
--- a/pidgin/pixmaps/Makefile.mingw	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Mon Apr 28 00:01:07 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir := $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
 	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
@@ -34,9 +34,14 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
-clean:
+clean: ./Makefile.am.mingw
 	if test '$(SUBDIRS)'; then \
 		list='$(SUBDIRS)'; for subdir in $$list; do \
 		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\
 		done; \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Mon Apr 28 00:01:07 2008 +0000
@@ -9,10 +9,15 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
-install:
+install: ./Makefile.am.mingw
 	if test '$(qqbuddyiconspix_DATA)'; then \
 	  mkdir -p $(qqbuddyiconspixdir); \
 	  cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
 	fi;
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/emotes/default/24/Makefile.mingw	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.mingw	Mon Apr 28 00:01:07 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -20,3 +20,8 @@
 
 clean:
 	rm -f theme
+
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
--- a/pidgin/pixmaps/emotes/default/24/scalable/shock.svg	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/scalable/shock.svg	Mon Apr 28 00:01:07 2008 +0000
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -13,16 +13,23 @@
    height="24"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46"
    version="1.0"
    sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="new-style-shock.svg"
+   sodipodi:docname="shock.svg"
    inkscape:export-filename="/home/hbons/Desktop/newstyle.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 12 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="24 : 12 : 1"
+       inkscape:persp3d-origin="12 : 8 : 1"
+       id="perspective29" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3263">
@@ -88,16 +95,26 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="22.4"
-     inkscape:cx="26.558313"
-     inkscape:cy="10.870659"
+     inkscape:cx="13.477956"
+     inkscape:cy="11.67423"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      fill="#fce94f"
      inkscape:window-width="1440"
-     inkscape:window-height="845"
+     inkscape:window-height="846"
      inkscape:window-x="0"
-     inkscape:window-y="0" />
+     inkscape:window-y="25"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     objecttolerance="9"
+     gridtolerance="9">
+    <inkscape:grid
+       type="xygrid"
+       visible="true"
+       enabled="true"
+       id="grid2402" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -155,7 +172,7 @@
        transform="matrix(0.852176,0,0,0.852216,1.93909,2.639626)" />
     <path
        style="fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.499998,9.5 C 11.499998,11.156 10.156,12.5 8.4999995,12.5 C 6.844,12.5 5.5000002,11.156 5.5000002,9.5 C 5.5000002,7.844 6.844,6.5 8.4999995,6.5 C 10.156,6.5 11.499998,7.844 11.499998,9.5 z "
+       d="M 11.499998,9.0000003 C 11.499998,10.932 10.156,12.5 8.4999995,12.5 C 6.844,12.5 5.5000002,10.932 5.5000002,9.0000003 C 5.5000002,7.0680003 6.844,5.5000002 8.4999995,5.5000002 C 10.156,5.5000002 11.499998,7.0680003 11.499998,9.0000003 z"
        id="path3154" />
     <path
        sodipodi:type="arc"
@@ -169,14 +186,14 @@
        transform="matrix(0.9747196,0,0,0.7726436,0.5384595,3.0419202)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.47042996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#fea523;stroke-width:0.43553349;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path3152"
        sodipodi:cx="9.7069349"
        sodipodi:cy="9.6526775"
        sodipodi:rx="1.0259361"
        sodipodi:ry="1.9413869"
-       d="M 10.732871 9.6526775 A 1.0259361 1.9413869 0 1 1  8.6809988,9.6526775 A 1.0259361 1.9413869 0 1 1  10.732871 9.6526775 z"
-       transform="matrix(2.9241589,0,0,1.5452871,-12.884621,-5.4161575)" />
+       d="M 10.732871,9.6526775 A 1.0259361,1.9413869 0 1 1 8.6809988,9.6526775 A 1.0259361,1.9413869 0 1 1 10.732871,9.6526775 z"
+       transform="matrix(2.9241589,0,0,1.802835,-12.884621,-8.4021847)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.98640186;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -196,7 +213,7 @@
        sodipodi:rx="1.2276785"
        sodipodi:ry="1.7410715"
        d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
-       transform="matrix(1.8690368,0.3494647,-0.353133,0.9196421,3.0149257,-5.2342213)"
+       transform="matrix(1.8690368,0.3494647,-0.353133,0.9196421,3.0149257,-6.2342213)"
        sodipodi:start="3.5782199"
        sodipodi:end="5.6135639"
        sodipodi:open="true" />
@@ -209,7 +226,7 @@
        sodipodi:rx="1.2276785"
        sodipodi:ry="1.7410715"
        d="M 7.2133909,8.4869402 A 1.2276785,1.7410715 0 0 1 9.288462,8.1425499"
-       transform="matrix(-1.8690368,0.3494647,0.353133,0.9196421,20.985074,-5.2342213)"
+       transform="matrix(-1.8690368,0.3494647,0.353133,0.9196421,20.985074,-6.2342213)"
        sodipodi:start="3.5782199"
        sodipodi:end="5.6135639"
        sodipodi:open="true" />
@@ -221,17 +238,17 @@
        sodipodi:cy="15.741072"
        sodipodi:rx="2.0982144"
        sodipodi:ry="1.7857143"
-       d="M 13.928572 15.741072 A 2.0982144 1.7857143 0 1 1  9.7321432,15.741072 A 2.0982144 1.7857143 0 1 1  13.928572 15.741072 z"
-       transform="matrix(1.4297873,0,0,1.3999999,-4.9148951,-5.5374984)" />
+       d="M 13.928572,15.741072 A 2.0982144,1.7857143 0 1 1 9.7321432,15.741072 A 2.0982144,1.7857143 0 1 1 13.928572,15.741072 z"
+       transform="matrix(1.4297873,0,0,1.3999998,-4.9148951,-5.5374976)" />
     <path
        sodipodi:type="arc"
-       style="opacity:1;fill:url(#linearGradient3269);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient3269);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path3261"
        sodipodi:cx="11.830358"
        sodipodi:cy="15.741072"
        sodipodi:rx="2.0982144"
        sodipodi:ry="1.7857143"
-       d="M 13.928572 15.741072 A 2.0982144 1.7857143 0 1 1  9.7321432,15.741072 A 2.0982144 1.7857143 0 1 1  13.928572 15.741072 z"
-       transform="matrix(1.4297873,0,0,1.3999999,-4.9148951,-5.5374984)" />
+       d="M 13.928572,15.741072 A 2.0982144,1.7857143 0 1 1 9.7321432,15.741072 A 2.0982144,1.7857143 0 1 1 13.928572,15.741072 z"
+       transform="matrix(1.4297873,0,0,1.3999998,-4.9148951,-5.5374976)" />
   </g>
 </svg>
Binary file pidgin/pixmaps/emotes/default/24/shock.png has changed
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw	Mon Apr 28 00:01:07 2008 +0000
@@ -8,11 +8,11 @@
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
 datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
+-include ./Makefile.am.mingw
 
 .PHONY: install clean
 
-install: theme
+install: ./Makefile.am.mingw theme
 	if test '$(pidginsmileypix_DATA)'; then \
 	  mkdir -p $(pidginsmileypixdir); \
 	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
@@ -21,3 +21,7 @@
 clean:
 	rm -f theme
 
+./Makefile.am.mingw: ./Makefile.am
+	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+        include $@
+
Binary file pidgin/pixmaps/logo.png has changed
Binary file pidgin/pixmaps/status/11/away.png has changed
Binary file pidgin/pixmaps/status/48/available.png has changed
Binary file pidgin/pixmaps/status/48/away.png has changed
Binary file pidgin/pixmaps/status/48/busy.png has changed
Binary file pidgin/pixmaps/status/48/chat.png has changed
Binary file pidgin/pixmaps/status/48/extended-away.png has changed
Binary file pidgin/pixmaps/status/48/offline.png has changed
Binary file pidgin/pixmaps/status/48/rtl/login.png has changed
Binary file pidgin/pixmaps/status/48/rtl/logout.png has changed
--- a/pidgin/plugins/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/Makefile.am	Mon Apr 28 00:01:07 2008 +0000
@@ -41,6 +41,7 @@
 notify_la_LDFLAGS           = -module -avoid-version
 pidginrc_la_LDFLAGS         = -module -avoid-version
 relnot_la_LDFLAGS           = -module -avoid-version
+sendbutton_la_LDFLAGS       = -module -avoid-version
 spellchk_la_LDFLAGS         = -module -avoid-version
 timestamp_la_LDFLAGS        = -module -avoid-version
 timestamp_format_la_LDFLAGS = -module -avoid-version
@@ -58,6 +59,7 @@
 	notify.la           \
 	pidginrc.la         \
 	relnot.la           \
+	sendbutton.la       \
 	spellchk.la         \
 	timestamp.la        \
 	timestamp_format.la \
@@ -78,6 +80,7 @@
 notify_la_SOURCES           = notify.c
 pidginrc_la_SOURCES         = pidginrc.c
 relnot_la_SOURCES           = relnot.c
+sendbutton_la_SOURCES       = sendbutton.c
 spellchk_la_SOURCES         = spellchk.c
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
@@ -94,6 +97,7 @@
 notify_la_LIBADD            = $(GTK_LIBS)
 pidginrc_la_LIBADD          = $(GTK_LIBS)
 relnot_la_LIBADD            = $(GLIB_LIBS)
+sendbutton_la_LIBADD        = $(GTK_LIBS)
 spellchk_la_LIBADD          = $(GTK_LIBS)
 timestamp_la_LIBADD         = $(GTK_LIBS)
 timestamp_format_la_LIBADD  = $(GTK_LIBS)
--- a/pidgin/plugins/cap/cap.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/cap/cap.c	Mon Apr 28 00:01:07 2008 +0000
@@ -894,7 +894,7 @@
 	N_("Contact Availability Prediction"),				/**< name		*/
 	DISPLAY_VERSION,									/**< version		*/
 	N_("Contact Availability Prediction plugin."),	/**  summary		*/
-	N_("The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."),
+	N_("Displays statistical information about your buddies' availability"),
 	/**  description	*/
 	"Geoffrey Foster <geoffrey.foster@gmail.com>",	/**< author		*/
 	PURPLE_WEBSITE,									/**< homepage		*/
--- a/pidgin/plugins/gestures/gestures.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Mon Apr 28 00:01:07 2008 +0000
@@ -297,12 +297,12 @@
 	                                                  /**  summary        */
 	N_("Provides support for mouse gestures"),
 	                                                  /**  description    */
-	N_("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 "
+	N_("Allows support for mouse gestures in conversation windows. "
+	   "Drag the middle mouse button to perform certain actions:\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 "
+	   " • Drag up and then to the right to switch to the next "
 	   "conversation."),
 	"Christian Hammond <chipx86@gnupdate.org>",       /**< author         */
 	PURPLE_WEBSITE,                                     /**< homepage       */
--- a/pidgin/plugins/markerline.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/markerline.c	Mon Apr 28 00:01:07 2008 +0000
@@ -216,6 +216,32 @@
 	attach_to_pidgin_window(win, NULL);
 }
 
+static void
+jump_to_markerline(PurpleConversation *conv, gpointer null)
+{
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+	int offset;
+	GtkTextIter iter;
+
+	if (!gtkconv)
+		return;
+
+	offset = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(gtkconv->imhtml), "markerline"));
+	gtk_text_buffer_get_iter_at_offset(GTK_IMHTML(gtkconv->imhtml)->text_buffer, &iter, offset);
+	gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(gtkconv->imhtml), &iter, 0, TRUE, 0, 0);
+}
+
+static void
+conv_menu_cb(PurpleConversation *conv, GList **list)
+{
+	PurpleConversationType type = purple_conversation_get_type(conv);
+	gboolean enabled = ((type == PURPLE_CONV_TYPE_IM && purple_prefs_get_bool(PREF_IMS)) ||
+		(type == PURPLE_CONV_TYPE_CHAT && purple_prefs_get_bool(PREF_CHATS)));
+	PurpleMenuAction *action = purple_menu_action_new(_("Jump to markerline"),
+			enabled ? PURPLE_CALLBACK(jump_to_markerline) : NULL, NULL, NULL);
+	*list = g_list_append(*list, action);
+}
+
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
@@ -224,6 +250,8 @@
 	purple_signal_connect(purple_conversations_get_handle(), "conversation-created",
 						plugin, PURPLE_CALLBACK(conv_created), NULL);
 
+	purple_signal_connect(purple_conversations_get_handle(), "conversation-extended-menu",
+						plugin, PURPLE_CALLBACK(conv_menu_cb), NULL);
 	return TRUE;
 }
 
--- a/pidgin/plugins/notify.c	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/notify.c	Mon Apr 28 00:01:07 2008 +0000
@@ -909,7 +909,7 @@
 	                                                  /**  description    */
 	N_("Provides a variety of ways of notifying you of unread messages."),
 	                                                  /**< author         */
-	"Etan Reisner <deryni@eden.rutgers.edu>\n\t\t\tBrian Tarricone <bjt23@cornell.edu>",
+	"Etan Reisner <deryni@eden.rutgers.edu>,\nBrian Tarricone <bjt23@cornell.edu>",
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
 	plugin_load,                                      /**< load           */
--- a/pidgin/plugins/perl/Makefile.am	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/plugins/perl/Makefile.am	Mon Apr 28 00:01:07 2008 +0000
@@ -39,7 +39,9 @@
 common/Makefile: common/Makefile.PL
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ../${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/plugins/sendbutton.c	Mon Apr 28 00:01:07 2008 +0000
@@ -0,0 +1,166 @@
+/*
+ * SendButton - Add a Send button to the conversation window entry area.
+ * Copyright (C) 2008 Etan Reisner <deryni@pidgin.im>
+ *
+ * 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.
+ *
+ * You 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "internal.h"
+
+#include "version.h"
+
+#include "pidgin.h"
+
+#include "gtkconv.h"
+#include "gtkplugin.h"
+
+static void
+send_button_cb(GtkButton *button, PidginConversation *gtkconv)
+{
+	g_signal_emit_by_name(gtkconv->entry, "message_send");
+}
+
+static void
+create_send_button_pidgin(PidginConversation *gtkconv)
+{
+	GtkWidget *send_button;
+
+	send_button = gtk_button_new_with_mnemonic(_("_Send"));
+	g_signal_connect(G_OBJECT(send_button), "clicked",
+	                 G_CALLBACK(send_button_cb), gtkconv);
+	gtk_box_pack_end(GTK_BOX(gtkconv->lower_hbox), send_button, FALSE,
+	                 FALSE, 0);
+	gtk_widget_show(send_button);
+
+	g_object_set_data(G_OBJECT(gtkconv->lower_hbox), "send_button",
+	                  send_button);
+}
+
+static void
+remove_send_button_pidgin(PidginConversation *gtkconv)
+{
+	GtkWidget *send_button = NULL;
+
+	send_button = g_object_get_data(G_OBJECT(gtkconv->lower_hbox),
+	                                "send_button");
+	if (send_button != NULL) {
+		gtk_widget_destroy(send_button);
+	}
+}
+
+static void
+conversation_displayed_cb(PidginConversation *gtkconv)
+{
+	GtkWidget *send_button = NULL;
+
+	send_button = g_object_get_data(G_OBJECT(gtkconv->lower_hbox),
+	                                "send_button");
+	if (send_button == NULL) {
+		create_send_button_pidgin(gtkconv);
+	}
+}
+
+static gboolean
+plugin_load(PurplePlugin *plugin)
+{
+	GList *convs = purple_get_conversations();
+	void *gtk_conv_handle = pidgin_conversations_get_handle();
+
+	purple_signal_connect(gtk_conv_handle, "conversation-displayed", plugin,
+	                      PURPLE_CALLBACK(conversation_displayed_cb), NULL);
+	/*
+	purple_signal_connect(gtk_conv_handle, "conversation-hiding", plugin,
+	                      PURPLE_CALLBACK(conversation_hiding_cb), NULL);
+	 */
+
+	while (convs) {
+		
+		PurpleConversation *conv = (PurpleConversation *)convs->data;
+
+		/* Setup Send button */
+		if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) {
+			create_send_button_pidgin(PIDGIN_CONVERSATION(conv));
+		}
+
+		convs = convs->next;
+	}
+
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(PurplePlugin *plugin)
+{
+	GList *convs = purple_get_conversations();
+
+	while (convs) {
+		PurpleConversation *conv = (PurpleConversation *)convs->data;
+
+		/* Remove Send button */
+		if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) {
+			remove_send_button_pidgin(PIDGIN_CONVERSATION(conv));
+		}
+
+		convs = convs->next;
+	}
+
+	return TRUE;
+}
+
+static PurplePluginInfo info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,                           /**< major version */
+	PURPLE_MINOR_VERSION,                           /**< minor version */
+	PURPLE_PLUGIN_STANDARD,                         /**< type */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
+	0,                                              /**< flags */
+	NULL,                                           /**< dependencies */
+	PURPLE_PRIORITY_DEFAULT,                        /**< priority */
+
+	"gtksendbutton",                                /**< id */
+	N_("Send Button"),                              /**< name */
+	DISPLAY_VERSION,                                /**< version */
+	N_("Conversation Window Send Button."),         /**< summary */
+	N_("Adds a Send button to the entry area of "
+	   "the conversation window. Intended for when "
+	   "no physical keyboard is present."),         /**< description */
+	"Etan Reisner <deryni@pidgin.im>",              /**< author */
+	PURPLE_WEBSITE,                                 /**< homepage */
+	plugin_load,                                    /**< load */
+	plugin_unload,                                  /**< unload */
+	NULL,                                           /**< destroy */
+	NULL,                                           /**< ui_info */
+	NULL,                                           /**< extra_info */
+	NULL,                                           /**< prefs_info */
+	NULL,                                           /**< actions */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(PurplePlugin *plugin)
+{
+}
+
+PURPLE_INIT_PLUGIN(sendbutton, init_plugin, info)
--- a/pidgin/win32/nsis/translations/finnish.nsh	Mon Mar 31 21:23:57 2008 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Mon Apr 28 00:01:07 2008 +0000
@@ -4,33 +4,53 @@
 ;;  Finish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: "Toni_"Daigle"_Impi" <toni.impio@pp1.inet.fi>
+;;  Authors: Toni "Daigle" Impi <toni.impio@pp1.inet.fi>
+;;           Timo Jyrinki <timo.jyrinki@iki.fi>, 2008
+;;           
 ;;  Version 2
 ;;
 
 ; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"GTK+ runtime ymprist joko puuttuu tai tarvitsee pivityst.$\rOle hyv ja asenna v${GTK_MIN_VERSION} tai uudempi GTK+ runtime"
+!define GTK_INSTALLER_NEEDED			"Ajonaikainen GTK+-ymprist joko puuttuu tai tarvitsee pivityst.$\rOle hyv ja asenna v${GTK_MIN_VERSION} tai uudempi ajonaikainen GTK+-ymprist."
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"Seuraava >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) on julkaistu GPL lisenssin alla. Lisenssi esitetn tss vain tiedotuksena. $_CLICK"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) on julkaistu GPL-lisenssin alla. Lisenssi esitetn tss vain tiedotuksena. $_CLICK"
 
 ; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Suoraviestintohjelma (required)"
-!define GTK_SECTION_TITLE			"GTK+ runtime ymprist (required)"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidfinin ytimen tiedostot ja dll:t"
-!define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (kyttjulkoasu) tykalupakki, Pidginin kyttm"
+!define PIDGIN_SECTION_TITLE			"Pidgin-pikaviestin (vaaditaan)"
+!define GTK_SECTION_TITLE			"Ajonaikainen GTK+-ymprist (vaaditaan)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Pikakuvakkeet"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Typyt"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Kynnistysvalikko"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidginin ytimen tiedostot ja kirjastot"
+!define GTK_SECTION_DESCRIPTION		"Monialustainen Pidginin kyttm kyttliittymkirjasto"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Pikakuvakkeet Pidginin kynnistmiseksi"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Tee Pidgin-pikakuvake typydlle"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   	"Tee Pidgin-pikakuvake kynnistysvalikkoon"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Vanha versio GTK+ runtimest lytynyt. Tahdotko pivitt?$\rHuomio: $(^Name) ei vlttmtt toimi mikli jtt pivittmtt."
+!define GTK_UPGRADE_PROMPT			"Vanha versio ajonaikaisesta GTK+-ympristst lytynyt. Tahdotko pivitt?$\rHuomio: $(^Name) ei vlttmtt toimi mikli jtt pivittmtt."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidinin Windows -sivustolla"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidginin WWW-sivustolla"
 
 ; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
+!define GTK_INSTALL_ERROR			"Virhe asennettaessa ajonaikaista GTK+-ymprist."
 !define GTK_BAD_INSTALL_PATH			"Antamasi polku ei toimi tai sit ei voi luoda."
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI-ksittelijt"
+
 ; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Asennuksen poistaja ei lytnyt reksiterist tietoja Pidginista.$\rOn todennkist ett joku muu kyttj on asentanut ohjelman."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Asennuksen poistaja ei lytnyt rekisterist tietoja Pidginista.$\rOn todennkist ett joku muu kyttj on asentanut ohjelman."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Sinulla ei ole valtuuksia poistaa ohjelmaa."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Oikolukutuki"
+!define PIDGIN_SPELLCHECK_ERROR			"Virhe asennettaessa oikolukua"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Virhe asennettaessa oikoluvun sanakirjaa"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Tuki oikoluvulle.  (Asennukseen tarvitaan Internet-yhteys)"
+!define ASPELL_INSTALL_FAILED			"Asennus eponnistui"
+
--- a/po/ChangeLog	Mon Mar 31 21:23:57 2008 +0000
+++ b/po/ChangeLog	Mon Apr 28 00:01:07 2008 +0000
@@ -19,6 +19,7 @@
 	* Romanian translation updated (Mişu Moldovan)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Slovak translation updated (loptosko)
+	* Slovenian transalation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernández-Sanguino)
 	* Swedish translation updated (Peter Hjalmarsson)
 
--- a/po/POTFILES.in	Mon Mar 31 21:23:57 2008 +0000
+++ b/po/POTFILES.in	Mon Apr 28 00:01:07 2008 +0000
@@ -244,6 +244,7 @@
 pidgin/plugins/pidginrc.c
 pidgin/plugins/raw.c
 pidgin/plugins/relnot.c
+pidgin/plugins/sendbutton.c
 pidgin/plugins/spellchk.c
 pidgin/plugins/ticker/ticker.c
 pidgin/plugins/timestamp.c
--- a/po/de.po	Mon Mar 31 21:23:57 2008 +0000
+++ b/po/de.po	Mon Apr 28 00:01:07 2008 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-30 22:16+0200\n"
-"PO-Revision-Date: 2008-03-24 23:02+0100\n"
-"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2008-04-12 10:45+0200\n"
+"PO-Revision-Date: 2008-04-12 10:45+0200\n"
+"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -611,7 +611,7 @@
 msgstr "Buddy-Alarm hinzufügen..."
 
 msgid "View Log..."
-msgstr "Mitschnitt anzeigen.."
+msgstr "Mitschnitt anzeigen..."
 
 msgid "Enable Logging"
 msgstr "Mitschnitt einschalten"
@@ -752,17 +752,26 @@
 
 #, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr "Gesendet"
+
+msgid "Received"
+msgstr "Empfangen"
+
+msgid "Finished"
+msgstr "Fertig"
 
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Die Datei wurde unter %s gespeichert."
 
-msgid "Finished"
-msgstr "Fertig"
-
-msgid "Transferring"
-msgstr "Übertragung"
+msgid "Sending"
+msgstr "Sende"
+
+msgid "Receiving"
+msgstr "Empfange"
 
 #, c-format
 msgid "Conversation in %s on %s"
@@ -4375,8 +4384,8 @@
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;Benutzer&gt; [Grund]:  Verbanne einen Benutzer aus dem Raum."
 
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
@@ -4396,11 +4405,11 @@
 msgstr ""
 "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
 
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
-
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr "join: &lt;Raum&gt; [Passwort]:  Betrete einen Chat auf diesem Server."
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;Benutzer&gt; [Grund]:  Kickt einen Benutzer aus dem Raum."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -5212,7 +5221,10 @@
 "versuchen Sie es später nochmal."
 
 msgid "Handshaking"
-msgstr "Händedruck"
+msgstr "Abgleich"
+
+msgid "Transferring"
+msgstr "Übertrage"
 
 msgid "Starting authentication"
 msgstr "Starte Authentifizierung"
@@ -10190,6 +10202,14 @@
 #, c-format
 msgid ""
 "\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+"\n"
+"<b>Besucher:</b> %d"
+
+#, c-format
+msgid ""
+"\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
@@ -11304,6 +11324,23 @@
 msgid "Color to draw the name of an action message."
 msgstr "Farbe, mit der der Name in einer Aktions-Nachricht dargestellt wird."
 
+msgid "Typing notification color"
+msgstr "Farbe der Tipp-Benachrichtigung"
+
+msgid "The color to use for the typing notification font"
+msgstr ""
+"Die Farbe, die für die Tipp-Benachrichtigungsmeldung benutzt werden soll"
+
+msgid "Typing notification font"
+msgstr "Tipp-Benachrichtigungs-Schriftart"
+
+msgid "The font to use for the typing notification"
+msgstr ""
+"Die Schriftart, die für die Tipp-Benachrichtigungsmeldung benutzt werden soll"
+
+msgid "Enable typing notification"
+msgstr "Tipp-Benachrichtigung aktivieren"
+
 msgid "_Copy E-Mail Address"
 msgstr "Kopiere _E-Mail-Adresse"
 
@@ -11702,27 +11739,24 @@
 
 #, 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\">Geschrieben von:</span>\t%s\n"
-"<span weight=\"bold\">Webseite: </span>\t\t%s\n"
-"<span weight=\"bold\">Dateiname:</span>\t\t%s"
-
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Fehler: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Fehler: %s\n"
 "Überprüfen Sie die Website des Plugins auf eine neue Version.</span>"
 
 msgid "Author"
 msgstr "Autor"
 
+msgid "<b>Written by:</b>"
+msgstr "<b>Geschrieben von:</b>"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Webseite:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Dateiname:</b>"
+
 msgid "Configure Pl_ugin"
 msgstr "Pl_ugin konfigurieren"
 
@@ -12473,12 +12507,8 @@
 msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
 
 #. *  summary
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Das Kontakt-Verfügbarkeits-Plugin (cap) wird benutzt um statistische "
-"Informationen über Buddys anzuzeigen."
+msgid "Displays statistical information about your buddies' availability"
+msgstr "Statistische Informationen über die Verfügbarkeit Ihrer Buddys zeigen"
 
 msgid "Buddy is idle"
 msgstr "Buddy ist untätig"
@@ -12628,7 +12658,7 @@
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_Gestiken anzeigen"
+msgstr "_Gesten anzeigen"
 
 #. *< type
 #. *< ui_requirement
@@ -12637,29 +12667,27 @@
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr "Maus-Gestiken"
+msgstr "Maus-Gesten"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "Ermöglicht die Bedienung mit Maus-Gestiken"
+msgstr "Ermöglicht die Bedienung mit Maus-Gesten"
 
 #. *  description
 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 ""
-"Ermöglicht das Benutzen von Maus-Gestiken im Gesprächsfenster. Halten Sie "
-"die mittlere Maustaste gedrückt um folgende Aktionen auszuführen:\n"
-"\n"
-"Herunterziehen und dann nach rechts, um ein Gespräch zu beenden. Hochziehen "
-"und dann nach links, um auf ein voriges Gespräch zu wechseln. Hochziehen und "
-"dann nach rechts, um zum nächsten Gespräche zu wechseln."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\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 ""
+"Ermöglicht das Benutzen von Maus-Gesten in Gesprächsfenstern. Halten Sie die "
+"mittlere Maustaste gedrückt um folgende Aktionen auszuführen:\n"
+" • Herunterziehen und dann nach rechts, um ein Gespräch zu beenden.\n"
+" • Hochziehen und dann nach links, um auf ein voriges Gespräch zu wechseln.\n"
+" • Hochziehen und dann nach rechts, um zum nächsten Gespräche zu wechseln."
 
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
--- a/po/sl.po	Mon Mar 31 21:23:57 2008 +0000
+++ b/po/sl.po	Mon Apr 28 00:01:07 2008 +0000
@@ -6,35 +6,30 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.4\n"
+"Project-Id-Version: Pidgin 2.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-27 03:22-0500\n"
-"PO-Revision-Date: 2008-02-27 22:51+0100\n"
+"POT-Creation-Date: 2008-03-31 13:18-0400\n"
+"PO-Revision-Date: 2008-03-31 17:31+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\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"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
 #. 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
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Poskusite `%s -h' za več informacij.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -55,344 +50,110 @@
 "  -n, --nologin       brez samodejne prijave\n"
 "  -v, --version       izpiši trenutno različico in končaj program\n"
 
-#: ../finch/finch.c:327
-#: ../pidgin/gtkmain.c:743
-#, 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 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:124
-#: ../finch/gntaccount.c:484
-#: ../finch/gntblist.c:574
-#: ../finch/gntblist.c:710
-#: ../finch/gntblist.c:723
-#: ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
+#, 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 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."
+
 msgid "Error"
 msgstr "Napaka"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Račun ni bil dodan"
 
-#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "Pojavno ime računa ne sme biti prazno."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Vtičniki protokolov niso nameščeni."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Najverjetneje ste pozabili na 'make install'.)"
 
-#: ../finch/gntaccount.c:496
-#: ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447
-#: ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nov račun"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Psevdonim:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575
-#: ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890
-#: ../finch/gntblist.c:620
-#: ../finch/gntblist.c:698
-#: ../finch/gntblist.c:733
-#: ../finch/gntblist.c:1077
-#: ../finch/gntblist.c:1303
-#: ../finch/gntblist.c:1437
-#: ../finch/gntblist.c:2602
-#: ../finch/gntblist.c:2651
-#: ../finch/gntblist.c:2715
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471
-#: ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1059
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1116
-#: ../libpurple/account.c:1419
-#: ../libpurple/account.c:1454
-#: ../libpurple/conversation.c:1222
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:730
-#: ../libpurple/protocols/jabber/buddy.c:2430
-#: ../libpurple/protocols/jabber/buddy.c:2466
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1069
-#: ../libpurple/protocols/jabber/jabber.c:1784
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../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/msnp9/msn.c:284
-#: ../libpurple/protocols/msnp9/msn.c:301
-#: ../libpurple/protocols/msnp9/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:356
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6197
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../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:120
-#: ../libpurple/protocols/qq/group_opt.c:375
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3438
-#: ../libpurple/protocols/sametime/sametime.c:3524
-#: ../libpurple/protocols/sametime/sametime.c:3698
-#: ../libpurple/protocols/sametime/sametime.c:5451
-#: ../libpurple/protocols/sametime/sametime.c:5541
-#: ../libpurple/protocols/sametime/sametime.c:5666
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:742
-#: ../libpurple/protocols/silc10/silc.c:948
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3540
-#: ../libpurple/protocols/yahoo/yahoo.c:3551
-#: ../pidgin/gtkaccount.c:1841
-#: ../pidgin/gtkaccount.c:2402
-#: ../pidgin/gtkblist.c:6768
-#: ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:765
-#: ../pidgin/gtkdialogs.c:904
-#: ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1016
-#: ../pidgin/gtkdialogs.c:1040
-#: ../pidgin/gtkdialogs.c:1062
-#: ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1151
-#: ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1246
-#: ../pidgin/gtkdialogs.c:1273
-#: ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:290
-#: ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509
-#: ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550
-#: ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "Prekliči"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579
-#: ../finch/gntcertmgr.c:310
-#: ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:477
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1056
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1453
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:729
-#: ../pidgin/gtkdebug.c:746
-#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Shrani"
 
-#: ../finch/gntaccount.c:632
-#: ../pidgin/gtkaccount.c:1832
-#: ../pidgin/gtksavedstatuses.c:333
-#: ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Ste prepričani, da želite izbrisati %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Izbriši račun"
 
 #. Delete button
-#: ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318
-#: ../finch/gntpounce.c:678
-#: ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1840
-#: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112
-#: ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../finch/gntaccount.c:670
-#: ../finch/gntblist.c:2469
-#: ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2261
-#: ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Računi"
 
-#: ../finch/gntaccount.c:676
 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:699
-#: ../finch/gntaccount.c:889
-#: ../finch/gntblist.c:619
-#: ../finch/gntblist.c:698
-#: ../finch/gntblist.c:733
-#: ../finch/gntblist.c:2819
-#: ../finch/gntcertmgr.c:305
-#: ../finch/gntnotify.c:385
-#: ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274
-#: ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5540
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2401
-#: ../pidgin/gtkblist.c:6767
-#: ../pidgin/gtkconv.c:1702
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Dodaj"
 
 #. Modify button
-#: ../finch/gntaccount.c:704
-#: ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Spremeni"
 
-#: ../finch/gntaccount.c:812
-#: ../pidgin/gtkaccount.c:2348
 #, 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:885
-#: ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "Želite dodati prijatelja na seznam?"
 
-#: ../finch/gntaccount.c:945
-#: ../pidgin/gtkaccount.c:2458
 #, 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:970
-#: ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000
-#: ../pidgin/gtkaccount.c:2481
-#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "Želite pooblastiti prijatelja?"
 
-#: ../finch/gntaccount.c:977
-#: ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2482
-#: ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "Pooblasti"
 
-#: ../finch/gntaccount.c:978
-#: ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2483
-#: ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "Zavrni"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -401,12 +162,10 @@
 "Povezanih: %d\n"
 "Skupaj: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Račun: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -415,556 +174,270 @@
 "\n"
 "Zadnjič viden: pred %s leti"
 
-#: ../finch/gntblist.c:306
-#: ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "Za prijatelja morate vnesti pojavno ime."
 
-#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Vnesti morate skupino."
 
-#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Izberite račun."
 
-#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "Izbrani račun ni povezan."
 
-#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Napaka pri dodajanju prijatelja"
 
-#: ../finch/gntblist.c:601
-#: ../libpurple/protocols/oscar/oscar.c:2949
-#: ../pidgin/gtkaccount.c:1914
-#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:604
 msgid "Alias (optional)"
 msgstr "Psevdonim (neobvezno)"
 
-#: ../finch/gntblist.c:607
 msgid "Add in group"
 msgstr "Dodaj v skupino"
 
-#: ../finch/gntblist.c:611
-#: ../finch/gntblist.c:678
-#: ../finch/gntblist.c:1648
-#: ../finch/gntblist.c:2583
-#: ../finch/gntblist.c:2637
-#: ../finch/gntblist.c:2702
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3201
-#: ../pidgin/gtknotify.c:517
-#: ../pidgin/gtkpounce.c:1281
-#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Račun"
 
-#: ../finch/gntblist.c:617
-#: ../finch/gntblist.c:1126
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3380
-#: ../pidgin/gtkblist.c:6298
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Dodaj prijatelja"
 
-#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Prosimo, vnesite podatke o prijatelju."
 
-#: ../finch/gntblist.c:647
-#: ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Pomenki"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:684
-#: ../finch/gntblist.c:2578
-#: ../finch/gntblist.c:2632
-#: ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:988
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/msn/msn.c:1740
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1596
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:652
-#: ../pidgin/gtkroomlist.c:749
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Ime"
 
-#: ../finch/gntblist.c:687
-#: ../finch/gntblist.c:1589
-#: ../libpurple/protocols/msn/msn.c:1559
-#: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:792
-#: ../libpurple/protocols/zephyr/zephyr.c:1167
-#: ../pidgin/gtkdialogs.c:1015
-#: ../pidgin/gtkdialogs.c:1039
-#: ../pidgin/gtkdialogs.c:1061
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: ../finch/gntblist.c:690
-#: ../finch/gntblist.c:2835
 msgid "Group"
 msgstr "Združi"
 
-#: ../finch/gntblist.c:693
-#: ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Samodejno spoji"
 
-#: ../finch/gntblist.c:696
-#: ../finch/gntblist.c:1128
-#: ../pidgin/gtkblist.c:6681
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "Kasneje lahko še več podatkov uredite prek pojavnega menija."
 
-#: ../finch/gntblist.c:710
-#: ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Napaka pri dodajanju skupine"
 
-#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Vnesti morate ime skupine, ki jo želite dodati."
 
-#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Skupina s tem imenom že obstaja."
 
-#: ../finch/gntblist.c:731
-#: ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5450
-#: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtkblist.c:6764
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Vnesite ime skupine"
 
-#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "Uredi pomenek"
 
-#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Prosimo, posodobite potrebna polja."
 
-#: ../finch/gntblist.c:1077
-#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Uredi nastavitve"
 
-#: ../finch/gntblist.c:1138
-#: ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Podatki"
 
-#: ../finch/gntblist.c:1138
-#: ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Pridobivanje poteka ..."
 
-#: ../finch/gntblist.c:1192
-#: ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Informacije"
 
-#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Dodaj opozorilo prijatelju"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1203
-#: ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:653
-#: ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../finch/gntblist.c:1210
-#: ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "Zavrnjeno"
 
-#: ../finch/gntblist.c:1216
-#: ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "Pokaži dnevnik"
 
-#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Prosimo, vnesite novo ime za %s"
 
-#: ../finch/gntblist.c:1300
-#: ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "Nastavi psevdonim"
 
-#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Vnesite prazen niz da ponastavite ime."
 
-#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Z odstranitvijo tega stika boste odstranili tudi vse prijatelje iz stika"
-
-#: ../finch/gntblist.c:1423
+msgstr ""
+"Z odstranitvijo tega stika boste odstranili tudi vse prijatelje iz stika"
+
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Z odstranitvijo te skupine boste odstranili tudi vse prijatelje iz skupine"
-
-#: ../finch/gntblist.c:1428
+msgstr ""
+"Z odstranitvijo te skupine boste odstranili tudi vse prijatelje iz skupine"
+
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Ste prepričani, da želite odstraniti %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Potrditev odstranitve"
 
-#: ../finch/gntblist.c:1436
-#: ../finch/gntblist.c:1591
-#: ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1699
-#: ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "Odstrani"
 
 #. Buddy List
-#: ../finch/gntblist.c:1565
-#: ../finch/gntblist.c:2876
-#: ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95
-#: ../pidgin/gtkblist.c:5037
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
-#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "Označeno mesto"
 
-#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "Pokaži/skrij oznako"
 
 #. General
-#: ../finch/gntblist.c:1641
-#: ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052
-#: ../libpurple/protocols/gg/gg.c:1125
-#: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1251
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/jabber.c:999
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/msn/msn.c:1567
-#: ../libpurple/protocols/msn/msn.c:1743
-#: ../libpurple/protocols/msnp9/msn.c:1421
-#: ../libpurple/protocols/msnp9/msn.c:1599
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
-#: ../pidgin/gtkblist.c:3225
 msgid "Nickname"
 msgstr "Vzdevek"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1663
-#: ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:789
-#: ../libpurple/protocols/jabber/buddy.c:953
-#: ../libpurple/protocols/msn/msn.c:607
-#: ../libpurple/protocols/msn/msn.c:625
-#: ../libpurple/protocols/msn/msn.c:633
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:541
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2973
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3253
-#: ../pidgin/gtkblist.c:3703
-#: ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "Na mobilcu"
 
-#: ../finch/gntblist.c:1976
-#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Novo ..."
 
-#: ../finch/gntblist.c:1983
-#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Datoteka shranjena ..."
 
-#: ../finch/gntblist.c:2437
-#: ../finch/gntplugin.c:352
-#: ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717
-#: ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "Vtičniki"
 
-#: ../finch/gntblist.c:2591
-#: ../finch/gntblist.c:2596
 msgid "Block/Unblock"
 msgstr "Zavrni/Prekliči zavrnitev"
 
-#: ../finch/gntblist.c:2592
-#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Zavrni"
 
-#: ../finch/gntblist.c:2593
-#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Prekliči zavrnitev"
 
-#: ../finch/gntblist.c:2598
-msgid "Please enter the screen name or alias of the person you would like to Block/Unblock."
-msgstr "Vnesite pojavno ime ali psevdonim osebe, ki jo želite zavrniti/preklicati njeno zavrnitev."
+msgid ""
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"Vnesite pojavno ime ali psevdonim osebe, ki jo želite zavrniti/preklicati "
+"njeno zavrnitev."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2601
-#: ../finch/gntblist.c:2650
-#: ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137
-#: ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177
-#: ../libpurple/account.c:1115
-#: ../libpurple/account.c:1418
-#: ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1783
-#: ../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/msnp9/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:300
-#: ../libpurple/protocols/msnp9/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:334
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6196
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:965
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../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:1909
-#: ../libpurple/protocols/silc10/silc.c:741
-#: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3539
-#: ../libpurple/protocols/yahoo/yahoo.c:3550
-#: ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:764
-#: ../pidgin/gtkdialogs.c:903
-#: ../pidgin/gtkdialogs.c:995
-#: ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "V redu"
 
-#: ../finch/gntblist.c:2645
-#: ../pidgin/gtkdialogs.c:759
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../finch/gntblist.c:2647
-#: ../pidgin/gtkdialogs.c:761
-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:2698
+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."
+
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../finch/gntblist.c:2710
-#: ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "Vnesite ime klepeta, ki se mu želite pridružiti."
 
-#: ../finch/gntblist.c:2714
-#: ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Pridruži se"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2759
-#: ../finch/gntpounce.c:459
-#: ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "Pošllji sporočilo ..."
 
-#: ../finch/gntblist.c:2770
 msgid "Block/Unblock..."
 msgstr "Zavrni/Prekliči zavrnitev ..."
 
-#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "Pridruži se klepetu ..."
 
-#: ../finch/gntblist.c:2780
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "prazne skupine"
 
-#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "nepovezane prijatelje"
 
-#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "Razvrsti"
 
-#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "po stanju"
 
-#: ../finch/gntblist.c:2809
-#: ../pidgin/gtkblist.c:4194
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "po obsegu dnevnika"
 
-#: ../finch/gntblist.c:2825
 msgid "Buddy"
 msgstr "Prijatelj"
 
-#: ../finch/gntblist.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:647
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Pomenek"
 
-#: ../finch/gntblist.c:2840
-#: ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Združevanje"
 
-#: ../finch/gntcertmgr.c:85
-#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Uvoz digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Navedite ime gostitelja"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Vnesite ime gostitelja, kateremu je namenjeno to digitalno potrdilo."
 
-#: ../finch/gntcertmgr.c:96
-#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -973,23 +446,15 @@
 "Datoteke %s ni bilo mogoče uvoziti.\n"
 "Preverite, da je datoteka berljiva in vrste PEM.\n"
 
-#: ../finch/gntcertmgr.c:98
-#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Napaka pri uvozu digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "Uvoz digitalnega potrdila X.509 ni uspel"
 
-#: ../finch/gntcertmgr.c:109
-#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Izberite digitalno potrdilo PEM"
 
-#: ../finch/gntcertmgr.c:126
-#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -998,27 +463,19 @@
 "Izvoz v datoteko %s ni uspel.\n"
 "Preverite, da imate na ciljni poti ustrezne pravice za pisanje\n"
 
-#: ../finch/gntcertmgr.c:128
-#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Napaka pri izvozu digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "Izvoz digitalnega potrdila X.509 ni uspel"
 
-#: ../finch/gntcertmgr.c:158
-#: ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "Izvoz digitalnega potrdila X.509"
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Digitalno potrdilo za %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -1031,135 +488,90 @@
 "Prstni odtis SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "Digitalno potrdilo SSL gostitelja"
 
-#: ../finch/gntcertmgr.c:232
-#: ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Želite resnično izbrisati digitalno potrdilo za %s?"
 
-#: ../finch/gntcertmgr.c:235
-#: ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "Potrditev brisanja digitalnega potrdila"
 
-#: ../finch/gntcertmgr.c:292
-#: ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "Upravitelj digitalnih potrdil"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297
-#: ../libpurple/protocols/bonjour/bonjour.c:694
-#: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:924
-#: ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Ime gostitelja"
 
-#: ../finch/gntcertmgr.c:314
-#: ../finch/gntnotify.c:388
-#: ../pidgin/gtkconv.c:1678
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Informacije"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323
-#: ../finch/gntft.c:253
-#: ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220
-#: ../finch/gntplugin.c:413
-#: ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275
-#: ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2375
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Zapri"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s se je odjavil."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in ponovno omogočite povezovanje računa."
-
-#: ../finch/gntconn.c:139
+"Finch se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
+"ponovno omogočite povezovanje računa."
+
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
-#: ../finch/gntconn.c:156
-msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
-msgstr "Ta račun je bil prekinjen in nič več niste v tem klepetu. Samodejno boste pridruženi klepetu, ko se račun ponovno poveže."
-
-#: ../finch/gntconv.c:159
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"Ta račun je bil prekinjen in nič več niste v tem klepetu. Samodejno boste "
+"pridruženi klepetu, ko se račun ponovno poveže."
+
 msgid "No such command."
 msgstr "Ta ukaz ne obstaja."
 
-#: ../finch/gntconv.c:163
-#: ../pidgin/gtkconv.c:492
 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:168
-#: ../pidgin/gtkconv.c:498
+msgstr ""
+"Skladenjska napaka: vtipkali ste napačno število argumentov za ta ukaz."
+
 msgid "Your command failed for an unknown reason."
 msgstr "Vaš ukaz iz neznanega razloga ni uspel."
 
-#: ../finch/gntconv.c:173
-#: ../pidgin/gtkconv.c:505
 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:176
-#: ../pidgin/gtkconv.c:508
 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:180
-#: ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "Sporočila ni mogoče poslati, saj niste prijavljeni."
 
-#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296
-#: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:3474
 #, c-format
 msgid ""
 "\n"
@@ -1168,74 +580,57 @@
 "\n"
 "%s tipka ..."
 
-#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Ta klepet ste zapustili."
 
-#: ../finch/gntconv.c:433
-#: ../pidgin/gtkconv.c:1384
 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:437
-#: ../pidgin/gtkconv.c:1392
-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:523
+msgstr ""
+"Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo "
+"zabeležena."
+
+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."
+
 msgid "Send To"
 msgstr "Pošlji k"
 
-#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "Pogovor"
 
-#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Počisti pretekle izjave"
 
-#: ../finch/gntconv.c:578
-#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Pokaži časovne žige"
 
-#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Dodaj opozorilo prijatelju ..."
 
-#: ../finch/gntconv.c:611
 msgid "View Log..."
 msgstr "Pokaži dnevnik ..."
 
-#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Vključi dnevnik"
 
-#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Vključi zvoke"
 
-#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "Seznam uporabnikov:\n"
 
-#: ../finch/gntconv.c:1130
-#: ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Podprte možnosti razhroščevanja:  različica"
 
-#: ../finch/gntconv.c:1166
-#: ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
 
-#: ../finch/gntconv.c:1169
-#: ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1243,70 +638,54 @@
 "Uporabite \"&lt;ukaz&gt; /help\" za pomoč o določenem ukazu.\n"
 "V tem sklopu so na voljo naslednji ukazi:\n"
 
-#: ../finch/gntconv.c:1242
-#: ../pidgin/gtkconv.c:7773
-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:1245
-#: ../pidgin/gtkconv.c:7776
+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."
+
 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:1248
-#: ../pidgin/gtkconv.c:7779
-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:1251
-#: ../pidgin/gtkconv.c:7782
+msgstr ""
+"me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
+
+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."
+
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../finch/gntconv.c:1254
-#: ../pidgin/gtkconv.c:7788
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Pokaži seznam uporabnikov v klepetu."
 
-#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Pokaži okno vtičnikov."
 
-#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Pokaži seznam prijateljev."
 
-#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Pokaži okno računov."
 
-#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Pokaži okno razhroščevanja."
 
-#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: Pokaži okno nastavitev."
 
-#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Pokaži okno savedstatuses."
 
-#: ../finch/gntdebug.c:231
-#: ../pidgin/gtkconv.c:948
-#: ../pidgin/gtkconv.c:2656
-#: ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../finch/gntdebug.c:271
-#: ../finch/gntui.c:98
-#: ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
 
@@ -1314,231 +693,138 @@
 #. * 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:292
-#: ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Počisti"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:309
-#: ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Premor"
 
-#: ../finch/gntft.c:120
-#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Prenosi datotek - %d%% od %d datotek"
 
 #. Create the window.
-#: ../finch/gntft.c:125
-#: ../finch/gntft.c:212
-#: ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234
-#: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Prenosi datotek"
 
-#: ../finch/gntft.c:217
-#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Potek"
 
-#: ../finch/gntft.c:217
-#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Datoteka"
 
-#: ../finch/gntft.c:217
-#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Velikost"
 
-#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Hitrost"
 
-#: ../finch/gntft.c:217
-#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Preostanek"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:217
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
-#: ../libpurple/protocols/gg/gg.c:1041
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:780
-#: ../libpurple/protocols/jabber/buddy.c:784
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1576
-#: ../libpurple/protocols/msn/msn.c:617
-#: ../libpurple/protocols/msn/msn.c:627
-#: ../libpurple/protocols/msn/msn.c:632
-#: ../libpurple/protocols/msn/msn.c:635
-#: ../libpurple/protocols/msnp9/msn.c:540
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2761
-#: ../libpurple/protocols/oscar/oscar.c:3813
-#: ../libpurple/protocols/sametime/sametime.c:3313
-#: ../libpurple/protocols/sametime/sametime.c:4204
-#: ../libpurple/protocols/yahoo/yahoo.c:3285
-#: ../pidgin/gtkblist.c:3297
-#: ../pidgin/gtkblist.c:3311
-#: ../pidgin/gtkblist.c:3313
-#: ../pidgin/gtksavedstatuses.c:990
-#: ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Stanje"
 
-#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Zapri to okno po zaključku vseh prenosov"
 
-#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Počisti dokončane prenose"
 
-#: ../finch/gntft.c:248
-#: ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ../finch/gntft.c:321
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-#: ../finch/gntft.c:388
-#: ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Preklicano"
 
-#: ../finch/gntft.c:390
-#: ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: ../finch/gntft.c:434
-#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Datoteka je bila shranjena kot %s."
 
-#: ../finch/gntft.c:446
-#: ../finch/gntft.c:447
-#: ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "Končano"
 
-#: ../finch/gntft.c:452
-#: ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Prenos je v teku"
 
-#: ../finch/gntlog.c:183
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Pomenek v %s o %s"
 
-#: ../finch/gntlog.c:186
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Pomenek z %s o %s"
 
-#: ../finch/gntlog.c:231
-#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:271
-#: ../pidgin/gtklog.c:550
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči sistemski dnevnik\"."
-
-#: ../finch/gntlog.c:275
-#: ../pidgin/gtklog.c:554
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj vsa neposredna sporočila\"."
-
-#: ../finch/gntlog.c:278
-#: ../pidgin/gtklog.c:557
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse pomenke\"."
-
-#: ../finch/gntlog.c:284
-#: ../pidgin/gtklog.c:566
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Sistemski dogodki bodo shranjeni, le če bo nastavljena možnost \"Omogoči "
+"sistemski dnevnik\"."
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Neposredna sporočila se bodo shranila, le če bo okljukana možnost \"Shranjuj "
+"vsa neposredna sporočila\"."
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Pomenki bodo shranjeni v dnevnik, ko je okljukana možnost \"Shranjuj vse "
+"pomenke\"."
+
 msgid "No logs were found"
 msgstr "Ni najdenih dnevnikov."
 
-#: ../finch/gntlog.c:330
-#: ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Skupna velikost dnevnika:"
 
 #. Search box *********
-#: ../finch/gntlog.c:338
 msgid "Scroll/Search: "
 msgstr "Predrsaj/išči:"
 
-#: ../finch/gntlog.c:382
-#: ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Pomenki v %s"
 
-#: ../finch/gntlog.c:390
-#: ../finch/gntlog.c:447
-#: ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Pomenki z %s"
 
-#: ../finch/gntlog.c:472
-#: ../pidgin/gtklog.c:824
 msgid "System Log"
 msgstr "Sistemski dnevnik"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "E-naslovi"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Dobili ste pošto!"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1547,56 +833,37 @@
 msgstr[2] "%s (%s) ima %d novi sporočili."
 msgstr[3] "%s (%s) ima %d nova sporočila."
 
-#: ../finch/gntnotify.c:226
-#: ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Nova e-pošta"
 
-#: ../finch/gntnotify.c:291
-#: ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "Podatki za %s"
 
-#: ../finch/gntnotify.c:292
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Informacije o prijatelju"
 
-#: ../finch/gntnotify.c:382
-#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../finch/gntnotify.c:391
-#: ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "Sporoči"
 
-#: ../finch/gntnotify.c:397
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../finch/gntplugin.c:84
-#: ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "NAPAKA"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "nalaganje vtičnika ni uspelo"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "izklop vtičnika ni uspel"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1613,39 +880,33 @@
 "Spletna stran: %s\n"
 "Ime datoteke: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Vtičnik je potrebno naložiti, preden ga lahko prilagodite."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Za ta vtičnik ni nobenih nastavitev."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "Napaka pri nalaganju vtičnika"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "Izbrana datoteka ni veljaven vtičnik."
 
-#: ../finch/gntplugin.c:268
-msgid "Please open the debug window and try again to see the exact error message."
-msgstr "Prosim, odprite okno razhroščevanja in poskusite znova, da vidite dejansko sporočilo o napaki."
-
-#: ../finch/gntplugin.c:331
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Prosim, odprite okno razhroščevanja in poskusite znova, da vidite dejansko "
+"sporočilo o napaki."
+
 msgid "Select plugin to install"
 msgstr "Izberite vtičnik za namestitev"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Vtičnike lahko naložite ali odstranite z naslednjega seznama."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "Namesti vtičnik ..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Prilagodi vtičnik"
 
@@ -1654,437 +915,283 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524
-#: ../finch/gntplugin.c:531
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103
-#: ../pidgin/gtkdocklet.c:718
-#: ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: ../finch/gntpounce.c:193
-#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Vnesite opozorilo prijatelja."
 
-#: ../finch/gntpounce.c:338
-#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Novo opozorilo prijatelja"
 
-#: ../finch/gntpounce.c:338
-#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Uredi opozorilo prijatelja"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Opozori tistega, ki"
 
 #. Account:
-#: ../finch/gntpounce.c:346
-#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Račun:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Ime prijatelja:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386
-#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Opozori, ko se prijatelj ..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "se prijavi"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "se odjavi"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "postane odsoten"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "se vrne iz odsotnosti"
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "postane nedejaven"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "ni več nedejaven"
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "začne tipkati"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "postane med tipkanjem"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "preneha tipkati"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "pošlje sporočilo"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426
-#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Odpri sporočilno okno"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Prikaži obvestilo"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Pošlji sporočilo"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Izvrši ukaz"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
 msgstr "Opozori le takrat, ko nisem na voljo"
 
-#: ../finch/gntpounce.c:462
-#: ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Ponavljajoč"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Opozorila ni mogoče ustvariti"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Nimate računa."
 
-#: ../finch/gntpounce.c:632
 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:674
-#: ../pidgin/gtkpounce.c:1108
 #, 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:708
-#: ../finch/gntui.c:96
-#: ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Opozorila prijatelja"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s vam (%s) je začel pisati"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s je zastal, medtem ko vam je pisal (%s)"
 
-#: ../finch/gntpounce.c:819
-#: ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s se je prijavil na (%s)"
 
-#: ../finch/gntpounce.c:820
-#: ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s je spet dejaven (%s)"
 
-#: ../finch/gntpounce.c:821
-#: ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s se je vrnil (%s)"
 
-#: ../finch/gntpounce.c:822
-#: ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s vam (%s) je prenehal pisati"
 
-#: ../finch/gntpounce.c:823
-#: ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s se je odjavil (%s)"
 
-#: ../finch/gntpounce.c:824
-#: ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s je postal nedejaven (%s)"
 
-#: ../finch/gntpounce.c:825
-#: ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s je postal odsoten. (%s)"
 
-#: ../finch/gntpounce.c:826
-#: ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "Uporabnik %s vam je poslal sporočilo. (%s)"
 
-#: ../finch/gntpounce.c:845
-#: ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "Neznan dogodek opozorila. Poročajte o tem!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Glede na uporabo tipkovnice"
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Od nazadnje poslanega sporočila"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:848
-#: ../pidgin/gtkprefs.c:856
-#: ../pidgin/gtkprefs.c:1950
-#: ../pidgin/gtkprefs.c:1964
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "nikoli"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Pokaži čas nedejavnosti"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Pokaži neprijavljene prijatelje"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Obvesti prijatelje, ko pišem"
 
-#: ../finch/gntprefs.c:198
-#: ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Oblika dnevnika"
 
-#: ../finch/gntprefs.c:199
-#: ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Beleži IM"
 
-#: ../finch/gntprefs.c:200
-#: ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Beleži klepete"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Beleži spremembe stanja"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Poročaj o času nedejavnosti"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Spremeni stanje ob nedejavnosti"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Število minut pred spremembo stanja"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Spremeni stanje v"
 
 #. Conversations
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:942
-#: ../pidgin/gtkprefs.c:2037
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Pogovori"
 
-#: ../finch/gntprefs.c:260
-#: ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1507
-#: ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Beleženje v dnevnik"
 
-#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "Še ni podprto."
 
-#: ../finch/gntrequest.c:726
-#: ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Shrani datoteko ..."
 
-#: ../finch/gntrequest.c:726
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Odpri datoteko ..."
 
-#: ../finch/gntrequest.c:743
 msgid "Choose Location..."
 msgstr "Izberi mesto ..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Pritisnite 'Enter', če želite najti več sob te kategorije."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Dobi"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285
-#: ../finch/gntui.c:101
-#: ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "Seznam sob"
 
-#: ../finch/gntsound.c:96
-#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Prijatelj se prijavi"
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Prijatelj se odjavi"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Sporočilo prejeto"
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Prejeto sporočilo začne pogovor"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Oseba se pridruži pogovorni sobi"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Oseba zapusti pogovorno sobo"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Vi govorite v sobi"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Drugi govorijo v sobi"
 
-#: ../finch/gntsound.c:106
-#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše pojavno ime v sobi"
 
-#: ../finch/gntsound.c:362
-#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Napaka GStreamer"
 
-#: ../finch/gntsound.c:363
-#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer se ni uspel inicializirati."
 
-#: ../finch/gntsound.c:717
-#: ../finch/gntsound.c:803
-#: ../pidgin/gtkprefs.c:1631
-#: ../pidgin/gtkprefs.c:1720
-#: ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(privzeto)"
 
-#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Izberite zvočno datoteko ..."
 
-#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Zvočne nastavitve"
 
-#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../finch/gntsound.c:955
-#: ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Pisk konzole"
 
-#: ../finch/gntsound.c:959
-#: ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Nemo"
 
-#: ../finch/gntsound.c:962
-#: ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Način zvoka"
 
-#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Način:"
 
-#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -2094,96 +1201,56 @@
 "(%s namesto datoteke)"
 
 #. Sound options
-#: ../finch/gntsound.c:982
-#: ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Nastavitve zvoka"
 
-#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Zvok, ko pogovorno okno dobi pozornost"
 
-#: ../finch/gntsound.c:991
-#: ../pidgin/gtkprefs.c:846
-#: ../pidgin/gtkprefs.c:858
-#: ../pidgin/gtkprefs.c:1791
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "vedno"
 
-#: ../finch/gntsound.c:992
-#: ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Samo ko je na voljo"
 
-#: ../finch/gntsound.c:993
-#: ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Samo ko ni na voljo"
 
-#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Glasnost (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1019
-#: ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Zvočni Dogodki"
 
-#: ../finch/gntsound.c:1021
-#: ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "Datoteka"
 
-#: ../finch/gntsound.c:1040
-#: ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Preskus"
 
-#: ../finch/gntsound.c:1043
-#: ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: ../finch/gntsound.c:1046
-#: ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Izberi ..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Ste prepričani, da želite izbrisati \"%s\"?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Izbriši stanje"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/msn/msn.c:733
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Naziv"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Vrsta"
 
@@ -2195,427 +1262,262 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/gg/gg.c:1079
-#: ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605
-#: ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621
-#: ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635
-#: ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/jabber/jabber.c:1650
-#: ../libpurple/protocols/jabber/jabber.c:1664
-#: ../libpurple/protocols/jabber/jabber.c:1680
-#: ../libpurple/protocols/msn/msn.c:685
-#: ../libpurple/protocols/msn/msn.c:691
-#: ../libpurple/protocols/msn/msn.c:697
-#: ../libpurple/protocols/msn/msn.c:703
-#: ../libpurple/protocols/msn/msn.c:708
-#: ../libpurple/protocols/msn/msn.c:713
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5657
-#: ../libpurple/protocols/oscar/oscar.c:5875
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:5905
-#: ../libpurple/protocols/oscar/oscar.c:5912
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/sametime/sametime.c:3336
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:3427
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
-#: ../libpurple/protocols/yahoo/yahoo.c:3799
-#: ../libpurple/protocols/zephyr/zephyr.c:2349
-#: ../pidgin/gtksavedstatuses.c:526
-#: ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Sporočilo"
 
 #. Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Uporabi"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Neveljaven naslov"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Prosimo, vnesite neprazen naslov za stanje."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Podvojen naslov"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Vnesite drugačen naslov za stanje."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Podstanje"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Sporočilo:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Uredi stanje"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Za naslednje račune uporabi različno stanje"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Shrani in uporabi"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Digitalna potrdila"
 
-#: ../finch/gntui.c:102
-#: ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Stanja"
 
-#: ../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:160
 msgid "Clipboard plugin"
 msgstr "Vtičnik za odložišče"
 
-#: ../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."
-
-#: ../finch/plugins/gntgf.c:231
+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."
+
 #, c-format
 msgid "%s just signed on"
 msgstr "Uporabnik %s se je ravnokar prijavil."
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "Uporabnik %s se je ravnokar odjavil."
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "Uporabnik %s vam je poslal sporočilo"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s je omenil/a vaš vzdevek v %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "Uporabnik %s je poslal sporočilo v %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Prijatelj se prijavi/odjavi"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Prejemate sporočilo"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Nekdo v sobi govori"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Obvesti z opekačem, ko"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Piskaj tudi!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Nastavi NUJNO v konzoli."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Vtičnik Toaster"
 
-#: ../finch/plugins/gnthistory.c:114
-#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Pogovor z %s o %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172
-#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Vtičnik za zgodovino zahteva beleženje v dnevnik"
 
-#: ../finch/plugins/gnthistory.c:173
-#: ../pidgin/plugins/history.c:154
 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 ""
-"Beleženje v dnevnik lahko omogočite v Orodja -> Nastavitve -> Beleženje v dnevnik.\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Beleženje v dnevnik lahko omogočite v Orodja -> Nastavitve -> Beleženje v "
+"dnevnik.\n"
 "\n"
-"Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete aktivira zgodovino za istovrstne pogovore."
-
-#: ../finch/plugins/gnthistory.c:217
+"Omogočanje beleženja v dnevnik za neposredna sporočila in/ali klepete "
+"aktivira zgodovino za istovrstne pogovore."
+
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:219
-#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Prikaže nedavno zabeležene pogovore v novih pogovorih."
 
-#: ../finch/plugins/gnthistory.c:220
-#: ../pidgin/plugins/history.c:198
-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 vtičnik vstavi zadnji pogovor v trenuten pogovor."
-
-#: ../finch/plugins/grouping.c:42
-#: ../libpurple/protocols/oscar/oscar.c:738
+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 vtičnik vstavi zadnji pogovor v trenuten pogovor."
+
 msgid "Online"
 msgstr "Prisoten"
 
-#: ../finch/plugins/grouping.c:44
-#: ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5707
-#: ../libpurple/protocols/qq/qq.c:171
-#: ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3297
-#: ../pidgin/gtkblist.c:3679
-#: ../pidgin/gtkdocklet.c:561
-#: ../pidgin/gtkstatusbox.c:1085
 msgid "Offline"
 msgstr "Brez povezave"
 
-#: ../finch/plugins/grouping.c:117
-#: ../pidgin/gtkblist.c:3336
 msgid "Online Buddies"
 msgstr "Povezani prijatelji"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Nepovezani prijatelji"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Povezan/nepovezan"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "Brez združevanja v skupine"
 
-#: ../finch/plugins/grouping.c:257
-#: ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Omogoča dodatne možnosti urejenosti seznama prijateljev."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog (Zadnji dnevnik)"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Poišče podniz v dnevniku."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124
-#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Vtičnik Lastlog."
 
-#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "Računi"
 
-#: ../libpurple/account.c:1061
-#: ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
-#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Vpišite geslo za %s (%s)"
 
-#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Vnesi geslo"
 
-#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Shrani geslo"
 
-#: ../libpurple/account.c:1142
-#: ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vtičnik za protokol %s"
 
-#: ../libpurple/account.c:1144
-#: ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: ../libpurple/account.c:1355
-#: ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1736
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
-#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "Izpolnite vsa polja."
 
-#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "Obstoječe geslo"
 
-#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "Novo geslo"
 
-#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "Spremeni geslo za %s"
 
-#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "Vnesite svoje obstoječe in novo geslo."
 
-#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: ../libpurple/account.c:1449
-#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
-#: ../libpurple/account.c:1920
-#: ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:784
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/jabber/buddy.c:2051
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Neznan"
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558
-#: ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3433
-#: ../pidgin/gtkblist.c:6188
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Prijatelji"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Seznam prijateljev"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(SE NE UJEMA)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s je predstavil(a) naslednje digitalno potrdilo za enkratno uporabo:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2625,59 +1527,48 @@
 "Prstni odtis (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Preverjanje verodostojnosti digitalnega potrdila za enkratno uporabo"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "Izdajatelji digitalnih potrdil"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "Medpomnilnik vrstnikov SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Želite sprejeti digitalno potrdilo za %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "Preverjanje verodostojnosti digitalnega potrdila SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: ../libpurple/certificate.c:1209
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Zavrni"
 
-#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "_Pokaži digitalno potrdilo ..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1311
-#, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni mogoče preveriti."
-
-#: ../libpurple/certificate.c:1329
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
+"mogoče preveriti."
+
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
@@ -2687,31 +1578,36 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337
-#: ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "Napaka digitalnega potrdila SSL"
 
-#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "Neveljavna veriga digitalnih potrdil"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1359
-msgid "You have no database of root certificates, so this certificate cannot be validated."
-msgstr "Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega potrdila ni mogoče preveriti."
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
+"potrdila ni mogoče preveriti."
 
 #. 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 "Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je Pidginu neznano."
-
-#: ../libpurple/certificate.c:1399
-#, 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 "Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
-
-#: ../libpurple/certificate.c:1408
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
+"Pidginu neznano."
+
+#, 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 ""
+"Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega "
+"podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
+
 msgid "Invalid certificate authority signature"
 msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
 
@@ -2719,13 +1615,15 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1434
-#, 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 "Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
+#, 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 ""
+"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
+"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
 
 #. Make messages
-#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2743,131 +1641,93 @@
 "Rok veljavnosti: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "Podatki o digitalnem potrdilu"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Napaka pri prijavi"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "Napaka pri odjavi"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s se je prijavil(a)"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s se je odjavil(a)"
 
-#: ../libpurple/connection.c:530
-#: ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2354
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:329
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../libpurple/conversation.c:170
 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
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Sporočila k %s ni mogoče poslati."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Sporočilo je preveliko."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:272
-#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Sporočila ni mogoče poslati."
 
-#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "_Pošlji sporočilo"
 
-#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s se nam pridružuje."
 
-#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] se nam pridružuje."
 
-#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "Zdaj ste znani kot %s"
 
-#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je zdaj poznan kot %s"
 
-#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s nas je zapustil."
 
-#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s nas je zapustil (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Povezave ni mogoče vzpostaviti: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Imena ni mogoče pridobiti: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Imena strežnika ni mogoče pridobiti: %s"
 
-#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Strežnik D-BUS za Purple ni zagnan zaradi zgoraj navedenih razlogov"
 
-#: ../libpurple/desktopitem.c:287
-#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Brez imena"
 
-#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Ni mogoče ustvariti novega procesa razločevanja\n"
 
-#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Zahteve ni mogoče poslati procesu razločevanja\n"
 
-#: ../libpurple/dnsquery.c:570
-#: ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2876,14 +1736,10 @@
 "Napaka pri razločevanju %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573
-#: ../libpurple/dnsquery.c:733
-#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Napaka pri razločevanju %s: %d"
 
-#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2892,20 +1748,16 @@
 "Napaka pri branju iz procesa razločevanja:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "EOF pri branju iz procesa razločevanja"
 
-#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Napaka pri ustvarjanju niti: %s"
 
-#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2914,7 +1766,6 @@
 "Napaka pri branju %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2923,7 +1774,6 @@
 "Napaka pri pisanju na strežnik %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2932,39 +1782,31 @@
 "Napaka pri dostopu do %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "V mapo ni dovoljeno pisati."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Datoteke z 0 bajti ni mogoče poslati."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Mape ni mogoče poslati."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ni veljavna datoteka. Plašni program je ne želi prepisati.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vam želi poslati %s (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vam želi poslati datoteko"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Sprejmete zahtevo po prenosu datoteke od %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2975,362 +1817,314 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ponuja pošiljanje datoteke %s"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ni veljavna datoteka.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ponujeno pošiljanje sporočila %s k %s"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Začetek prenosa %s od %s"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
-#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Zaženi ukaz v sistemskem oknu"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"aim\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"gg\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"icq\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"irc\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"msnim\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"sip\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"xmpp\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Ukaz za ravnanje z URL-ji \"ymsgr\", če je to omogočeno."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Upravljač za URL-je \"aim"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Upravljač za URL-je \"gg"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Upravljač za URL-je \"icq"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Upravljač za URL-je \"irc"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Upravljač za URL-je \"msnim"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Upravljač za URL-je \"sip"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Upravljač za URL-je \"xmpp"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Upravljač za URL-je \"ymsgr"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"aim\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"gg\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"icq\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"irc\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"msnim\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"sip\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"xmpp\""
-
-#: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
-msgstr "Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-ji \"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 "Resnično, če naj bo ukaz, ki naj ravna s to vrsto URL-ja, zagnan v konzoli."
-
-#: ../libpurple/gconf/purple.schemas.in.h:27
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"aim\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"gg\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"icq\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"irc\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"msnim\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"sip\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"xmpp\""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Resnično, če naj navedeni ukaz v polju \"ukaz\" (\"command\") upravlja z URL-"
+"ji \"ymsgr\""
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Resnično, če naj bo ukaz, ki naj ravna s to vrsto URL-ja, zagnan v konzoli."
+
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Ali naj navedeni ukaz upravlja z URL-ji \"ymsgr\""
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Stari zapis"
 
-#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../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;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
-
-#: ../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;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
-
-#: ../libpurple/log.c:1425
-#: ../libpurple/log.c:1558
+#, 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;SAMODEJNI "
+"ODGOVOR&gt;:</b></font> %s<br/>\n"
+
+#, 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;SAMODEJNI "
+"ODGOVOR&gt;:</b></font> %s<br/>\n"
+
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: ../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>Ni mogoče brati datoteke: %s</b></font>"
 
-#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Uporabljate %s, a ta vtičnik zahteva %s."
 
-#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "Ta vtičnik ni definiral vrednosti ID."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Neustrezna %d vtičnika (potrebuje %d)"
 
-#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Neustrezna različica ABI %d.%d.x (potrebna je %d.%d.x)"
 
-#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "Vtičnik ne vsebuje implementacije vseh potrebnih funkcij"
 
-#: ../libpurple/plugin.c:542
-#, 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 vtičnik in poskusite znova."
-
-#: ../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 vtičnik in poskusite "
+"znova."
+
 msgid "Unable to load the plugin"
 msgstr "Vtičnika ni mogoče naložiti"
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Zahtevanega vtičnika %s ni mogoče naložiti."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Vašega vtičnika ni mogoče naložiti."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s zahteva %s, vendar ga ni bilo mogoče odložiti."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Samodejno sprejmi"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Samodejno sprejmi zahtevo po prenosu datotek od izbranih uporabnikov."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Samodejno sprejeta zahteva po prenosu datoteke \"%s\" od \"%s\" zaključena."
-
-#: ../libpurple/plugins/autoaccept.c:82
+msgstr ""
+"Samodejno sprejeta zahteva po prenosu datoteke \"%s\" od \"%s\" zaključena."
+
 msgid "Autoaccept complete"
 msgstr "Samodejni sprejem dokončan"
 
-#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Ko prenos datoteke zahteva %s"
 
-#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Nastavi samodejni sprejem"
 
-#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../libpurple/plugins/autoaccept.c:176
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:2343
-#: ../libpurple/protocols/oscar/oscar.c:5989
-#: ../libpurple/protocols/oscar/oscar.c:6044
-#: ../libpurple/protocols/oscar/oscar.c:6270
-#: ../libpurple/protocols/oscar/oscar.c:6340
-#: ../libpurple/request.h:1458
-#: ../libpurple/request.h:1468
-#: ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Vprašaj"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Samodejno sprejmi"
 
-#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Samodejno zavrni"
 
-#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Samodejni sprejem prenosa datotek ..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3338,31 +2132,23 @@
 "Pot za shranjevanje datotek\n"
 "(Prosimo, vnesite polno pot)"
 
-#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Samodejno zavrni uporabnikom, ki niso na seznamu prijateljev"
 
-#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Obvesti s pojavnim oknom, ko je zaključen samodejno sprejeti prenos datoteke\n"
+"Obvesti s pojavnim oknom, ko je zaključen samodejno sprejeti prenos "
+"datoteke\n"
 "(le če ni pomenka s pošiljateljem)"
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1672
-#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "Opombe"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Vnesite opombe spodaj ..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Uredi opombe ..."
 
@@ -3374,23 +2160,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Opombe o prijatelju"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Shrani opombe o določenih prijateljih."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Doda možnost za shranjevanje zapiskov o prijateljih na seznamu prijateljev."
+msgstr ""
+"Doda možnost za shranjevanje zapiskov o prijateljih na seznamu prijateljev."
 
 #. *< type
 #. *< ui_requirement
@@ -3398,7 +2179,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Preizkus cifer"
 
@@ -3406,8 +2186,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Preveri cifre, ki so priložene libpurple."
 
@@ -3417,7 +2195,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Primer DBus"
 
@@ -3425,8 +2202,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Primer vtičnika DBus"
 
@@ -3436,7 +2211,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Nadzor iz datoteke"
 
@@ -3444,59 +2218,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Omogoča nadzor nad programom z vnašanjem ukazov v datoteko."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "minut"
 
 #. 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 "NedejavniK"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Nastavi čas nedejavnosti"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Nastavi"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Noben od vaših računov ni nedejaven."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Odnastavi čas nedejavnosti"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Odnastavi"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Nastavi čas nedejavnosti za vse račune"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Odnastavi čas nedejavnosti za vse nedejavne račune"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Omogoča ročno nastavitev časa vaše odsotnosti"
 
@@ -3513,7 +2266,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Preskusni odjemalec IPC"
 
@@ -3523,14 +2275,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 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 vtičnik s podporo IPC, kot odjemalec. Poišče strežniški vtičnik in kliče registrirane ukaze."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"Preskusite vtičnik s podporo IPC, kot odjemalec. Poišče strežniški vtičnik "
+"in kliče registrirane ukaze."
 
 #  *< api_version
 #  *< type
@@ -3545,7 +2299,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Preskusni strežnik IPC"
 
@@ -3555,24 +2308,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 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 vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
-
-#: ../libpurple/plugins/joinpart.c:229
+msgstr ""
+"Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."
+
 msgid "Join/Part Hiding Configuration"
 msgstr "Prilagoditev skrivanja pridruženosti/zapustitve"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Najmanjša velikost sobe"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Časovni rok neaktivnosti uporabnika (v minutah)"
 
@@ -3582,136 +2331,112 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Skrivanje pridruženosti/odhajanja"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Skrije odvečna sporočila o pridružitvi ali odhodu."
 
 #. *  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 "Ta vtičnik skrije sporočila o pridruževanju in odhajanju v velikih sobah, razen za tiste uporabnike, ki aktivno sodelujejo v klepetu."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Ta vtičnik skrije sporočila o pridruževanju in odhajanju v velikih sobah, "
+"razen za tiste uporabnike, ki aktivno sodelujejo v klepetu."
 
 #. 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:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Uporabnik ni na zvezi."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Samodejni odgovor poslan:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s se je odjavil(a)."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Eno ali več sporočil ni mogoče dostaviti."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Povezava s strežnikom je bila prekinjena."
 
-#: ../libpurple/plugins/log_reader.c:1605
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne povežete."
-
-#: ../libpurple/plugins/log_reader.c:1620
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Trenutno niste povezani. Sporočil ne boste mogli prejemati, dokler se ne "
+"povežete."
+
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Sporočila ni mogoče poslati, saj je presežena največja dolžina."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Sporočila ni mogoče poslati."
 
 #. 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:2699
-#: ../libpurple/plugins/log_reader.c:2835
 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:2712
-#: ../libpurple/plugins/log_reader.c:2840
 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:2724
-#: ../libpurple/plugins/log_reader.c:2844
 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:2738
-#: ../libpurple/plugins/log_reader.c:2849
 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:2750
-#: ../libpurple/plugins/log_reader.c:2853
 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:2762
-#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
 #. 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:2774
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Splošne nastavitve ogledovanja dnevnika"
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Hitri izračuni velikosti"
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Uporabi hevristiko imena"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Mapa dnevnika"
 
@@ -3721,42 +2446,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Ogledovalnik dnevnika"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik dnevnika."
+msgstr ""
+"Vključi dnevnike drugih odjemalcev neposrednih sporočil v ogledovalnik "
+"dnevnika."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+msgid ""
+"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 ""
-"Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"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 vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. Uporaba na lastno odgovornost!"
-
-#: ../libpurple/plugins/mono/loader/mono.c:217
+"OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. "
+"Uporaba na lastno odgovornost!"
+
 msgid "Mono Plugin Loader"
 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 vtičnike .NET skupaj z Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Dodaj novo vrstico v sporočila"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Dodaj novo vrstico v klepetih"
 
@@ -3769,86 +2492,59 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nova vrstica"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Prikazanemu sporočilu na začetek pripne prazno vrstico."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
-msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
-msgstr "Sporočilom na začetek doda prazno vrstico, tako da se preostanek sporočila v oknu pogovora izpiše pod pojavnim imenom."
-
-#: ../libpurple/plugins/offlinemsg.c:23
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr ""
+"Sporočilom na začetek doda prazno vrstico, tako da se preostanek sporočila v "
+"oknu pogovora izpiše pod pojavnim imenom."
+
 msgid "Offline Message Emulation"
 msgstr "Emulacija nepovezovalnega sporočila"
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Shrani sporočila, poslana neprijavljenemu uporabniku, kot opozorilo."
 
-#: ../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 "Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/izbrišete s pogovornim oknom `Opozorilo prijatelja'."
-
-#: ../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:160
+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'."
+
+#, 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?"
+
 msgid "Offline Message"
 msgstr "Brezpovezavno sporočilo"
 
-#: ../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:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113
-#: ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307
-#: ../pidgin/gtkrequest.c:270
+msgstr ""
+"Opozorilo lahko uredite/izbrišete v pogovornem oknu `Opozorila prijateljev'"
+
 msgid "Yes"
 msgstr "Da"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:547
-#: ../libpurple/protocols/msnp9/msn.c:563
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114
-#: ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308
-#: ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Ne"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Shrani brezpovezavna sporočila v opozorilo"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne sprašuj. Vedno shrani v opozorilo."
 
@@ -3858,47 +2554,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Nalagalnik vtičnikov Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603
-#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Doda podporo nalaganja vtičnikov v programskem jeziku perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Telepatski način"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Telepatski način za dohodne pogovore"
 
-#: ../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 "Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki sporočati. To deluje za AIM, ICQ, XMPP, Sametime in Yahoo!"
-
-#: ../libpurple/plugins/psychic.c:72
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Povzroči pojavitev pogovornih oken, ko vam začnejo drugi uporabniki "
+"sporočati. To deluje za AIM, ICQ, XMPP, Sametime in Yahoo!"
+
 msgid "You feel a disturbance in the force..."
 msgstr "Občutite motnjo v Sili (saj veste, Vojna zvezd) ..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Dovoli le uporabnikom s seznama prijateljev"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Onemogoči ob odsotnosti"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Prikaži obvestilno sporočilo v pogovorih"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Dvigni telepatske pogovore"
 
@@ -3908,7 +2597,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Preizkus signalov"
 
@@ -3916,8 +2604,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Preveri vse ukaze, da se prepriča o delujoči povezavi."
 
@@ -3927,7 +2613,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Enostavni vtičnik"
 
@@ -3935,14 +2620,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Preveri večino stvari, če delujejo."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Digitalna potrdila X.509"
 
@@ -3952,7 +2633,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3960,8 +2640,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Omogoča podporo SSL preko GNUTLS."
 
@@ -3971,7 +2649,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3979,8 +2656,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Omogoča podporo SSL preko Mozilla NSS."
 
@@ -3990,7 +2665,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3998,49 +2672,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Omogoča ovojnico za knjižnice s podporo SSL."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s se je vrnil."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s je zdaj odsoten."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s je nedejaven."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ni več nedejaven."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s se je prijavil(a)."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Obvesti, ko"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "postaja prijatelj _odsoten"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "postaja prijatelj _nedejaven"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "_se prijatelj prijavi/odjavi"
 
@@ -4050,7 +2713,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Obvestila o stanjih prijateljev"
 
@@ -4058,71 +2720,55 @@
 #. *< version
 #. *  summary
 #. *  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."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
 msgstr "V pogovornem oknu obvešča o spremembah stanja vaših prijateljev."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Nalaganje vtičnikov Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425
-#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Omogoča podporo nalaganja vtičnikov Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-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 vtičnike TCL, namestite ActiveTCL z naslova http://www.activestate.com\n"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:101
-msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
-msgstr "Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto zastavljena vprašanja na naslovu: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging za več podrobnosti."
-
-#: ../libpurple/protocols/bonjour/bonjour.c:120
+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 vtičnike TCL, "
+"namestite ActiveTCL z naslova http://www.activestate.com\n"
+
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto "
+"zastavljena vprašanja na naslovu: http://developer.pidgin.im/wiki/Using%"
+"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging za več podrobnosti."
+
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:147
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Povezave s krajevnim strežnikom mDNS ni mogoče vzpostaviti. Ali je strežnik sploh zagnan?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+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:392
-#: ../libpurple/protocols/bonjour/bonjour.c:698
-#: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1003
 msgid "First name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:701
-#: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Last name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1329
-#: ../libpurple/protocols/jabber/buddy.c:1339
-#: ../libpurple/protocols/jabber/buddy.c:2223
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "Račun AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "Račun XMPP"
 
@@ -4136,431 +2782,256 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Vtičnik za protokol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Vijolična oseba"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:704
-#: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:995
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s je zaprl pomenek."
 
-#: ../libpurple/protocols/bonjour/jabber.c:457
-#: ../libpurple/protocols/bonjour/jabber.c:522
-#: ../libpurple/protocols/bonjour/jabber.c:567
-#: ../libpurple/protocols/bonjour/jabber.c:744
-#: ../libpurple/protocols/bonjour/jabber.c:762
 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:661
 msgid "Cannot open socket"
 msgstr "Vtičnice ni mogoče odpreti"
 
-#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "Napaka pri nastavljanju možnosti vtičnice"
 
-#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Poslušanje vtičnice ni možno"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Napaka pri komunikaciji s krajevnim mDNSReponderjem."
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1851
 msgid "Invalid proxy settings"
 msgstr "Neveljavne nastavitve posredovalnega strežnika"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1851
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "Bodisi ime strežnika bodisi vrata, ki ste ju navedli za posredovalni strežnik, so neveljavna."
-
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Bodisi ime strežnika bodisi vrata, ki ste ju navedli za posredovalni "
+"strežnik, so neveljavna."
+
 msgid "Token Error"
 msgstr "Napaka žetona"
 
-#: ../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 "Ni mogoče prenesti žetona.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267
-#: ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Seznam prijateljev je prazen, v datoteko ni bilo nič zapisanega."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Seznam prijateljev je bil uspešno shranjen!"
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Seznama prijateljev za %s ni mogoče zapisati v %s"
 
-#: ../libpurple/protocols/gg/gg.c:303
-#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Seznama prijateljev ni mogoče naložiti"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Nalaganje seznama prijateljev ..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Seznam prijateljev je bil uspešno naložen"
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Shrani seznam prijateljev ..."
 
-#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Izpolnite polja za registracijo."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Gesli se ne ujemata."
 
-#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov račun Gadu-Gadu je registriran"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Registracija je uspela!"
 
-#: ../libpurple/protocols/gg/gg.c:483
-#: ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:978
-#: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:1769
 msgid "Password"
 msgstr "Geslo"
 
-#: ../libpurple/protocols/gg/gg.c:488
-#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: ../libpurple/protocols/gg/gg.c:493
-#: ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Vnesite trenutni žeton"
 
-#: ../libpurple/protocols/gg/gg.c:499
-#: ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Trenutni žeton"
 
-#: ../libpurple/protocols/gg/gg.c:503
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Prosimo, izpolnite naslednja polja"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/gg/gg.c:1056
-#: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1015
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/oscar/oscar.c:3835
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Kraj"
 
-#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Leto rojstva"
 
-#: ../libpurple/protocols/gg/gg.c:651
-#: ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/msnp9/msn.c:1601
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:233
-#: ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Gender"
 msgstr "Spol"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Moški ali ženska"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Moški"
 
-#: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3765
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Ženska"
 
-#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Le prisoten"
 
-#: ../libpurple/protocols/gg/gg.c:662
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Poišči prijatelje"
 
-#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Spodaj vnesite svoje iskalne pogoje"
 
-#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Izpolnite polja."
 
-#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Vaše veljavno geslo se razlikuje od navedenega."
 
-#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Gesla ni bilo mogoče spremeniti. Prišlo je do napake.\n"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Spremeni geslo za račun Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Geslo je bilo uspešno spremenjeno!"
 
-#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
-#: ../libpurple/protocols/gg/gg.c:800
-#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Spremeni geslo Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Izberite klepet za prijatelja: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881
-#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
-#: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../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/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545
-#: ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Na voljo"
 
 #. 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:1016
-#: ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5735
-#: ../libpurple/protocols/qq/qq.c:181
-#: ../libpurple/protocols/qq/qq.c:285
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3695
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
-#: ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549
-#: ../pidgin/gtkprefs.c:1960
-#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "Odsoten"
 
-#: ../libpurple/protocols/gg/gg.c:1045
-#: ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1048
-#: ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:3743
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/gg/gg.c:1061
-#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Leto rojstva"
 
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "Rezultatov iskanja ni mogoče izpisati."
 
-#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Javni imenik Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Ni najdenih uporabnikov"
 
-#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-#: ../libpurple/protocols/gg/gg.c:1314
-#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Ne morem brati vtičnice"
 
-#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vaš seznam prijateljev je bil prenesen s strežnika."
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Seznam prijateljev prenesen"
 
-#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-#: ../libpurple/protocols/gg/gg.c:1517
-#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Povezava ni uspela."
 
-#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
 
-#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
-#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "S strežnikom niste povezani."
 
-#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
 
-#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Spremeni geslo ..."
 
-#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Izvozi seznam prijateljev na strežnik"
 
-#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Uvozi seznam prijateljev s strežnika"
 
-#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Izbriši seznam prijateljev na strežniku"
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Shrani seznam prijateljev v datoteko ..."
 
-#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
@@ -4575,158 +3046,81 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Vtičnik za protokol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Olepšaj priljubljen program za neposredno sporočanje"
 
-#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:511
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "trenutna tema je: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:515
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "Ni teme"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Vrat za poslušanje ni mogoče odpreti."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Napaka pri prikazovanju MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "MOTD ni na voljo"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Noben MOTD ni povezan s to povezavo."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-#: ../libpurple/protocols/irc/irc.c:129
-#: ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633
-#: ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "Strežnik ni več povezan"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Ogled MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:272
-#: ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 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:332
-#: ../libpurple/protocols/jabber/jabber.c:1343
-#: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1331
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3776
-#: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/zephyr/zephyr.c:1585
-#: ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Povezovanje"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "Povezava do gostitelja ni uspela"
 
-#: ../libpurple/protocols/irc/irc.c:628
-#: ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "Napaka pri branju"
 
-#: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3424
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Tema"
 
@@ -4738,72 +3132,27 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "Vtičnik za protokol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Vtičnik za protokol IRC, ki je manj beden"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965
-#: ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2343
-#: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6747
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5781
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2099
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Strežnik"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968
-#: ../libpurple/protocols/msn/msn.c:2348
-#: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6750
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5786
-#: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1867
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Kodiranje znakov"
 
-#: ../libpurple/protocols/irc/irc.c:974
-#: ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:971
-#: ../libpurple/protocols/jabber/jabber.c:973
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../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:922
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/irc/irc.c:977
-#: ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Resnično ime"
 
@@ -4811,1100 +3160,804 @@
 #. 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:985
 msgid "Use SSL"
 msgstr "Uporabi SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Neveljaven način"
 
-#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "Na kanalu %s ste prepovedani."
 
-#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Prepovedani"
 
-#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Prepovedati %s ni možno: seznam prepovedanih je poln"
 
-#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3733
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Trenutno na"
 
-#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Nedejaven"
 
-#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Prijavljen od"
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Opisni pridevnik:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "Supersploh"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s je spremenil temo kanala na: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s je odstranil temo kanala."
 
-#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Tema za kanal %s je: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Neznano sporočilo '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Neznano sporočilo"
 
-#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "Strežnik IRC strežnik ni prepoznal prejetega sporočila."
 
-#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uporabniki na %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:579
 msgid "Time Response"
 msgstr "Časovni odziv"
 
-#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "Krajevni čas strežnika IRC je:"
 
-#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "Ta kanal ne obstaja"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "ta kanal ne obstaja"
 
-#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "Uporabnik ni prijavljen"
 
-#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "Tak kanal ali vzdevek ne obstaja"
 
-#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "Ni bilo mogoče poslati"
 
-#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Pridruževanje kanalu %s zahteva povabilo."
 
-#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "Samo na povabilo"
 
-#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Brcnil vas je %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:808
-#: ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Brcnil vas je %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "način (%s %s) nastavil %s"
 
-#: ../libpurple/protocols/irc/msgs.c:919
-#: ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "Neveljaven vzdevek"
 
-#: ../libpurple/protocols/irc/msgs.c:921
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
-
-#: ../libpurple/protocols/irc/msgs.c:926
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje neveljavne znake."
-
-#: ../libpurple/protocols/irc/msgs.c:965
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Vaš izbrani vzdevek je strežnik zavrnil. Najverjetneje vsebuje neveljavne "
+"znake."
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Vaše izbrano ime računa je strežnik zavrnil. Najverjetneje vsebuje "
+"neveljavne znake."
+
 msgid "Cannot change nick"
 msgstr "Vzdevka ne morem spremeniti"
 
-#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "Vzdevka ni bilo mogoče spremeniti"
 
-#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Zapustili ste kanal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "Napaka: Neveljaven PONG odgovor strežnika"
 
-#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING odgovor - Zakasnitev: %lu sekund"
 
-#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Ne morete se pridružiti k %s: Potrebna je registracija."
 
-#: ../libpurple/protocols/irc/msgs.c:1122
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne morem se pridružiti kanalu"
 
-#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nadimek ali kanal je trenutno nedostopen."
 
-#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr "Močni udarci od %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "dejanje &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: ../libpurple/protocols/irc/parse.c:123
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite sporočila za vrnitev iz odsotnosti."
-
-#: ../libpurple/protocols/irc/parse.c:124
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"odsoten [sporočilo]:  Nastavite sporočilo za odsotnost ali ne uporabite "
+"sporočila za vrnitev iz odsotnosti."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:  pošlji ukaz chanservu"
 
-#: ../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;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
-
-#: ../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;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje morate biti operater kanala."
-
-#: ../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;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v navedenem ali trenutnem kanalu."
-
-#: ../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;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
-
-#: ../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;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali več kanalov, za ketere lahko po želji navedete tudi ključe."
-
-#: ../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;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to dejanje morate biti operater kanala."
-
-#: ../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:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri strežniki vas lahko med tem odklopijo.</i>"
-
-#: ../libpurple/protocols/irc/parse.c:132
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;vzdevek1&gt; [vzdevek2] ...:  Odstrani status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
+
+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;nick1&gt; [nick2] ...:  Odstrani glasovni status kanala nekomu, "
+"kar mu bo preprečilo oglašanje, ko je kanal moderiran (+m). Za to dejanje "
+"morate biti operater kanala."
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;vzdevek&gt; [soba]: Povabite nekoga, da se vam pridruži v "
+"navedenem ali trenutnem kanalu."
+
+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;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali "
+"več kanalov, za ketere lahko po želji navedete tudi ključe."
+
+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;soba1&gt;[,soba2][,...] [ključ1[,ključ2][,...]]:  Vnesite enega ali "
+"več kanalov, za ketere lahko po želji navedete tudi ključe."
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;vzdevek&gt; [sporočilo]:  Odstranite nekoga iz kanala. Za to "
+"dejanje morate biti operater kanala."
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Prikaži seznam pogovornih sob v omrežju. <i>Opozorilo: nekateri "
+"strežniki vas lahko med tem odklopijo.</i>"
+
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;dejanje za izvedbo&gt;:  Izvedi dejanje."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Pošlji ukaz memoservu"
 
-#: ../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;vzdevek|kanal&gt;:  Nastavi ali razveljavi način uporabnika ali kanala."
-
-#: ../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;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
-
-#: ../libpurple/protocols/irc/parse.c:136
+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;vzdevek|kanal&gt;:  Nastavi ali "
+"razveljavi način uporabnika ali kanala."
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku "
+"(za razliko od kanala)."
+
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  pošlji ukaz nickservu"
 
-#: ../libpurple/protocols/irc/parse.c:139
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;cilj&gt;:  Pošlji uporabniku ali kanalu opozorilo."
 
-#: ../libpurple/protocols/irc/parse.c:140
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
-
-#: ../libpurple/protocols/irc/parse.c:141
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
-
-#: ../libpurple/protocols/irc/parse.c:142
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete "
+"uporabiti."
+
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  pošlji ukaz operservu"
 
-#: ../libpurple/protocols/irc/parse.c:143
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo sporočila."
-
-#: ../libpurple/protocols/irc/parse.c:144
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če uporabnik ni naveden)."
-
-#: ../libpurple/protocols/irc/parse.c:145
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku (za razliko od kanala)."
-
-#: ../libpurple/protocols/irc/parse.c:146
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [soba] [sporočilo]:  Zapusti trenutni ali določen kanal z možnostjo "
+"sporočila."
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [vzdevek]:  Vpraša koliko zaostanka ima uporabnik (ali strežnik, če "
+"uporabnik ni naveden)."
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo "
+"uporabniku (za razliko od kanala)."
+
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
-
-#: ../libpurple/protocols/irc/parse.c:147
+msgstr ""
+"quit [sporočilo]:  Prekinitev povezave s strežnikom z možnostjo sporočila."
+
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Pošlji surov ukaz strežniku."
 
-#: ../libpurple/protocols/irc/parse.c:148
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje morate biti operater kanala."
-
-#: ../libpurple/protocols/irc/parse.c:149
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;vzdevek&gt; [sporočilo]:  Odstrani nekoga iz sobe. Za to dejanje "
+"morate biti operater kanala."
+
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Prikaže trenutni krajevni čas na strežniku IRC."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nova tema]:  Oglejte si ali zamenjajte temo kanala."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi način uporabnika."
-
-#: ../libpurple/protocols/irc/parse.c:152
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Nastavi ali odvzemi način uporabnika."
+
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [vzdevek]: pošlji zahtevo CTCP VERSION uporabniku"
 
-#: ../libpurple/protocols/irc/parse.c:153
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala nekomu. Za to dejanje morate biti operater kanala."
-
-#: ../libpurple/protocols/irc/parse.c:154
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete uporabiti."
-
-#: ../libpurple/protocols/irc/parse.c:155
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;vzdevek1&gt; [vzdevek2] ...:  Podelite status operaterja kanala "
+"nekomu. Za to dejanje morate biti operater kanala."
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;sporočilo&gt;:  Če ne veste, kaj je to, tega verjetno ne morete "
+"uporabiti."
+
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [strežnik] &lt;vzdevek&gt;:  Dobi več informacij o uporabniku."
 
-#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois &lt;vzdevek&gt;:  Dobi več informacij o uporabniku, ki se je odjavil."
-
-#: ../libpurple/protocols/irc/parse.c:521
+msgstr ""
+"whois &lt;vzdevek&gt;:  Dobi več informacij o uporabniku, ki se je odjavil."
+
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Čas odgovora od %s: %lu sekund"
 
-#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING ogdovor"
 
-#: ../libpurple/protocols/irc/parse.c:634
-#: ../libpurple/protocols/irc/parse.c:641
-#: ../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 "Povezava prekinjena."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:732
-#: ../libpurple/protocols/jabber/jabber.c:762
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Improvizirani ukaz ni uspel"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "izvedi"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
-
-#: ../libpurple/protocols/jabber/auth.c:120
+msgstr ""
+"Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
+
 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:323
-#: ../libpurple/protocols/jabber/auth.c:526
-#, 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:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:529
-#: ../libpurple/protocols/jabber/auth.c:720
-#: ../libpurple/protocols/jabber/auth.c:721
+msgstr ""
+"Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
+
+#, 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?"
+
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:653
-#: ../libpurple/protocols/jabber/auth.c:901
-#: ../libpurple/protocols/jabber/auth.c:1050
-#: ../libpurple/protocols/jabber/auth.c:1077
-#: ../libpurple/protocols/jabber/auth.c:1101
-#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Neveljaven odgovor strežnika."
 
-#: ../libpurple/protocols/jabber/auth.c:542
-#: ../libpurple/protocols/jabber/auth.c:733
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
 
-#: ../libpurple/protocols/jabber/auth.c:722
-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:924
-#: ../libpurple/protocols/jabber/auth.c:949
+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?"
+
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "Napaka SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1223
-#: ../libpurple/protocols/sametime/sametime.c:4182
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1235
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "Ime"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1031
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "Naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr "Okraj"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "Regija"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1299
-#: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Država"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1310
-#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "Funkcija"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1254
-#: ../libpurple/protocols/msn/msn.c:1814
-#: ../libpurple/protocols/msnp9/msn.c:1670
-#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1369
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193
-#: ../pidgin/gtkblist.c:3309
-#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Opis"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "Uredi vCard za XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:726
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: ../libpurple/protocols/jabber/buddy.c:797
-#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "Odjemalec"
 
-#: ../libpurple/protocols/jabber/buddy.c:801
-#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "Operacijski sistem"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Last Activity"
 msgstr "Zadnja dejavnost"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Info"
 msgstr "Podatki iskanja storitev"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Service Discovery Items"
 msgstr "Elementi razpoznave storitev"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Extended Stanza Addressing"
 msgstr "Razširjeno naslavljanje kitic"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat"
 msgstr "Večuporabniški pomenek"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "In-Band Bytestreams"
 msgstr "Bitni tokovi v pasu"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Ad-Hoc Commands"
 msgstr "Improvizirani ukazi"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "PubSub Service"
 msgstr "Storitev PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "SOCKS5 Bytestreams"
 msgstr "Bajtni tokovi SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "Out of Band Data"
 msgstr "Zmanjkalo je pasovnih podatkov"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "In-Band Registration"
 msgstr "Prijava v pasu"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Location"
 msgstr "Lokacija uporabnika"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "User Avatar"
 msgstr "Avatar uporabnika"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Chat State Notifications"
 msgstr "Obvestila o stanjih klepeta"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Software Version"
 msgstr "Programska različica"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
 msgid "Stream Initiation"
 msgstr "Vzpostavitev toka"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#: ../libpurple/protocols/sametime/sametime.c:3285
 msgid "File Transfer"
 msgstr "Prenos datotek"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Mood"
 msgstr "Uporabnikovo počutje"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "User Activity"
 msgstr "Uporabnikova dejavnost"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Entity Capabilities"
 msgstr "Zmožnosti entitete"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "Encrypted Session Negotiations"
 msgstr "Pogajanja šifrirane seje"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "User Tune"
 msgstr "Uporabnikova skladba"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Roster Item Exchange"
 msgstr "Izmenjava elementov seznama"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Reachability Address"
 msgstr "Naslov dosegljivosti"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "User Profile"
 msgstr "Profil uporabnika"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Jingle Audio"
 msgstr "Jingle - zvok"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "User Nickname"
 msgstr "Vzdevek uporabnika"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE UDP"
 msgstr "Jingle - ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle ICE TCP"
 msgstr "Jingle - ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Raw UDP"
 msgstr "Jingle - surovi UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle Video"
 msgstr "Jingle - video"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Jingle DTMF"
 msgstr "Jingle - DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Message Receipts"
 msgstr "Dokazila o prejemu sporočila"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "Public Key Publishing"
 msgstr "Objava javnega ključa"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Chatting"
 msgstr "Uporabnik klepeta"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Browsing"
 msgstr "Uporabnik brska"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Gaming"
 msgstr "Uporabnik igra"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Viewing"
 msgstr "Uporabnik gleda"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Stanza Encryption"
 msgstr "Šifriranje kitic"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Entity Time"
 msgstr "Čas entitete"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Delayed Delivery"
 msgstr "Zakasnjena dostava"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Collaborative Data Objects"
 msgstr "Podatkovni predmeti sodelovanja"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "File Repository and Sharing"
 msgstr "Hramba datotek in skupna raba"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "STUN Service Discovery for Jingle"
 msgstr "Razpoznava storitev STUN za Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Poenostavljeno pogajanje šifrirane seje"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr "Preveri hop"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
-#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
 msgstr "Zmožnosti"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Vir"
 
-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1621
-#: ../libpurple/protocols/jabber/jabber.c:1635
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/jabber/jabber.c:1663
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: ../libpurple/protocols/jabber/buddy.c:1241
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: ../libpurple/protocols/jabber/buddy.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1011
-#: ../libpurple/protocols/oscar/oscar.c:3821
-#: ../libpurple/protocols/oscar/oscar.c:3834
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "Fotografija"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
 msgstr "Prijavi se"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
 msgstr "Odjavi se"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
-#: ../libpurple/protocols/jabber/jabber.c:1620
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../libpurple/protocols/jabber/buddy.c:2048
-#: ../libpurple/protocols/jabber/jabber.c:1662
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5911
-#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2408
-#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2336
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
-
-#: ../libpurple/protocols/jabber/buddy.c:2356
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja "
+"dovoljujejo iskanje z nadomestnimi znaki (%)."
+
 msgid "Directory Query Failed"
 msgstr "Povpraševanje po imeniku ni uspelo"
 
-#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Could not query the directory server."
 msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Ukazi strežniku: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2418
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "Poišči uporabnike XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2429
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:177
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5665
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Išči"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "Vnesite imenik uporabnikov"
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5391
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Soba:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Ročica:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ni veljavno ime sobe"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Neveljavno ime sobe"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ni veljavno ime strežnika"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Neveljavno ime strežnika"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ni veljavna ročica sobe"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Neveljavna ročica sobe"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Napaka pri nastavitvi"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Ni mogoče nastaviti"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Napaka pri nastavitvi sobe"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Te sobe se ne da nastavljati"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Napaka pri registraciji"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Spreminjanje vzdevka v pogovornih sobah ne-MUC ni podprto"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Napaka pri pridobivanju sezama sob"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Neveljaven strežnik"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Vnesite konferenčni strežnik"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Izberite konferenčni strežnik za pogovor"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
-#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Zahtevate šifriranje, vendar to na tem strežniku ni na voljo."
 
-#: ../libpurple/protocols/jabber/jabber.c:269
-#: ../libpurple/protocols/jabber/jabber.c:324
-#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: ../libpurple/protocols/jabber/jabber.c:401
 msgid "Ping timeout"
 msgstr "Časovna prekoračitev pinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:448
-#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: ../libpurple/protocols/jabber/jabber.c:525
-#: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2576
-#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5913,629 +3966,443 @@
 "Povezave s strežnikom ni mogoče vzpostaviti:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:582
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnice"
 
-#: ../libpurple/protocols/jabber/jabber.c:632
-#: ../libpurple/protocols/jabber/jabber.c:1117
 msgid "Invalid XMPP ID"
 msgstr "Neveljaven ID za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti določena."
 
-#: ../libpurple/protocols/jabber/jabber.c:717
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:723
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registracija v %s uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:726
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:734
-#: ../libpurple/protocols/jabber/jabber.c:735
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: ../libpurple/protocols/jabber/jabber.c:753
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registracija z %s uspešno odstranjena"
 
-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:756
 msgid "Unregistration Successful"
 msgstr "Odregistracija uspela!"
 
-#: ../libpurple/protocols/jabber/jabber.c:764
-#: ../libpurple/protocols/jabber/jabber.c:765
 msgid "Unregistration Failed"
 msgstr "Napaka pri odregistraciji"
 
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:932
 msgid "Already Registered"
 msgstr "Že registriran"
 
-#: ../libpurple/protocols/jabber/jabber.c:1019
-#: ../libpurple/protocols/oscar/oscar.c:3823
-#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "Zvezna država"
 
-#: ../libpurple/protocols/jabber/jabber.c:1023
 msgid "Postal code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1027
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1035
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid "Unregister"
 msgstr "Odregistriraj se"
 
-#: ../libpurple/protocols/jabber/jabber.c:1046
-msgid "Please fill out the information below to change your account registration."
-msgstr "Za spremembo registracije svojega računa morate izpolniti spodnja polja."
-
-#: ../libpurple/protocols/jabber/jabber.c:1049
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Za spremembo registracije svojega računa morate izpolniti spodnja polja."
+
 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:1057
-#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Register New XMPP Account"
 msgstr "Registriraj nov račun za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1059
-#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Register"
 msgstr "Registriraj se"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Spremeni registracijo računa za %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1065
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registriraj nov račun za %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Change Registration"
 msgstr "Spremeni registracijo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
-#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "Error unregistering account"
 msgstr "Napaka pri odregistraciji računa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
-#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Account successfully unregistered"
 msgstr "Račun je bil uspešno odregistriran"
 
-#: ../libpurple/protocols/jabber/jabber.c:1347
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1352
 msgid "Initializing SSL/TLS"
 msgstr "Inicializacija SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1356
-#: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1365
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:1459
-#: ../libpurple/protocols/jabber/jabber.c:1917
-#: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/jabber/jabber.c:1998
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Both"
 msgstr "Oboje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "From"
 msgstr "Od"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "To"
 msgstr "Za"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "brez"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1623
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#: ../libpurple/protocols/jabber/jabber.c:1651
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Razpoloženje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/msn/msn.c:642
 msgid "Now Listening"
 msgstr "Zdaj posluša"
 
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Mood Text"
 msgstr "Besedilo razpoloženja"
 
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
-#: ../libpurple/protocols/jabber/jabber.c:1668
 msgid "Allow Buzz"
 msgstr "Dovoli stresanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Artist"
 msgstr "Izvajalec/skladatelj"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune Title"
 msgstr "Naslov skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1688
 msgid "Tune Album"
 msgstr "Album skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Genre"
 msgstr "Žanr skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Comment"
 msgstr "Komentar skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Track"
 msgstr "Sled skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Time"
 msgstr "Čas skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Year"
 msgstr "Letnica skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune URL"
 msgstr "URL skladbe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: ../libpurple/protocols/jabber/jabber.c:1717
-#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1781
-#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Change XMPP Password"
 msgstr "Spremeni geslo XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
-#: ../libpurple/protocols/oscar/oscar.c:6491
-#: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1801
-#: ../libpurple/protocols/oscar/oscar.c:6502
-#: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1806
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Conflict"
 msgstr "Spor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: ../libpurple/protocols/jabber/jabber.c:1905
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
-#: ../libpurple/protocols/jabber/jabber.c:1988
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Malformed XMPP ID"
 msgstr "Nepravilno oblikovan ID za XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: ../libpurple/protocols/jabber/jabber.c:1919
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1921
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
-#: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: ../libpurple/protocols/jabber/jabber.c:1986
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: ../libpurple/protocols/jabber/jabber.c:1990
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1992
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1994
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1996
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: ../libpurple/protocols/jabber/jabber.c:2002
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: ../libpurple/protocols/jabber/jabber.c:2004
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: ../libpurple/protocols/jabber/jabber.c:2006
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2008
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:2012
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: ../libpurple/protocols/jabber/jabber.c:2014
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: ../libpurple/protocols/jabber/jabber.c:2016
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprta vrsta vrstice"
 
-#: ../libpurple/protocols/jabber/jabber.c:2018
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: ../libpurple/protocols/jabber/jabber.c:2020
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2022
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: ../libpurple/protocols/jabber/jabber.c:2107
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2127
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2132
 #, 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:2151
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Neznana vloga: \"%s\""
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/jabber/jabber.c:2156
 #, 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:2209
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2240
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Uporabnika %s ni mogoče pingniti"
 
-#: ../libpurple/protocols/jabber/jabber.c:2258
-#: ../libpurple/protocols/jabber/jabber.c:2269
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Ni mogoče stresti, saj o uporabniku %s ni ničesar znanega."
 
-#: ../libpurple/protocols/jabber/jabber.c:2264
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Ni mogoče stresti, saj je uporabnik %s morda nepovezan."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Uporabnika %s ni mogoče stresti, ker tega dejanja ne podpira."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2315
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "Buzz"
 msgstr "Tresljaj"
 
-#: ../libpurple/protocols/jabber/jabber.c:2316
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "Uporabnik %s vas je stresel."
 
-#: ../libpurple/protocols/jabber/jabber.c:2316
-#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Stresanje uporabnika %s ..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2347
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2360
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2365
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2371
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2377
 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:2383
-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:2389
-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:2395
+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."
+
+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."
+
 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:2401
 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:2407
 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:2412
-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."
-
-#: ../libpurple/protocols/jabber/jabber.c:2418
+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."
+
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPingni uporabnika/komponento/strežnik."
 
-#: ../libpurple/protocols/jabber/jabber.c:2423
-#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stresite prijatelja, da vas bo opazil"
 
@@ -6549,638 +4416,419 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Vtičnik za protokol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205
-#: ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domena"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Zahtevaj SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3466
-#: ../libpurple/protocols/simple/simple.c:2105
+msgid "Use GSSAPI (Kerberos v5) for authentication"
+msgstr "Uporabi avtentikacijo GSSAPI (Kerberos v5)"
+
 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:231
-#: ../libpurple/protocols/myspace/myspace.c:3463
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1863
-#: ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "Posredovalni strežniki za prenos datotek"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s je zapustil pogovor."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Sporočilo od %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s je spremenil temo na: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Tema je: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Dostava sporočila za uporabnika %s ni uspela: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Napaka sporočila XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koda %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: ../libpurple/protocols/jabber/presence.c:522
-#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:524
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
-
-#: ../libpurple/protocols/jabber/presence.c:530
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli "
+"privzete nastavitve?"
+
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
 
-#: ../libpurple/protocols/jabber/si.c:1009
 #, 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:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
+msgstr ""
+"Ni mogoče poslati datoteke %s, ker uporabnik ne podpira prenosov datotek"
+
 msgid "File Send Failed"
 msgstr "Pošiljanje datoteke ni uspelo"
 
-#: ../libpurple/protocols/jabber/si.c:1073
 #, 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:1075
 #, 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:1077
 #, 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:1092
+msgstr ""
+"Datoteke %s ni mogoče poslati, ker nimate dostopa do stanja uporabnikove "
+"prisotnosti"
+
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Izberite, kateremu viru %s bi radi poslali datoteko"
 
-#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Izberite vir"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Uredi razpoloženje uporabnika"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Izberite svoje razpoloženje s seznama."
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Nastavi"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Nastavi razpoloženje ..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Nastavi uporabniški vzdevek"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Prosimo, vnesite svoj nov vzdevek."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
-msgstr "Ti podatki so vidni vsem stikom s seznama prijateljev, zato izberite nekaj primernega."
-
-#: ../libpurple/protocols/jabber/usernick.c:100
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Ti podatki so vidni vsem stikom s seznama prijateljev, zato izberite nekaj "
+"primernega."
+
 msgid "Set Nickname..."
 msgstr "Nastavi vzdevek ..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Izberi dejanje"
 
-#: ../libpurple/protocols/msn/contact.c:712
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Adresarja MSN ni mogoče pridobiti."
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Težava ujemanja (sinhronizacije) seznama prijateljev pri %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/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 z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja v skupino?"
-
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/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 lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati tega prijatelja?"
-
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, 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 z lokalnega seznama je v skupini \"%s\", ne pa tudi na seznamu strežnika. "
+"Želite dodati tega prijatelja v skupino?"
+
+#, 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 lokalnem seznamu, ne pa tudi na seznamu strežnika. Želite dodati "
+"tega prijatelja?"
+
 msgid "Unable to parse message"
 msgstr "Ni mogoče razčleniti sporočila"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "Skladenjska napaka (verjetno hrošč v odjemalcu)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Neveljaven naslov e-pošte"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "Uporabnik ne obstaja"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Manjka povsem veljavno ime domene"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "Že prijavljeni"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "Neveljavno pojavno ime"
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "Neveljavno prijateljsko ime"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "Seznam poln"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "Že tam"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "Ni na seznamu"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "Uporabnik ni na zvezi"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "Že v stanju"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "Že na sogovornikovem seznamu"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "Preveč skupin"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "Neveljavna skupina"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "Uporabnik ni v skupini"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "Predolgo ime skupine"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Ni mogoče odstraniti skupine nič"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Uporabnika ste želeli dodati v skupino, ki ne obstaja"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Stikalna plošča ni uspela"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "Prenos obvestila ni uspel"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "Obvezna polja niso bila izpolnjena"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Preveč zadetkov za FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "Neprijavljen"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Storitev trenutno ni na voljo"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "Napaka v podatkovni bazi strežnika"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "Ukaz onemogočen"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "Napaka pri operaciji z datoteko"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "Napaka ob rezervaciji pomnilnika"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Strežniku je bila poslana napačna vrednost CHL"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "Strežnik je zaposlen"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "Strežnik je nedostopen"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "Strežnik za obveščanje vrstnikov je nedelujoč"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "Napaka pri povezavi v podatkovno bazo"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Strežnik se zaustavlja (skočite iz ladje!)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "Napaka pri ustvarjanju povezave"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameter je bodisi neznan ali nedovoljen"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "Ni bilo mogoče pisati"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "Preobremenitev seje"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "Uporabnik je preveč aktiven"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "Preveč sej"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "Potni list ni preverjen"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "Neveljavna datoteka s prijatelji"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "Nepričakovano"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Prijateljsko ime se spreminja preveč pogosto"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "Strežnik preveč zaposlen"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1418
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1399
 msgid "Authentication failed"
 msgstr "Overovitev ni uspela"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "Ni dovoljeno brez povezave"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "Brez sprejemanja novih uporabnikov"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Otroški potni list brez privolitve staršev"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Račun še ni bil potrjen"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "Napačna vstopnica"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Neznana koda napake %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN napaka: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128
-#: ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "Pomežikni"
 
-#: ../libpurple/protocols/msn/msn.c:129
-#: ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s vam je pomežiknil(a)."
 
-#: ../libpurple/protocols/msn/msn.c:129
-#: ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "Mežikanje %s ..."
 
-#: ../libpurple/protocols/msn/msn.c:170
-#: ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "Vaše novo MSN poimenovanje je predolgo."
 
-#: ../libpurple/protocols/msn/msn.c:282
-#: ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "Nastavite vaše poimenovanje."
 
-#: ../libpurple/protocols/msn/msn.c:283
-#: ../libpurple/protocols/msnp9/msn.c:280
 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:301
-#: ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Nastavite številko vašega domačega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:318
-#: ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Nastavite številko vašega službenega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Nastavite številko vašega mobilnega telefona."
 
-#: ../libpurple/protocols/msn/msn.c:350
-#: ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Dovoli MSN strani za mobilnike?"
 
-#: ../libpurple/protocols/msn/msn.c:351
-#: ../libpurple/protocols/msnp9/msn.c:348
-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:357
-#: ../libpurple/protocols/msnp9/msn.c:354
+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?"
+
 msgid "Allow"
 msgstr "Dovoli"
 
-#: ../libpurple/protocols/msn/msn.c:358
-#: ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Prepovej"
 
-#: ../libpurple/protocols/msn/msn.c:374
-#: ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."
 
-#: ../libpurple/protocols/msn/msn.c:400
-#: ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Pošlji sporočilo na mobilnik."
 
-#: ../libpurple/protocols/msn/msn.c:402
-#: ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Stran/Poziv"
 
-#: ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "Št. domačega telefona"
 
-#: ../libpurple/protocols/msn/msn.c:669
-#: ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "Št. službenega telefona"
 
-#: ../libpurple/protocols/msn/msn.c:673
-#: ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "Št. mobilnega telefona"
 
-#: ../libpurple/protocols/msn/msn.c:696
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3114
-#: ../libpurple/protocols/yahoo/yahoo.c:3803
 msgid "Be Right Back"
 msgstr "Pridem precej nazaj"
 
-#: ../libpurple/protocols/msn/msn.c:702
-#: ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:598
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3116
-#: ../libpurple/protocols/yahoo/yahoo.c:3806
 msgid "Busy"
 msgstr "Zaposlen"
 
-#: ../libpurple/protocols/msn/msn.c:707
-#: ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
-#: ../libpurple/protocols/yahoo/yahoo.c:3818
 msgid "On the Phone"
 msgstr "Na telefonu"
 
-#: ../libpurple/protocols/msn/msn.c:712
-#: ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3128
-#: ../libpurple/protocols/yahoo/yahoo.c:3824
 msgid "Out to Lunch"
 msgstr "Na kosilu"
 
@@ -7190,369 +4838,200 @@
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:731
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Izvajalec"
 
-#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:750
-#: ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "Nastavi poimenovanje ..."
 
-#: ../libpurple/protocols/msn/msn.c:755
-#: ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Nastavi št. domačega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:759
-#: ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Nastavi št. službenega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:763
-#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Nastavi št. mobilnega telefona ..."
 
-#: ../libpurple/protocols/msn/msn.c:769
-#: ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Omogoči/onemogoči mobilne naprave ..."
 
-#: ../libpurple/protocols/msn/msn.c:774
-#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Dovoli/prepovej mobilne strani ..."
 
-#: ../libpurple/protocols/msn/msn.c:785
-#: ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Odpri prispelo pošto Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:809
-#: ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Pošlji na mobilca"
 
-#: ../libpurple/protocols/msn/msn.c:819
-#: ../libpurple/protocols/msnp9/msn.c:703
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Začni _pogovor"
 
-#: ../libpurple/protocols/msn/msn.c:857
-#: ../libpurple/protocols/msnp9/msn.c:742
 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:887
-#: ../libpurple/protocols/msnp9/msn.c:772
+msgstr ""
+"Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
+
 msgid "Failed to connect to server."
 msgstr "Povezava na strežnik neuspešna."
 
-#: ../libpurple/protocols/msn/msn.c:1671
-#: ../libpurple/protocols/msn/msn.c:2014
-#: ../libpurple/protocols/msnp9/msn.c:1527
-#: ../libpurple/protocols/msnp9/msn.c:1870
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1593
-#: ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Splošno"
 
-#: ../libpurple/protocols/msn/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1600
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Age"
 msgstr "Starost"
 
-#: ../libpurple/protocols/msn/msn.c:1746
-#: ../libpurple/protocols/msnp9/msn.c:1602
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1102
 msgid "Occupation"
 msgstr "Zaposlitev"
 
-#: ../libpurple/protocols/msn/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
-#: ../libpurple/protocols/zephyr/zephyr.c:802
-#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Lokacija"
 
-#: ../libpurple/protocols/msn/msn.c:1752
-#: ../libpurple/protocols/msn/msn.c:1944
-#: ../libpurple/protocols/msn/msn.c:1950
-#: ../libpurple/protocols/msn/msn.c:1957
-#: ../libpurple/protocols/msnp9/msn.c:1608
-#: ../libpurple/protocols/msnp9/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "Hobiji in interesi"
 
-#: ../libpurple/protocols/msn/msn.c:1758
-#: ../libpurple/protocols/msn/msn.c:1878
-#: ../libpurple/protocols/msn/msn.c:1884
-#: ../libpurple/protocols/msn/msn.c:1891
-#: ../libpurple/protocols/msn/msn.c:1899
-#: ../libpurple/protocols/msn/msn.c:1906
-#: ../libpurple/protocols/msnp9/msn.c:1614
-#: ../libpurple/protocols/msnp9/msn.c:1734
-#: ../libpurple/protocols/msnp9/msn.c:1740
-#: ../libpurple/protocols/msnp9/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1755
-#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "Nekaj o meni"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr "Družabno"
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1633
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
 msgid "Marital Status"
 msgstr "Zakonski stan"
 
-#: ../libpurple/protocols/msn/msn.c:1778
-#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "Zanimanja"
 
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "Domači ljubljenčki"
 
-#: ../libpurple/protocols/msn/msn.c:1780
-#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "Domači kraj"
 
-#: ../libpurple/protocols/msn/msn.c:1781
-#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "Dosedanji kraji bivanja"
 
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "Glasba"
 
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/msn/msn.c:1966
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1641
-#: ../libpurple/protocols/msnp9/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1828
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1144
 msgid "Favorite Quote"
 msgstr "Najljubši citat"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "Podatki o stiku"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "Zasebno"
 
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr "Boljša polovica"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "Domači telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "Domači telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1809
-#: ../libpurple/protocols/msnp9/msn.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "Domači naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "Osebni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Domači faks"
 
-#: ../libpurple/protocols/msn/msn.c:1812
-#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "Osebni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1813
-#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "Osebni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1815
-#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "Obletnica"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "Službeno"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Naziv službe"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "Podjetje"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1691
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "Poklic"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "Službeni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "Službeni telefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msnp9/msn.c:1695
-#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "Službeni naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1840
-#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "Službeni mobilni tel."
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "Službeni pager"
 
-#: ../libpurple/protocols/msn/msn.c:1842
-#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Službeni faks"
 
-#: ../libpurple/protocols/msn/msn.c:1843
-#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "Službeni e-naslov"
 
-#: ../libpurple/protocols/msn/msn.c:1844
-#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr "Službeni IM"
 
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#: ../libpurple/protocols/msn/msn.c:1915
-#: ../libpurple/protocols/msn/msn.c:1921
-#: ../libpurple/protocols/msn/msn.c:1928
-#: ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msnp9/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "Priljubljene stvari"
 
-#: ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "Nazadnje osveženo"
 
-#: ../libpurple/protocols/msn/msn.c:1991
-#: ../libpurple/protocols/msnp9/msn.c:1847
-#: ../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:2015
-#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "Uporabnik ni ustvaril javnega profila."
 
-#: ../libpurple/protocols/msn/msn.c:2016
-#: ../libpurple/protocols/msnp9/msn.c:1872
-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:2020
-#: ../libpurple/protocols/msnp9/msn.c:1876
-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:2028
-#: ../libpurple/protocols/msnp9/msn.c:1884
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1246
+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."
+
+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."
+
 msgid "Profile URL"
 msgstr "URL profila"
 
@@ -7566,13 +5045,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2315
-#: ../libpurple/protocols/msn/msn.c:2317
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Vtičnik za protokol Windows Live Messenger"
 
-#: ../libpurple/protocols/msn/msn.c:2352
-#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Uporabi metodo HTTP"
 
@@ -7583,177 +5058,125 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/msn/msn.c:2357
-#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "Strežnik metode HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Pokaži smeške po meri ..."
 
-#: ../libpurple/protocols/msn/msn.c:2370
-#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
-#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Overjanje Windows Live ID: Povezava ni mogoča"
 
 #. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
-msgid "Windows Live ID authentication: cannot find authenticate token in server response"
-msgstr "Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče najti"
-
-#: ../libpurple/protocols/msn/nexus.c:172
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče "
+"najti"
+
 msgid "Windows Live ID authentication Failed"
 msgstr "Overovitev Windows Live ID ni uspela"
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Neznana napaka."
 
-#: ../libpurple/protocols/msn/notification.c:194
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Neznana napaka (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
-#: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Uporabnika ni mogoče dodati na %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ni mogoče blokirati uporabnika %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Uporabniku ni mogoče dovoliti na %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
 
-#: ../libpurple/protocols/msn/notification.c:922
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ni veljaven račun potnega lista."
 
-#: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Storitev je trenutno nedosegljiva."
 
-#: ../libpurple/protocols/msn/notification.c:1276
-#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "Skupine ni mogoče preimenovati"
 
-#: ../libpurple/protocols/msn/notification.c:1331
-#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: ../libpurple/protocols/msn/notification.c:1945
-#: ../libpurple/protocols/msnp9/notification.c:1372
-#, 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"
+#, 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."
+"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] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[1] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minuti. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minuti. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[2] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 msgstr[3] ""
-"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
+"Strežnik MSN se bo izključil zaradi vzdrževalnih del v %d minutah. Ob tem "
+"boste samodejno odjavljeni.  Prosimo zaključite vse pogovore, ki so v teku.\n"
 "\n"
 "Po zaključenih vzdrževalnih delih se boste lahko uspešno prijavili."
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "Ni se mogoče povezati"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Napaka pri branju"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7762,135 +5185,92 @@
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Strežnik ne podpira tega protokola."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Napaka pri parsanju HTTP."
 
-#: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Prijavili ste se z druge lokacije."
 
-#: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
-
-#: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:322
+msgstr ""
+"Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
+
 msgid "The MSN servers are going down temporarily."
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ni možno overoviti: %s"
 
-#: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:333
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in poskusite znova."
-
-#: ../libpurple/protocols/msn/session.c:403
-#: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/msnp9/session.c:357
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in "
+"poskusite znova."
+
 msgid "Handshaking"
 msgstr "Rokovanje"
 
-#: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Pričetek overovitve"
 
-#: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Pridobivanje piškotka"
 
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Pošljanje piškotka"
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Stran od računalnika"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Na telefonu"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Na kosilu"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
-
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+msgstr ""
+"Sporočila morda ni bilo poslano, ker je prišlo do časovne prekoračitve:"
+
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Sporočila ni mogoče poslati, saj ni dovoljeno v nevidnem stanju:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Sporočila ni mogoče poslati, saj uporabnik ni na zvezi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Sporočilo ni bilo poslano, ker je prišlo do napake v povezavi:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:428
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Sporočila ni mogoče poslati, saj je poslano prehitro:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:432
-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 "Sporočila ni mogoče poslati, ker ni bilo mogoče vzpostaviti seje s strežnikom. To je najverjetneje težava strežnika, poskusite znova v nekaj minutah:"
-
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
-msgid "Message could not be sent because an error with the switchboard occurred:"
+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 ""
+"Sporočila ni mogoče poslati, ker ni bilo mogoče vzpostaviti seje s "
+"strežnikom. To je najverjetneje težava strežnika, poskusite znova v nekaj "
+"minutah:"
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "Sporočila ni bilo poslano, ker je prišlo do napake v stikalni plošči:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:447
 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/userlist.c:243
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/msn/userlist.c:312
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
@@ -7898,18 +5278,13 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ni bilo mogoče dodati."
 
-#: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "Navedeno pojavno ime ni veljavno."
 
-#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "Vas ima"
 
@@ -7923,274 +5298,218 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2170
-#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "Vtičnik za protokol MSN"
 
-#: ../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:345
+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."
+
 msgid "Reading challenge"
 msgstr "Branje izziva"
 
-#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr "Nepričakovana dolžina izziva strežnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "Prijavljanje"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
 #, 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)"
+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:1365
 msgid "New mail messages"
 msgstr "Nova prejeta sporočila"
 
-#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "Novi komentarji na blogu"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "Novi komentarji profila"
 
-#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "Nove zahteve prijateljev!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "Novi komentarji slike"
 
-#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1585
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - Uporabniško ime ni določeno"
 
-#: ../libpurple/protocols/myspace/myspace.c:1586
 msgid "You appear to have no MySpace username."
 msgstr "Kot kaže, nimate uporabniškega imena MySpace."
 
-#: ../libpurple/protocols/myspace/myspace.c:1587
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Ga želite zdaj določiti? (Pozor: TEGA NI MOGOČE SPREMENITI!)"
 
 #. 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:1611
-#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libpurple/protocols/myspace/myspace.c:1846
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1868
-#, c-format
-msgid "%s Your password is %d characters, greater than the expected maximum length of %d for MySpaceIM. Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
-msgstr "%s Vaše geslo ima %d znakov, več kot je dovoljenih %d znakov za MySpaceIM. Skrajšajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword in poskusite znova."
-
-#: ../libpurple/protocols/myspace/myspace.c:1891
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+"%s Vaše geslo ima %d znakov, več kot je dovoljenih %d znakov za MySpaceIM. "
+"Skrajšajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword in poskusite znova."
+
 msgid "MySpaceIM Error"
 msgstr "Napaka MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
-#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "Prijatelja ni bilo mogoče dodati"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "Ukaz 'addbuddy' ni uspel."
 
-#: ../libpurple/protocols/myspace/myspace.c:2103
-#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr "ukaz persist ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "Uporabnik ne obstaja: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
 msgstr "Ogled uporabnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
-#: ../libpurple/protocols/myspace/myspace.c:2348
-#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "Prijatelja ni bilo mogoče odstraniti"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "ukaz 'delbuddy' ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr "ukaz blocklist ni uspel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr "Neveljaven vnosni pogoj"
 
-#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Read buffer full (2)"
 msgstr "Bralni predpomnilnik je poln (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "Sporočila ni mogoče razčleniti"
 
-#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
 msgstr "Prijatelji za klepet"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
-#, 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:2932
+#, 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)"
+
 msgid "Add contacts from server"
 msgstr "Dodaj stike s strežnika"
 
-#: ../libpurple/protocols/myspace/myspace.c:2984
-#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "Dodaj prijatelje z MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "Uvoz prijateljev ni uspel"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "Poišči prijatelje ..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
 msgstr "Spremeni pojavno ime ..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "Upravljač za URL-je \"myim\""
 
-#: ../libpurple/protocols/myspace/myspace.c:3346
 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:3347
+msgstr ""
+"Za odpiranje tega URL-ja myim ni mogoče najti ustreznega računa MySpaceIM."
+
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Omogoči pravi račun MySpaceIM in poskusi znova."
 
-#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr "Pokaži zaslonsko ime v besedilu stanja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr "Pokaži naslov v besedilu stanja"
 
-#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "Pošlji smejčke"
 
-#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "Ločljivost zaslona (točk na palec)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "Osnovna velikost pisave (točke)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:790
-#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Uporabnik"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Naslov"
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Skladba"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Skupno prijateljev"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Različica odjemalca"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "Uporabniško ime ni določeno"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Določite uporabniško ime"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr "Vnesite uporabniško ime za preverjanje njegove dostopnosti:"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Uporabniško ime je na voljo"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "To uporabniško ime je na voljo. Ga želite nastaviti?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "KO JE ENKRAT NASTAVLJENO, TEGA NI MOGOČE SPREMENITI!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "To uporabniško ime ni na voljo."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Prosimo, poskusite z drugim uporabniškim imenom:"
 
@@ -8200,32 +5519,25 @@
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Usekaj"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "Uporabnik %s vas je usekal!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "Uporabnik %s bo ravnokar usekan ..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Pribij"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s vas je pribil(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "Pribijanje uporabnika %s ..."
@@ -8233,76 +5545,61 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Zažgi"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "Uporabnik %s vas je zažgal!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Zažiganje uporabnika %s ..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Cmokni"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "Uporabnik %s vas je cmoknil!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "Cmokanje uporabnika %s ..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Objemi"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s vas je objel(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "Objemanje uporabnika %s ..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Klofuta"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s vas je klofnil(a)!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "Klofutanje uporabnika %s ..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Brcni v ta zadnjo"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "Uporabnik %s vas je brcnil v ta zadnjo!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "Brcanje uporabnika %s v ta zadnjo ..."
@@ -8310,16 +5607,13 @@
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "Daj roko"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "Uporabnik %s vam je dal roko!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Dajanje roke uporabniku %s ..."
@@ -8327,16 +5621,13 @@
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Povleci za nos"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "Uporabnik %s vas je povlekel za nos!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "Vlečenje za nos uporabnika %s ..."
@@ -8348,244 +5639,200 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Pokaži osle"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "Uporabnik %s vam je pokazal osle."
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Kazanje oslov uporabniku %s ..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Zahtevani parametri niso podani"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Pisanje v omrežje ni možno"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Branje iz omrežja ni možno"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Napaka pri komunikaciji s strežnikom"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konference ni mogoče najti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferenca ne obstaja"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Mapa s tem imenom že obstaja"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Ni podprto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Geslo je poteklo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Neveljavno geslo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Uporabnika ni mogoče najti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Račun je bil onemogočen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Strežnik ni mogel dostopiti do mape"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Vaš sistemski skrbnik je to možnost onemogočil"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Strežnik ni na voljo; poskusite pozneje"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Stika ni mogoče dodati v isto mapo dvakrat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Vas ni mogoče dodati"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Glavni arhiv je narobe nastavljen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Neveljavno pojavno ime ali geslo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Gostitelja pojavnega imena, ki ste ga vnesli, ni mogoče prepoznati"
 
-#: ../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 "Vaš račun je bil onemogočen, ker ste vnesli preveč napačnih gesel"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Iste osebe ne morete dvakrat dodati pomenku"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Dosegli ste mejo števila dovoljenih stikovstikov"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Vnesli ste napačno pojavno ime"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Med posodabljanjem mape je prišlo do napake"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Nezdružljiva različica protokola"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Uporabnik vas je zavrnil"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom hkrati"
-
-#: ../libpurple/protocols/novell/nmuser.c:1953
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Ta preskusna različica ne dovoljuje prijave več kot desetim uporabnikom "
+"hkrati"
+
 msgid "The user is either offline or you are blocked"
 msgstr "Uporabnike ni na zvezi ali pa ste zavrnjeni"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Prijava spodletela (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:404
+msgstr ""
+"Sporočila ni mogoče poslati. Ni mogoče dobiti podrobnosti za uporabnika (%s)."
+
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Sporočila (%s) ni mogoče poslati."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Ni bilo moč povabiti uporabnika (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Sporočila ni mogoče poslati %s. Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Sporočila ni bilo moč poslati. Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
-#, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Uporabnika %s ni mogoče premakniti v mapo %s na seznamu nedejavnih na strežniku. Napaka pri usvarjanju mape (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:640
-#, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape na strežniku (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:713
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Uporabnika %s ni mogoče premakniti v mapo %s na seznamu nedejavnih na "
+"strežniku. Napaka pri usvarjanju mape (%s)."
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"Ni bilo moč dodati %s na vaš seznam prijateljev. Napaka pri ustvarjanju mape "
+"na strežniku (%s)."
+
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Podrobnosti za uporabnika %s (%s) ni moč dobiti."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Uporabnika ni moč dodati na seznam zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s ni moč dodati na seznam zavrnjenih (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s ni moč dodati na seznam dovoljenih (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s ni moč odstraniti s seznama zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ni mogoče spremeniti strežniških nastavitve zasebnosti (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Ni mogoče ustvariti konference (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Napaka pri komunikaciji s strežnikom. Zapiranje povezave."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefonska številka"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Osebni naziv"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "StojPošta"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "Uporabniška št."
 
@@ -8595,37 +5842,29 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Polno ime"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Konferenca GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s je bil povabljen na ta pomenek."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Povabilo na pomenek"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8636,28 +5875,27 @@
 "\n"
 "Poslano: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
 
-#: ../libpurple/protocols/novell/novell.c:2085
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
 
-#: ../libpurple/protocols/novell/novell.c:2185
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se želite povezati."
-
-#: ../libpurple/protocols/novell/novell.c:2214
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se "
+"želite povezati."
+
 msgid "Error. SSL support is not installed."
 msgstr "Napaka. Podpora SSL ni nameščena."
 
-#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -8671,47 +5909,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3536
-#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Vtičnik za protokol Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Naslov strežnika"
 
-#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Pogovorni sobi se ni mogoče pridružiti"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Neveljavno ime sobe"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2487
-#: ../libpurple/protocols/yahoo/yahoo.c:2655
-#: ../libpurple/protocols/yahoo/ycht.c:482
-#: ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1135
-#: ../libpurple/proxy.c:1244
-#: ../libpurple/proxy.c:1344
-#: ../libpurple/proxy.c:1472
 msgid "Server closed the connection."
 msgstr "Strežnik je zaprl povezavo."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
-#: ../libpurple/protocols/yahoo/yahoo.c:2648
-#: ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1147
-#: ../libpurple/proxy.c:1256
-#: ../libpurple/proxy.c:1356
-#: ../libpurple/proxy.c:1484
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8720,12 +5935,6 @@
 "Izgubljena povezava s strežnikom:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1164
-#: ../libpurple/proxy.c:1269
-#: ../libpurple/proxy.c:1368
-#: ../libpurple/proxy.c:1440
-#: ../libpurple/proxy.c:1497
 msgid "Received invalid data on connection with server."
 msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
 
@@ -8739,8 +5948,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Vtičnik za protokol AIM"
 
@@ -8754,292 +5961,223 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Vtičnik za protokol ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Oddaljeni uporabnik je zaprl povezavo."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Izgubljena povezava z oddaljenim uporabnikom:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Vzpostavljeno neposredno sporočanje"
 
-#: ../libpurple/protocols/oscar/odc.c:600
-#, c-format
-msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
-msgstr "Uporabnik %s vam je želel poslati datoteko %s, vendar dovoljujemo le prenos datotek do velikosti %s prek neposrednih sporočil.  Poskusite raje s funkcijo prenosa datotek.\n"
-
-#: ../libpurple/protocols/oscar/oft.c:656
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"Uporabnik %s vam je želel poslati datoteko %s, vendar dovoljujemo le prenos "
+"datotek do velikosti %s prek neposrednih sporočil.  Poskusite raje s "
+"funkcijo prenosa datotek.\n"
+
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "Neveljaven SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Prenos do gostitelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Prenos do odjemalca"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Storitev nedefinirana"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "Zastarel SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Gostitelj ne podpira"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Odjemalec ne podpira"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Odjemalec je zavrnil"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Odgovor prevelik"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Odgovori so se izgubili"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Zahteva zavrnjena"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Odkrit SNAC podatek"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Premalo pravic"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "V lokalnem dovoljenju/prepovedi"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "Preveč zloben (pošiljatelj)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "Too evil (receiver)"
 msgstr "Preveč zloben (prejemnik)"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Uporabnik začasno ni dostopen"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "Ni zadetka"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Prekoračitev seznama"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Zahteva nejasna"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Čakalna vrsta je polna"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "Na omrežju AOL ni dovoljeno"
 
-#: ../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 "(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev svojega računa AIM/ICQ.)"
-
-#: ../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 "(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane različni kodni strani ali pa ima %s hroščavega odjemalca.)"
+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 ""
+"(Pri sprejemu tega sporočila je prišlo do napake.  Prijatelj, s katerim se "
+"pogovarjate, je najbrž uporabil drugo kodiranje od pričakovanega.  Če veste, "
+"za katero kodiranje gre, ga lahko navedete v naprednih možnostih nastavitev "
+"svojega računa AIM/ICQ.)"
+
+#, 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 ""
+"(Pri prejemu tega sporočila je prišlo do napake. Vi in %s imata izbrane "
+"različni kodni strani ali pa ima %s hroščavega odjemalca.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Ikona prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Glasovno"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "Neposredni pogovor AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Igre"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Dodatki"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Pošlji seznam prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "Neposredna povezava ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP uporabnik"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ strežniški posrednik"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Star ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian kodiranje"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Varnost vključena"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Video.pomenek"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Video v živo"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Not Available"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Occupied"
 msgstr "Zaseden"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Zaveden interneta"
 
-#: ../libpurple/protocols/oscar/oscar.c:736
-#: ../libpurple/protocols/qq/qq.c:184
-#: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3132
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557
-#: ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "Neviden"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3740
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "Naslov IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Warning Level"
 msgstr "Stopnja opozoril"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9048,7 +6186,6 @@
 "Povezava z overovitvenim strežnikom ni uspela:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9057,164 +6194,136 @@
 "Povezava na strežnik BOS ni uspela:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "Pojavno ime poslano"
-
-#: ../libpurple/protocols/oscar/oscar.c:1047
+msgid "Username sent"
+msgstr "Uporabniško ime poslano"
+
 msgid "Connection established, cookie sent"
 msgstr "Povezava vzpostavljena, piškotek poslan"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#: ../libpurple/protocols/oscar/oscar.c:1302
-#, 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 "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."
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je uporabniško 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."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1388
-#: ../libpurple/protocols/yahoo/yahoo.c:2109
-msgid "Invalid screen name."
-msgstr "Neveljavno pojavno ime."
-
-#: ../libpurple/protocols/oscar/oscar.c:1394
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+msgid "Invalid username."
+msgstr "Neveljavno uporabniško ime."
+
 msgid "Incorrect password."
 msgstr "Neveljavno geslo."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1406
-#: ../libpurple/protocols/oscar/oscar.c:1415
-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 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
+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 ""
+"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
+"poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga pri %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1448
+msgstr ""
+"Različica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga "
+"pri %s"
+
 msgid "Could Not Connect"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
-#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:2342
-#: ../libpurple/protocols/oscar/oscar.c:5988
-#: ../libpurple/protocols/oscar/oscar.c:6269
-#: ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "V _redu"
 
-#: ../libpurple/protocols/oscar/oscar.c:1530
-#, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC dokler to ni popravljeno. Preverite %s za posodobitve."
-
-#: ../libpurple/protocols/oscar/oscar.c:1533
-#: ../libpurple/protocols/oscar/oscar.c:1577
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC "
+"dokler to ni popravljeno. Preverite %s za posodobitve."
+
 msgid "Unable to get a valid AIM login hash."
 msgstr "Veljavnega prijavnega izvlečka za AIM ni mogoče pridobiti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1574
-#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
 
-#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr "Veljavnega prijavnega izvlečka ni mogoče pridobiti."
 
-#: ../libpurple/protocols/oscar/oscar.c:1706
 msgid "Password sent"
 msgstr "Geslo poslano"
 
-#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "Povezave ni mogoče inicializirati"
 
-#: ../libpurple/protocols/oscar/oscar.c:2251
 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:2291
 msgid "Authorization Request Message:"
 msgstr "Sporočilo o zahtevi po pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "Prosim za pooblastilo!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2333
-#: ../libpurple/protocols/oscar/oscar.c:2341
-#: ../libpurple/protocols/oscar/oscar.c:2468
-#: ../libpurple/protocols/oscar/oscar.c:5360
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
-#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "Sporočilo o neodobrenem pooblastilu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev z naslednjim razlogom:\n"
+"Uporabnik %u je zavrnil zahtevo, da bi ga dodali na svoj seznam prijateljev "
+"z naslednjim razlogom:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr "Overovitev ICQ zavrnjena."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2476
 #, 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:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9227,7 +6336,6 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9240,7 +6348,6 @@
 "Od: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9253,25 +6360,19 @@
 "Sporočilo se glasi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2521
 #, 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:2527
 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:2532
-#: ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "_Zavrni"
 
-#: ../libpurple/protocols/oscar/oscar.c:2657
 #, 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."
@@ -9280,7 +6381,6 @@
 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:2666
 #, 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."
@@ -9289,16 +6389,16 @@
 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:2675
-#, 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."
+#, 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] "Spregledali ste %hu sporočil od %s, ker so bila neveljavna."
 msgstr[1] "Spregledali ste %hu sporočilo od %s, ker je bilo neveljavno."
 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:2684
 #, 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."
@@ -9307,7 +6407,6 @@
 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:2693
 #, 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."
@@ -9316,7 +6415,6 @@
 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:2702
 #, 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."
@@ -9327,448 +6425,424 @@
 
 #  Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ni moč poslati sporočila: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "Neznan vzrok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2860
-#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ni moč poslati sporočila k %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "Na zvezi od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2962
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Member Since"
 msgstr "Član od"
 
-#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Available Message"
 msgstr "Sporočilo o dosegljivosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "Vaša povezava z AIM je morda prekinjena."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3289
-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:3453
-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:3538
-#: ../libpurple/protocols/toc/toc.c:977
+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.]"
+
+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."
+
 #, 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:3762
-#: ../libpurple/protocols/silc/util.c:596
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "Osebna spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
-#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Dodatne informacije"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
-#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/oscar/oscar.c:3848
 msgid "Division"
 msgstr "Oddelek"
 
-#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
 msgstr "Delovno mesto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "Spletna stran"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Work Information"
 msgstr "Informacije o zaposlitvi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "Pojavno sporočilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "Naslednja pojavna imena so povezana z %s"
-msgstr[1] "Naslednje pojavno ime je povezano z %s"
-msgstr[2] "Naslednji pojavni imeni sta povezani z %s"
-msgstr[3] "Naslednja pojavna imena so povezana z %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:3955
-msgid "Screen name"
-msgstr "Pojavno ime"
-
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "Naslednja uporabniška imena so povezana z %s"
+msgstr[1] "Naslednje uporabniško ime je povezano z %s"
+msgstr[2] "Naslednji uporabniški imeni sta povezani z %s"
+msgstr[3] "Naslednja uporabniška imena so povezana z %s"
+
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Za dani elektronski naslov %s ni zadetkov."
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
 #, 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:4004
 msgid "Account Confirmation Requested"
 msgstr "Potrditev računa je bila zahtevana"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
-msgid "Error Changing Account Info"
-msgstr "Napaka pri spreminjanju podatkov o računu"
-
-#: ../libpurple/protocols/oscar/oscar.c:4038
-#, 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:4041
-#, 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:4044
-#, 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:4047
-#, 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:4050
-#, 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:4053
-#, 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:4056
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Napaka 0x%04x: Uporabniškega imena ni bilo mogoče oblikovati, ker se "
+"zahtevano ime razlikuje od izvirnega."
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+"Napaka 0x%04x: Uporabniškega imena ni bilo mogoče oblikovati, ker je "
+"neveljavno."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Napaka 0x%04x: Uporabniškega imena ni bilo mogoče oblikovati, ker je "
+"zahtevano ime predolgo."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this username."
+msgstr ""
+"Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker je na čakanju za to "
+"uporabniško ime že en zahtevek."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+"Napaka 0x%04x: E-naslova ni mogoče spremeniti, ker ima podani naslov že "
+"preveč računov."
+
+#, 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."
+
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Napaka 0x%04x: Neznana napaka."
 
-#: ../libpurple/protocols/oscar/oscar.c:4066
+msgid "Error Changing Account Info"
+msgstr "Napaka pri spreminjanju podatkov o računu"
+
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Elektronski naslov za %s je %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "Podatki o računu"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
-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:4520
+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\"."
+
 msgid "Unable to set AIM profile."
 msgstr "Ni mogoče nastaviti AIM profila."
 
-#: ../libpurple/protocols/oscar/oscar.c:4521
-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:4535
-#, 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] "Največja dolžina profila %d bajtov je bila presežena, zato je bil skrajšan."
-msgstr[1] "Največja dolžina profila %d bajt je bila presežena, zato je bil skrajšan."
-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:4540
+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."
+
+#, 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] ""
+"Največja dolžina profila %d bajtov je bila presežena, zato je bil skrajšan."
+msgstr[1] ""
+"Največja dolžina profila %d bajt je bila presežena, zato je bil skrajšan."
+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."
+
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4584
-#, 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] "Največja dolžina sporočila odsotnosti %d bajtov je bila presežena, zato je bilo sporočilo skrajšano."
-msgstr[1] "Največja dolžina sporočila odsotnosti %d bajt je bila presežena, zato je bilo sporočilo skrajšano."
-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:4589
+#, 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] ""
+"Največja dolžina sporočila odsotnosti %d bajtov je bila presežena, zato je "
+"bilo sporočilo skrajšano."
+msgstr[1] ""
+"Največja dolžina sporočila odsotnosti %d bajt je bila presežena, zato je "
+"bilo sporočilo skrajšano."
+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."
+
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:4662
-#, 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:4664
-#: ../libpurple/protocols/oscar/oscar.c:5129
-#: ../libpurple/protocols/oscar/oscar.c:5144
+#, c-format
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames 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 uporabniško 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."
+
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../libpurple/protocols/oscar/oscar.c:4784
-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 minutes."
-msgstr "Strežniki AIM trenutno niso bili zmožni poslati seznama vaših prijateljev. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
-
-#: ../libpurple/protocols/oscar/oscar.c:4979
-#: ../libpurple/protocols/oscar/oscar.c:4981
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/oscar/oscar.c:5212
-#: ../libpurple/protocols/oscar/oscar.c:5217
+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 minutes."
+msgstr ""
+"Strežniki AIM trenutno niso bili zmožni poslati seznama vaših prijateljev. "
+"Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj "
+"urah."
+
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../libpurple/protocols/oscar/oscar.c:5127
-#, 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:5127
-#: ../libpurple/protocols/oscar/oscar.c:5142
+#, 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."
+
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5141
 #, 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:5275
-#, 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:5283
+#, 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?"
+
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5356
 #, 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:5357
+msgstr ""
+"Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
+
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5360
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
+"Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam "
+"prijateljev, ker:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../libpurple/protocols/oscar/oscar.c:5397
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
 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:5672
-#: ../libpurple/protocols/oscar/oscar.c:5677
+msgstr ""
+"Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
+
 msgid "Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
 #, 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:6037
-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:6043
-#: ../libpurple/protocols/oscar/peer.c:1047
+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?"
+
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
 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:6194
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-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:6267
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+"Z oblikovanjem uporabniškega imena lahko spreminjate samo velike črke in "
+"presledke."
+
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
-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:6334
+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.\""
+
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6336
 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:6339
 msgid "_Search"
 msgstr "_Najdi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Set User Info (URL)..."
-msgstr "Nastavi informacije o uporabniku (URL) ..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6508
-msgid "Change Password (URL)"
-msgstr "Spremeni geslo (URL povezava)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6512
-msgid "Configure IM Forwarding (URL)"
-msgstr "Nastavi posredovanje sporočil (URL)"
+msgid "Set User Info (web)..."
+msgstr "Nastavi informacije o uporabniku (splet) ..."
+
+msgid "Change Password (web)"
+msgstr "Spremeni geslo (splet)"
+
+msgid "Configure IM Forwarding (web)"
+msgstr "Nastavi posredovanje sporočil (splet)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../libpurple/protocols/oscar/oscar.c:6754
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9778,409 +6852,306 @@
 "za prenos datotek in neposredno sporočanje\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:699
 #, 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:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Poskus povezave na %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Poskus povezave prek strežnika-prehoda."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, 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:1039
-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."
-
-#: ../libpurple/protocols/qq/buddy_info.c:39
+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."
+
 msgid "Primary Information"
 msgstr "Osnovni podatki"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Osebna predstavitev"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Številka QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Država/Regija"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Pokrajina/Zv. država"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Simbol"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Znak horoskopa"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Krvna skupina"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Srednja šola"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-naslov"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Poštna številka"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobilna št."
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonska št."
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vodnar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Ribi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Oven"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Bik"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Dvojčka"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Rak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Lev"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Devica"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Tehtnica"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Škorpijon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Strelec"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Kozorog"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Podgana"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Govedo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Zajec"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Zmaj"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Kača"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Konj"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Koza"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Opica"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Petelin"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Pes"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Prašič"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Drugo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Spremeni moje podatke"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Posodobi moje podatke"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Vaši podatki so bili posodobljeni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
-#, c-format
-msgid "Setting custom faces is not currently supported. Please choose an image from %s."
-msgstr "Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, izberite sliko iz %s."
-
-#: ../libpurple/protocols/qq/buddy_info.c:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+"Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, "
+"izberite sliko iz %s."
+
 msgid "Invalid QQ Face"
 msgstr "Neveljaven obraz QQ"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Zahtevo uporabnika %d ste zavrnili."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Vnesite svoj razlog:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Zavrni zahtevo"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Oprosti, nisi moj tip ..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Zahteva po dodajanju prijatelja s pooblastilom ni uspela"
 
 #. 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 "Uspešno ste odstranili prijatelja"
 
 #. 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 "Uspešno ste se odstranili s prijateljevega seznama prijateljev"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Uporabnik %d potrebuje avtentikacijo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Vnesite zahtevo tukaj"
 
 #. 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 "Bi bil moj prijatelj?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Pošlji"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "%d ste dodali na svoj seznam prijateljev"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Napaka QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Neveljaven QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID:"
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID skupine"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Avtor"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Opis skupine"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Pooblasti"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Prosimo, vnesite ID zunanje skupine"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Iščete lahko samo stalne skupine QQ\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Uporabnik %d se je prijavil za članstvo v skupini %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Razlog: %s"
 
-#: ../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:211
-#: ../libpurple/protocols/qq/group_opt.c:281
-#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "Operacija QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Odobri"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Vašo zahtevo za pridružitev skupini %d je zavrnil administrator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Vašo zahtevo za pridružitev skupini %d je odobril administrator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Zapustili ste [%d] skupino \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Dodani ste [%d] bili v skupino \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Skupina je bila dodana na vaš seznam prijateljev."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Nisem član(-ica)"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Sem član(ica)"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Prijavljam se za članstvo"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Jaz sem skrbnik"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Neznano stanje"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Ta skupina ne dovoljuje novih članov"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Uspešno ste zapustili skupino"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Pooblaščanje skupine QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Strežnik QQ je sprejel vašo zahtevo za pooblastitev."
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Vnesli ste ID skupine zunaj veljavnega obsega"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Ste prepričani, da želite zapustiti ta Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -10188,162 +7159,120 @@
 "Če ste ustvarjalec, upoštevajte: \n"
 "ta operacija bo spotoma odstranila ta Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Koda [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Napaka skupinske operacije"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:99
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Želite odobriti zahtevo?"
 
-#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Vnesite svoj razlog:"
 
-#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Uspešno ste spremenili člana Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Uspešno ste spremenili podatke Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Uspešno ste ustvarili Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "Želite zdaj nastaviti podrobnosti Qun?"
 
-#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Namestitev"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Sistemsko sporočilo"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Neposrednega sporočila ni bilo mogoče poslati."
 
-#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Napaka pri ohranjanju živega"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
 msgstr "Napaka pri zahtevanju prijavnega žetona"
 
-#: ../libpurple/protocols/qq/login_logout.c:490
 msgid "Unable to login. Check debug log."
 msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
 
-#: ../libpurple/protocols/qq/login_logout.c:493
 msgid "Unable to login"
 msgstr "Prijava ni uspela"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:140
-#: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
-#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Ni se bilo mogoče povezati."
 
-#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Neznano-%d"
 
-#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "Naslov TCP"
 
-#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "Naslov UDP"
 
-#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Raven"
 
-#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Neveljavno ime"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Trenutno povezan</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Zadnja osvežitev</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Način povezovanja</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP strežnika</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Moj javni IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Čas prijave</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP zadnje prijave:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Čas zadnje prijave</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Prijavni podatki"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Nastavi moje podatke"
 
-#: ../libpurple/protocols/qq/qq.c:537
-#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Pokaži prijavne podatke"
 
-#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Zapusti ta QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Blokiraj uporabnika"
 
@@ -10357,333 +7286,272 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726
-#: ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Protokol QQ\tVtičnik"
 
-#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Povezovanje prek TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Napaka vtičnice"
 
-#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "Ni mogoče brati iz vtičnice"
 
-#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "Uporabnik %d je zavrnil datoteko %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Datoteka poslana"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "Uporabnik %d je prekinil prenos %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "Povezava izgubljena"
 
-#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Prijava spodletela, ni odziva!"
 
-#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Ali želite dodati tega prijatelja?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Uporabnik %s vas je dodal"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Ga želite dodati?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s vas [%s] je dodal(a) na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Uuporabnik %s je zavrnil vašo zahtevo."
 
-#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "Uporabnik %s je ugodil vaši zahtevi"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s vas [%s] želi dodati kot prijatelja"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ni na vašem seznamu prijateljev."
 
-#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID skupine zapiskov:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Podatki za skupino %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Informacije o adresarju zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Povabi skupino na konferenčni pogovor ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Pridobi podatke o adresarju zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Pošljanje rokovanja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Čakanje na potrditev rokovanja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Rokovanje potrjeno, pošiljanje prijave"
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Čakanje na potrditev prijave"
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Prijava preusmerjena"
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Prisilno prijavljanje"
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Prijava potrjena"
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Zagon storitev"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
-#, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:1683
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"Upravljalec omrežja Sametime je izdal naslednje obvestilo na strežniku %s"
+
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "Povezava ponovno nastavljena"
 
-#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Napaka pri branju iz vtičnice: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1773
-#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
-#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "Konferenčni pogovor zaprt"
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "Ni moč poslati sporočila: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "Zaprto mesto"
 
-#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "Zvočniki"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3319
-#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "podpira"
 
-#: ../libpurple/protocols/sametime/sametime.c:3324
-#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "Zunanji uporabnik"
 
-#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "Ustvari konferenčni pogovor z uporabnikom"
 
-#: ../libpurple/protocols/sametime/sametime.c:3431
-#, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+#, 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:3435
 msgid "New Conference"
 msgstr "Nov konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "Ustvari"
 
-#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "Konferenčni pogovori na voljo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "Ustvari nov konferenčni pogovor ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "Povabi uporabnika na konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#, 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:3521
+#, 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."
+
 msgid "Invite to Conference"
 msgstr "Povabi na konferenčni pogovor"
 
-#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "Povabi na konferenčni pogovor ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr "Pošlji obvestilo TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
-#: ../pidgin/gtkconv.c:4426
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
-#, 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:3694
+#, 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. "
+
 msgid "Meanwhile Connection Setup"
 msgstr "Namestitev povezave Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "Strežnik Sametime Community ni naveden"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznano (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "Nazadnje znani odjemalec"
 
-#: ../libpurple/protocols/sametime/sametime.c:4355
-#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "Uporabniško ime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4358
-#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr "Vnesli ste dvoumen uporabniški ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
-#, 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:4388
+#, 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."
+
 msgid "Select User"
 msgstr "Izberite uporabnika"
 
-#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "Ni moč dodati uporabnika: ni ga mogoče najti"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
-#, 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:5065
+#, 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."
+
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10692,239 +7560,179 @@
 "Napaka pri branju datoteke %s: \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "Oddaljeno shranjeni seznam prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "Način hrambe seznama prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "Le krajevni seznam prijateljev"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "Spoji seznam prijateljev s strežnikovim"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "Spoji seznam prijateljev s strežnikovim in ga shrani"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "Sinhroniziraj seznam s strežnikom"
 
-#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Uvozi seznam Sametime za račun %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Izvozi seznam Sametime za račun %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "Skupine ni bilo mogoče dodati: že obstaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5364
 #, 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:5367
-#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "Skupine ni mogoče dodati"
 
-#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "Možni zadetki"
 
-#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr "Skupinski rezultati adresarjev zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#, 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:5448
+#, 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."
+
 msgid "Select Notes Address Book"
 msgstr "Izberite adresar zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "Dodajanje skupine ni uspelo: skupina ne obstaja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
-#, 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:5534
+#, 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."
+
 msgid "Notes Address Book Group"
 msgstr "Skupina adresarja zapiskov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
-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:5584
+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."
+
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultati iskanja za '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
-#, 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."
-
-#: ../libpurple/protocols/sametime/sametime.c:5592
-#: ../pidgin/gtknotify.c:770
+#, 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."
+
 msgid "Search Results"
 msgstr "Rezultati iskanja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "Ni zadetkov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
 #, 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:5622
+msgstr ""
+"Imenovalec '%s' se ne ujema z nobenim uporabnikom vaše skupnosti Sametime."
+
 msgid "No Matches"
 msgstr "Ni zadetkov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "Išči uporabnike"
 
-#: ../libpurple/protocols/sametime/sametime.c:5660
-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:5663
+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."
+
 msgid "User Search"
 msgstr "Iskanje uporabnikov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "Uvozi seznam Sametime ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "Izvozi seznam Sametime ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr "Dodaj skupino adresarja zapiskov ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "Iskanje uporabnikov ..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "Prisilna prijava (prezri strežniške preusmeritve)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "Skrij identiteto odjemalca"
 
-#: ../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 "Uporabnik %s ni prisoten v omrežju"
 
-#: ../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 "Pogodba"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Ni mogoče izvesti pogodbe"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Prišlo je do napake med pogodbo"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Pogodba spodletela"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Časovna omejitev med pogodbo potekla"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Pogodba je bila preklicana"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Pogodba se je že začela"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Pogodba se ne more začeti z vami"
 
-#: ../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 "Oddaljen uporabnik ni več prisoten v omrežju"
 
-#: ../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?"
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
 msgstr "Zahteva po pogodbi sprejeta od %s. Želite izvesti pogodbo?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10935,908 +7743,478 @@
 "Oddaljen gostitelj: %s\n"
 "Oddaljena vrata: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Zahteva pogodbe"
 
-#: ../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 z geslom"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Ni mogoče nastaviti ključa IM"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Nastavi geslo IM"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../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 "Dobi javni ključ"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../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 "Javnega ključa ni mogoče dobiti"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Prikaži javni ključ"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Ni mogoče naložiti javnega ključa"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../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 "Informacije o uporabniku"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ni mogoče dobiti informacij o uporabniku"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Prijatelj %s ni zaupljiv"
 
-#: ../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 "Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega ključa.  Uporabite lahko ukaz Dobi javni ključ."
+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 ""
+"Opozoril prijatelja ne morete sprejeti, dokler ne uvozite njegovega javnega "
+"ključa.  Uporabite lahko ukaz Dobi javni ključ."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Prijatelj %s ni prisoten v omrežju"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite Uvozi za uvoz javnega ključa."
-
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Če želite dodati prijatelja, morate uvoziti njegov javni ključ. Kliknite "
+"Uvozi za uvoz javnega ključa."
+
 msgid "_Import..."
 msgstr "_Uvozi ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Izberite ustreznega uporabnika"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
-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 "Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite ustreznega in ga dodajte na seznam prijateljev."
-
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
-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 "Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in ga dodajte na seznam prijateljev."
-
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
+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 ""
+"Najden je bil več kot en uporabnik z enakim javnim ključem. Izberite "
+"ustreznega in ga dodajte na seznam prijateljev."
+
+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 ""
+"Najden je bil več kot en uporabnik z enakim vzdevkom. Izberite ustreznega in "
+"ga dodajte na seznam prijateljev."
+
 msgid "Detached"
 msgstr "Odpeto"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Neurejeno"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Zbudi me"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktiven"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:525
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Vesel"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:527
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Žalosten"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:529
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Jezen"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:531
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:666
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:533
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Osramočen"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:535
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:537
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:539
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Zaspan"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:541
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:676
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Zdolgočasen"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:543
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:678
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Razburjen"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:545
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:680
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Načini uporabnika"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Priljubljen stik"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Priljubljen jezik"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Naprava"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:728
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Časovni pas"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Lokacija"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Ponastavi ključ IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Pogovor z izmenjavo ključev"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Pogovor z geslom"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Dobi javni ključ ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Ubij uporabnika"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Riši po tabli"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Geslo:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "kanal %s ne obstaja v omrežju"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Informacije o kanalu"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Ni mogoče dobiti informacij o kanalu"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Ime kanala:</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>Število uporabnikov:</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>Ustanovitelj kanala:</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>Cifra kanala:</b> %s"
 
 #. 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 kanala:</b> %s"
 
-#: ../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>Tema kanala:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Načini kanala:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Prstni odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Odtis ključa ustanovitelja:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Dodaj javni ključ kanala"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Odpri javni ključ ..."
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Geslo kanala"
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Seznam javnih ključev kanala"
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../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 "Overovitev kanala služi obrambi kanala pred neavtoriziranim dostopom. Overovitev lahko temelji na geslih in digitalnih podpisih. Če je geslo nastavljeno, je potrebno za pridružitev. Če so nastavljeni javni ključi kanala, se mu lahko pridružijo le uporabniki, katerih ključi so na seznamu."
-
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../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 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 ""
+"Overovitev kanala služi obrambi kanala pred neavtoriziranim dostopom. "
+"Overovitev lahko temelji na geslih in digitalnih podpisih. Če je geslo "
+"nastavljeno, je potrebno za pridružitev. Če so nastavljeni javni ključi "
+"kanala, se mu lahko pridružijo le uporabniki, katerih ključi so na seznamu."
+
 msgid "Channel Authentication"
 msgstr "Overovitev kanala"
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Dodaj / odstrani"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Ime skupine"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1163
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Geslo"
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Vnesite ime zasebne skupine kanala %s in njeno geslo."
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Dodaj zasebno skupino kanala"
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Meja uporabnikov"
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Nastavite mejo uporabnikov kanala. Izberite 0 za ponastavitev meje."
 
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Seznam povabljenih"
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Seznam prepovedanih"
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Dodaj zasebno skupino"
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Začasno ponastavi"
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Začasno nastavi"
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Nastavi mejo uporabnikov"
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Ponastavi omejitev teme"
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Nastavi omejitev teme"
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Ponastavi zasebni kanal"
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Nastavi zasebni kanal"
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Ponastavi skrivni kanal"
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Nastavi skrivni kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../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"
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "Preden se pridružite zasebni skupini, se morate pridružiti kanalu %s"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Pridruži se zasebni skupini"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Ni se mogoče pridružiti zasebni skupini"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Ukaz klica"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "Ni mogoče klicati ukaza"
 
-#: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1362
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../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 "Varen prenos datotek"
 
-#: ../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 "Napaka pri prenosu datotek"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Oddaljeno odjavljeni"
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Ni dovoljeno"
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Pogodba ni uspela"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Ustvarjanje povezave ni uspelo"
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Seja za prenos datotek ne obstaja"
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nobena seja prenosa datotek ni aktivna"
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Prenos datotek se je že začel"
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Ni bilo mogoče izvesti pogodbe za prenos datotek"
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Ni bilo mogoče začeti prenosa datotek"
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Ni mogoče poslati datoteke"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Prišlo je do napake"
 
-#: ../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 je spremenil temo kanala <I>%s</I> na: %s"
 
-#: ../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> je nastavil načine kanala <I>%s</I> na: %s"
 
-#: ../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> je odstranil vse načine kanala <I>%s</I>"
 
-#: ../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> je nastavil načine uporabnika <I>%s</I> na: %s"
 
-#: ../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> je odstranil vse načine uporabnika <I>%s</I>"
 
-#: ../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 "Iz <I>%s</I> vas je brcnil uporabnik <I>%s</I> (%s)"
 
-#: ../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 "Ubil vas je %s (%s)"
 
-#: ../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 "Ubil vas je %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Odjava strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Osebni podatki"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Rojstni dan"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Funkcija v službi"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1156
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Enota"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Opomba"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Pridruži se klepetu"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste ustanovitelj kanala <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 "Ustanovitelj kanala na <I>%s</I> je <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
 msgid "Real Name"
 msgstr "Resnično ime"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Besedilo stanja"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Prstni odtis javnega ključa"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Odtis javnega ključa"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Več ..."
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Odpni se od strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Odpenjanje ni možno"
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Ne da se nastaviti teme"
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Vzdevka ni moč spremeniti"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Seznam sob"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Ni mogoče dobiti seznama sob"
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Omrežje je prazno"
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Javni ključ ni bil sprejet"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informacije o strežniku"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Ni moč dobiti informacij o strežniku"
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistika strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Ni moč dobiti statistike strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11871,72 +8249,48 @@
 "Vseh operaterjev strežnikov: %d\n"
 "Vseh operaterjev usmerjevalnikov: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping ni uspel"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Odgovor ping sprejet od strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Ni bilo mogoče ubiti uporabnika"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "OPAZUJ"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Uporabnika ni mogoče opazovati"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Nadaljevalna seja"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Overovljanje povezave"
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Preverjanje javnega ključa strežnika"
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Zahtevano geslo"
 
-#: ../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 "Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu ključu. Želite kljub temu sprejeti ta javni ključ?"
-
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
+#, 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 ""
+"Sprejet javni ključ uporabnika %s. Vaša lokalna kopija ne ustreza temu "
+"ključu. Želite kljub temu sprejeti ta javni ključ?"
+
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Sprejet javni ključ uporabnika %s. Želite sprejeti ta javni ključ?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11949,103 +8303,64 @@
 "%s\n"
 "%s\n"
 
-#: ../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 "Preveri javni ključ"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Pokaži ..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nepodprt tip javnega ključa"
 
-#: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-#: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Izmenjava ključa ni uspela"
 
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1718
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo nove povezave."
-
-#: ../libpurple/protocols/silc/silc.c:373
-#: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:163
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo "
+"nove povezave."
+
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
-#: ../libpurple/protocols/silc/silc.c:455
-#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "Para ključev SILC ni mogoče naložiti"
 
-#: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Ni bilo mogoče ustvariti povezave"
 
-#: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
-#: ../libpurple/protocols/silc/silc.c:559
-#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Napaka pri nalaganju para ključev SILC"
 
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "Vaše trenutno razpoloženje"
 
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "Navadno"
 
-#: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Zaljubljen"
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12053,334 +8368,223 @@
 "\n"
 "Vaša priljubljena metoda stikov"
 
-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:573
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Video-konferenca"
 
-#: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Vaše trenutno stanje"
 
-#: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Storitve na zvezi"
 
-#: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "Naj ostali vidijo, katere storitve uporabljate"
 
-#: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "Naj ostali vidijo, kakšen računalnik uporabljate"
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "Vaša datoteka VCard"
 
-#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Časovni pas (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Atributi stanja uporabnika na zvezi"
 
-#: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:737
-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 "Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim uporabnikom."
-
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:784
-#: ../libpurple/protocols/silc10/silc.c:1421
+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 ""
+"Ostalim uporabnikom lahko dovolite ogled informacij o vašem stanju na zvezi "
+"in osebnih informacij. Izpolnite informacije, ki jih želite pokazati ostalim "
+"uporabnikom."
+
 msgid "Message of the Day"
 msgstr "Sporočilo dneva"
 
-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:779
-#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "S to povezavo ni povezano nobeno sporočilo dneva"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:830
-#: ../libpurple/protocols/silc10/silc.c:874
-#: ../libpurple/protocols/silc10/silc.c:945
-#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Ustvari nov par ključev SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Gesli se ne ujemata"
 
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Ustvarjanje para ključev ni uspelo"
 
-#: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Dolžina ključa"
 
-#: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Geslo (ponovno vtipkajte)"
 
-#: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Ustvari par ključev"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Stanje na zvezi"
 
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Ogled sporočila dneva"
 
-#: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Ustvari par ključev SILC ..."
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Uporabnik <I>%s</I> ni prisoten v omrežju"
 
-#: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Temal je predolga."
 
-#: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Določiti morate vzdevek"
 
-#: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "kanala %s ni mogoče najti"
 
-#: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "načini kanala za %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "načini kanala za %s niso nastavljeni"
 
-#: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Ni mogoče nastaviti načinov za %s"
 
-#: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Neznan ukaz: %s, (morda hrošč v odjemalcu)"
 
-#: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  Zapusti klepet"
 
-#: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  Zapusti klepet"
 
-#: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nova tema&gt;]:  Ogled ali sprememba teme"
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
-
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1605
+msgstr ""
+"join &lt;kanal&gt; [&lt;geslo&gt;]:  Pridruži se klepetu na tem omrežju"
+
 msgid "list:  List channels on this network"
 msgstr "list:  Seznam kanalov na tem omrežju"
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;vzdevek&gt;:  Oglej si informacije vzdevka"
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
-
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1617
+msgstr ""
+"msg &lt;vzdevek&gt; &lt;sporočilo&gt;:  Pošlji zasebno sporočilo uporabniku"
+
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo uporabniku"
-
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1621
+msgstr ""
+"query &lt;vzdevek&gt; [&lt;sporočilo&gt;]:  Pošlji zasebno sporočilo "
+"uporabniku"
+
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Ogled sporočila dneva na strežniku"
 
-#: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "odpni:  Odpni to sejo"
 
-#: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [sporočilo]:  Prekini povezavo s strežnikom z možnostjo sporočila"
 
-#: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu"
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;vzdevek&gt; [-javniključ|&lt;razlog&gt;]:  Ubij vzdevek"
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novvzdevek&gt;:  Spremenite vaš vzdevek"
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;vzdevek&gt;:  Ogled informacij o vzdevku"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1651
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;kanall&gt; [+|-&lt;načini&gt;] [argumenti]:  Spremeni ali prikaži načine kanala"
-
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1655
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;kanal&gt; +|-&lt;načini&gt; &lt;vzdevek&gt;:  Spremeni načine vzdevka na kanalu"
-
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1659
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanall&gt; [+|-&lt;načini&gt;] [argumenti]:  Spremeni ali prikaži "
+"načine kanala"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;kanal&gt; +|-&lt;načini&gt; &lt;vzdevek&gt;:  Spremeni načine "
+"vzdevka na kanalu"
+
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;načiniuporabnika&gt;:  Nastavite vaše načine v omrežju"
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
-
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1667
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/odstrani iz seznama povabljenih na kanal"
-
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1671
+msgstr ""
+"oper &lt;vzdevek&gt; [-javniključ]:  Dodeli pravice operaterju strežnika"
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;kanal&gt; [-|+]&lt;vzdevek&gt;:  povabi vzdevek ali dodaj/"
+"odstrani iz seznama povabljenih na kanal"
+
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
-
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1675
+msgstr ""
+"kick &lt;kanal&gt; &lt;vzdevek&gt; [komentar]:  Brcni odjemalca s kanala"
+
 msgid "info [server]:  View server administrative details"
 msgstr "info [strežnik]:  Ogled skrbniških podrobnosti strežnika"
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;vzdevek&gt;]:  Prepovaj odjemalca na kanalu"
 
-#: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
-
-#: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1687
+msgstr ""
+"getkey &lt;vzdevek|strežnik&gt;:  Pridobi javni ključ odjemalca ali strežnika"
+
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Ogled statistike omrežja in strežnika"
 
-#: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Pošlji PING povezanemu strežniku"
 
-#: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Navedi uporabnike v kanalu"
 
-#: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1700
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-št|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam določenih uporabnikov na kanalu(ih)"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-št|-op|-polop|-glas|-navadni] &lt;kanal(i)&gt;:  Seznam določenih "
+"uporabnikov na kanalu(ih)"
 
 #. *< type
 #. *< ui_requirement
@@ -12391,142 +8595,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "Vtičnik za protokol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protokol SILC (Varen internetni konferenčni sistem v živo)"
 
-#: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1859
-#: ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Datoteka z javnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Datoteka z zasebnim ključem"
 
-#: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Uporabi popolno neposredno skrivnostnost"
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "Overovitev javnega ključa"
 
-#: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Zavrni neposredno sporočanje brez izmenjave ključev"
 
-#: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Blokiraj sporočila na tablo"
 
-#: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Samodejno odpri tablo"
 
-#: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Digitalno podpiši in preveri vsa sporočila"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Ustvarjanje para ključev SILC ni mogoče\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:364
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Pravo ime: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Uporabniško ime: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-pošta: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Ime gostitelja: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizacija: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Država: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritem: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:376
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Dolžina ključa: \t%d bitov\n"
 
-#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Različica: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12537,8 +8690,6 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:381
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12547,141 +8698,98 @@
 "Odtis javnega ključa:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informacije o javnem ključu"
 
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Ostranjevanje"
 
-#: ../libpurple/protocols/silc/util.c:575
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video-konferenca"
 
-#: ../libpurple/protocols/silc/util.c:594
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Računalnik"
 
-#: ../libpurple/protocols/silc/util.c:598
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:600
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s je poslal sporočilo na tablo. Želite odpreti tablo?"
 
-#: ../libpurple/protocols/silc/wb.c:292
-#: ../libpurple/protocols/silc10/wb.c:291
-#, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
 msgstr "%s je poslal sporočilo na tablo v kanalu %s. Želite odpreti tablo?"
 
-#: ../libpurple/protocols/silc/wb.c:306
-#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Tabla"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Napaka: Oddaljeni ne podpira vašega ključa ali mu ne zaupa"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Napaka: Oddaljeni ne podpira predlagane skupine KE"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Napaka: Oddaljeni ne podpira predlagane cifre"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega PKCS"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Napaka: Oddaljeni ne podpira predlagane razpršene možnosti"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Napaka: Oddaljeni ne podpira predlaganega HMAC"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Napaka: Napačen podpis"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Napaka: Napačen piškot"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ni moč začeti povezave odjemalca SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Janez Neimenovani"
 
-#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Ni mogoče naložiti para ključev SILC: %s"
 
-#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Ni mogoče pisati"
 
-#: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Povezava ni uspela"
 
-#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Neznan odgovor strežnika."
 
-#: ../libpurple/protocols/simple/simple.c:1749
-#: ../libpurple/protocols/simple/simple.c:1795
-#: ../libpurple/protocols/simple/simple.c:1810
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
-#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "Gostitelja ni mogoče razbrati"
 
-#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "Imena strežnika ni mogoče razločiti"
 
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Pojavna imena SIP ne smejo vsebovati presledka ali simbola @"
 
@@ -12693,229 +8801,179 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Vtičnik za protokol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Vtičnik za protokol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Stanje objave (opomba: vsakdo vas lahko opazuje)"
 
-#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Uporabi UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Uporabi posredovalni strežnik"
 
-#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Posredovalni strežnik"
 
-#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Avtoriziraj uporabnika"
 
-#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Poizvedujem za %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Povezovanje na %s ni uspelo"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Prijavljanje: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datoteke %s ni bilo mogoče zapisati."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datoteke %s ni bilo mogoče prebrati."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s trenutno ni prijavljen."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Opozarjanje %s ni dovoljeno."
 
-#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
-
-#: ../libpurple/protocols/toc/toc.c:506
+msgstr ""
+"Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
+
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Pomenek v %s ni dostopen."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Prehitro pošiljate sporočila %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
 
-#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Neuspeh."
 
-#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "Preveč zadetkov."
 
-#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Potrebujem več selekcije."
 
-#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Imeniška storitev je trenutno nedosegljiva."
 
-#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "Poizvedba po e-poštnem naslovu je omejena."
 
-#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Ključna beseda zanemarjena."
 
-#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Brez ključnih besed."
 
-#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Uporabnik nima imeniških informacij."
 
-#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Država ni podprta."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Neznan vzrok neuspeha: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Neveljavno pojavno ime ali geslo."
 
-#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Storitev je trenutno nedostopna."
 
-#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
 
-#: ../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 "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
-
-#: ../libpurple/protocols/toc/toc.c:560
+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 ""
+"Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
+"poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
+
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Prišlo je do neznane napake %d. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Neveljavno ime skupine"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Povezava zaprta"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Čakanje odgovora ..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Sprememba gesla uspešna"
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:6399
-#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "_Skupina:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Prikaži imeniške podatke"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Nastavi imeniške podatke"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Ne morem odpreti %s za pisanje!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
-
-#: ../libpurple/protocols/toc/toc.c:1878
-#: ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042
-#: ../libpurple/protocols/toc/toc.c:2130
+msgstr ""
+"Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
+
 msgid "Could not connect for transfer."
 msgstr "Ni se bilo mogoče povezati za prenos."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, 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"
@@ -12924,7 +8982,6 @@
 msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
 msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s zahteva, da jim pošljete datoteko"
@@ -12939,99 +8996,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Vtičnik za protokol TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, 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:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Vaše sporočilo za Yahoo! ni bilo poslano."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Sistemsko sporočilo Yahoo! za %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Zavrnjeno sporočilo pooblaščanja:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1008
-#, 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:1011
+#, 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."
+
 #, 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:1013
+msgstr ""
+"%s je (že prej) zavrnil vašo zahtevo, da ga smete dodati na svoj seznam."
+
 msgid "Add buddy rejected"
 msgstr "Dodajanje prijatelja zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
-#, 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:2000
+#, 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."
+
 msgid "Failed Yahoo! Authentication"
 msgstr "Napaka pri overovitvi Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
-#, 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:2069
+#, 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."
+
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+msgid "Invalid screen name."
+msgstr "Neveljavno pojavno ime."
+
 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:2137
 #, 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:2190
+msgstr ""
+"Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
+"odpravi."
+
 #, 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:2193
+msgstr ""
+"Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %"
+"s."
+
 msgid "Could not add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr "Prejet neveljaven odgovor HTTP strežnika."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2993
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Težava s povezavo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13040,7 +9091,6 @@
 "Izgubljena povezava s strežnikom %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13049,103 +9099,72 @@
 "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3118
-#: ../libpurple/protocols/yahoo/yahoo.c:3809
 msgid "Not at Home"
 msgstr "Nisem doma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3120
-#: ../libpurple/protocols/yahoo/yahoo.c:3812
 msgid "Not at Desk"
 msgstr "Nisem za mizo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3122
-#: ../libpurple/protocols/yahoo/yahoo.c:3815
 msgid "Not in Office"
 msgstr "Nisem v pisarni"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3126
-#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "On Vacation"
 msgstr "Na dopustu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Stepped Out"
 msgstr "Šel na pavzo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3223
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "Ni na seznamu strežnikov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3270
-#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr "Izgledaj povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
-#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr "Izgledaj stalno povezan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr "Prisotnost"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr "Izgledaj brez povezave"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "Začni konferenčni pogovor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr "Nastavitve prisotnosti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr "Začni Doodlati"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Activate which ID?"
 msgstr "Kateri ID naj bo aktiviran?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3548
 msgid "Join whom in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3560
 msgid "Activate ID..."
 msgstr "Aktiviraj ID ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Join User in Chat..."
 msgstr "Pridruži se uporabniku v pomenku ..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3569
 msgid "Open Inbox"
 msgstr "Odpri prejeto pošto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4158
 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:4163
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Seznam sob na omrežju Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4171
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
 
@@ -13159,227 +9178,189 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4380
-#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Protocol Plugin"
 msgstr "Vtičnik za protokol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonska"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Pager server"
 msgstr "Strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "Japan Pager server"
 msgstr "Japonski strežnik pozivnika"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Pager port"
 msgstr "Vrata za pozivnik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "File transfer server"
 msgstr "Strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Japan file transfer server"
 msgstr "Japonski strežnik prenosa datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "File transfer port"
 msgstr "Vrata za prenos datotek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room locale"
 msgstr "Razpored tipk sobe pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Yahoo Chat server"
 msgstr "Strežnik klepeta Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
 #. 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 "Pošlji zahtevo Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s vam skuša poslati skupino %d datotek.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Napaka pri pisanju"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
-
-#: ../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 "Če si želite ogledati ta profil, morate s spletnim brskalnikom obiskati naslednjo povezavo:"
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Oprostite, profili označeni z vsebino za odrasle trenutno niso podprti."
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+"Če si želite ogledati ta profil, morate s spletnim brskalnikom obiskati "
+"naslednjo povezavo:"
+
 msgid "Yahoo! ID"
 msgstr "Yahoo ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
 msgid "Hobbies"
 msgstr "Hobiji"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Latest News"
 msgstr "Zadnje novice"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
 msgid "Home Page"
 msgstr "Domača stran"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
 msgid "Cool Link 1"
 msgstr "Zanimiva povezava št. 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
 msgid "Cool Link 2"
 msgstr "Zanimiva povezava št. 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
 msgid "Cool Link 3"
 msgstr "Zanimiva povezava št. 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
 msgid "Last Update"
 msgstr "Nazadnje osveženo"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Podatki o uporabniku %s niso dostopni"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1211
-msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
 msgstr "Oprostite, profil je v jeziku ali obliki, ki trenutno ni podprta."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo na strežniku. Poskusite pozneje."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1230
-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 "Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. Če veste, da uporabnik obstaja, poskusite pozneje."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Ni mogoče pridobiti uporabnikovega profila. Ponavadi gre za začasno težavo "
+"na strežniku. Poskusite pozneje."
+
+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 ""
+"Ni mogoče pridobiti uporabnikovega profila. To ponavadi pomeni, da uporabnik "
+"ne obstaja. Kljub temu Yahoo! občasno ne uspe najti uporabnikovega profila. "
+"Če veste, da uporabnik obstaja, poskusite pozneje."
+
 msgid "The user's profile is empty."
 msgstr "Uporabnikov profil je prazen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, 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:224
 msgid "Invitation Rejected"
 msgstr "Povabilo zavrnjeno"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Neznana soba"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Morda je soba polna"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Ni na voljo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
-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:539
+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"
+
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Pogovarjate se v %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Prijatelju se ni bilo mogoče pridružiti na pomenku"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Morda niso v pomenku?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Prejemanje seznama sob je spodletelo."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Glasovi"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Spletne kamere"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Težava s povezavo s strežnikom YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13388,97 +9369,99 @@
 "Izgubljena povezava s strežnikom\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:358
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro kodnega nabora v Upravitelju računov)"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Prišlo je do napake pri pretvorbi tega sporočila. \t Preverite izbiro "
+"kodnega nabora v Upravitelju računov)"
+
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Ni mogoče poslati klepetu %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:795
-#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Skrit ali neprijavljen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Pri %s od %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1510
-#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "_Razred:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr "_Primer:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr "_Prejemnik:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poskus prijave na %s,%s,%s je spodletel"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;vzdevek&gt;: Najdi uporabnika"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2717
+msgstr ""
+"instanca &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
+"razredu"
+
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2722
+msgstr ""
+"inst &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
+
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem razredu"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2728
+msgstr ""
+"topic &lt;instanca&gt;: Nastavi instanco, ki naj bo uporabljena na tem "
+"razredu"
+
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu klepetu"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2745
-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;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2751
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
+msgstr ""
+"sub &lt;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pridruži se novemu "
+"klepetu"
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;sporočilo,<i>instanca</"
+"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;razred&gt; &lt;instanca&gt;: Pošlji sporočilo uporabniku &lt;"
+"<i>razred</i>,<i>instanca</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;razred&gt; &lt;instanca&gt; &lt;prejemnik&gt;: Pošlji sporočilo "
+"uporabniku &lt;<i>razred</i>,<i>instanca</i>,<i>prejemnik</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;instanca&gt; &lt;prejemnikt&gt;: Pošlji sporočilo uporabniku &lt;"
+"SPOROČILO,<i>instanca</i>,<i>prejemnik</i>&gt;"
+
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2832
+msgstr ""
+"zc &lt;razred&gt;: Pošlji sporočilo uporabniku &lt;<i>razred</i>,OSEBNO,*&gt;"
+
 msgid "Resubscribe"
 msgstr "Ponovna prijava"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr "Pridobi prijave s strežnika"
 
@@ -13492,47 +9475,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2928
-#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Vtičnik za protokol Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr "Uporabi tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr "ukaz tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr "Izvozi v .kdorkoli"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr "Izvozi v .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr "Uvozi iz .kdorkoli"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr "Uvozi iz .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr "Področje"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#: ../libpurple/proxy.c:461
-#: ../libpurple/proxy.c:908
-#: ../libpurple/proxy.c:1067
-#: ../libpurple/proxy.c:1638
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13542,78 +9511,63 @@
 "%s"
 
 #  Data is assumed to be the destination sn
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s\n"
 
-#: ../libpurple/proxy.c:702
-#: ../libpurple/proxy.c:751
-#: ../libpurple/proxy.c:789
-#: ../libpurple/proxy.c:801
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi na posredovalni strežnik HTTP %d"
 
-#: ../libpurple/proxy.c:797
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %d."
-
-#: ../libpurple/proxy.c:1028
+msgstr ""
+"Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
+"d."
+
 #, c-format
 msgid "Error resolving %s"
 msgstr "Napaka pri razločanju %s"
 
-#: ../libpurple/proxy.c:1736
 msgid "Could not resolve host name"
 msgstr "Imena strežnika ni možno razločiti"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_Ne"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_Sprejmi"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Trenutno nisem tukaj"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
-#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s je zdaj poznan kot %s.\n"
 
-#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Zahtevanje pozornosti uporabnika %s ..."
 
-#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s želi vaše pozornosti!"
 
-#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13622,112 +9576,90 @@
 "Uporabnik %s vabi %s na pomenek v sobo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:903
 #, 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:907
 msgid "Accept chat invitation?"
 msgstr "Sprejmi povabilo na pomenek?"
 
-#: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "Povezava SSL ni uspela"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "Vrstnik SSL je predstavil neveljavno digitalno potrdilo"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Neznana napaka SSL"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Nenastavljeno"
 
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "Ne moti"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Obsežneje odsoten"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobilec"
 
-#: ../libpurple/status.c:161
 msgid "Listening to music"
 msgstr "Posluša glasbo"
 
-#: ../libpurple/status.c:610
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) je spremenil stanje iz %s v %s"
 
-#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) je zdaj %s"
 
-#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ni nič več %s"
 
-#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s je postal nedejaven"
 
-#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s je postal dejaven"
 
-#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s je postal nedejaven"
 
-#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s je postal dejaven"
 
-#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../libpurple/util.c:2805
-#, 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:3304
+#, 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~."
+
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13736,7 +9668,6 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13745,7 +9676,6 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13754,7 +9684,6 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13763,7 +9692,6 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13772,7 +9700,6 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13781,158 +9708,127 @@
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Ni mogoče odpreti %s: Prevečkrat preusmerjeno"
 
-#: ../libpurple/util.c:3670
-#: ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ni se mogoče povezati z %s."
 
-#: ../libpurple/util.c:3793
-#, 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:3828
+#, 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."
+
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Napaka pri branju iz %s: %s"
 
-#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Napaka pri pisanju v %s: %s"
 
-#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"
 
-#: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4703
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
 #, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Povezavo je prekinil nek program vašega računalnika."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:324
 #, c-format
 msgid "Remote host closed connection."
 msgstr "Oddaljeni gostitelj je zaprl povezavo."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
 #, c-format
 msgid "Connection timed out."
 msgstr "Časovna omejitev povezave potekla."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:328
 #, c-format
 msgid "Connection refused."
 msgstr "Povezava zavrnjena."
 
-#: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Spletni sel"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Spletni sel Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Pošlji neposredna sporočila prek več protokolov"
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Postavitev"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Postavitev pladnja."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Možnosti prijave"
 
-#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Pro_tokol:"
 
-#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "Pojavno _ime:"
 
-#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "_Krajevni psevdonim:"
 
-#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "Zapomni si _geslo"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Možnosti uporabnika"
 
-#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "_Obveščanje o prispeli pošti"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "Za ta račun uporabi to _ikono prijatelja:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s Možnosti"
 
-#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Uporabi nastavitve posredovalnih strežnikov GNOME"
 
-#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "uporabljaj splošno nastavitev posredovalnih strežnikov"
 
-#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "brez posredovalnega strežnika"
 
-#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS4"
 
-#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS5"
 
-#: ../pidgin/gtkaccount.c:939
-#: ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "uporabi nastavitve okolja"
 
@@ -13941,386 +9837,288 @@
 #. 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:978
 msgid "If you look real closely"
 msgstr "Če pogledate zelo pozorno,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "lahko opazite metulje, ki se parijo"
 
-#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Možnosti posredovalnega strežnika"
 
-#: ../pidgin/gtkaccount.c:1016
-#: ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "Vrsta posredovalnega s_trežnika:"
 
-#: ../pidgin/gtkaccount.c:1025
-#: ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_Strežnik:"
 
-#: ../pidgin/gtkaccount.c:1029
-#: ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "Ge_slo:"
 
-#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "Novega računa ni mogoče shraniti"
 
-#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Račun z navedenimi parametri že obstaja."
 
-#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Dodaj račun"
 
-#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "Ta nov račun ustvarite na strežniku"
 
-#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "N_apredno"
 
-#: ../pidgin/gtkaccount.c:1906
-#: ../pidgin/gtkplugin.c:639
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../pidgin/gtkaccount.c:2137
 #, 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'>Dobrodošli v %s!</span>\n"
 "\n"
-"Nimate nastavljenih računov za neposredno sporočanje. Da bi omogočili povezovanje z %s, pritisnite na spodnji gumb <b>Dodaj</b> in nastavite svoj prvi račun. Če želite, da se %s poveže z več računi, pritisnite znova <b>Dodaj</b>, da jih vse nastavite.\n"
+"Nimate nastavljenih računov za neposredno sporočanje. Da bi omogočili "
+"povezovanje z %s, pritisnite na spodnji gumb <b>Dodaj</b> in nastavite svoj "
+"prvi račun. Če želite, da se %s poveže z več računi, pritisnite znova "
+"<b>Dodaj</b>, da jih vse nastavite.\n"
 "\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:549
+"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"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Imate %d stikov z imenom %s. Jih želite spojiti v enega?"
 msgstr[1] "Imate %d stik z imenom %s. Ga želite spojiti v enega?"
 msgstr[2] "Imate %d stika z imenom %s. Ju želite spojiti v enega?"
 msgstr[3] "Imate %d stike z imenom %s. Jih želite spojiti v enega?"
 
-#: ../pidgin/gtkblist.c:550
-msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
-msgstr "Spajanje teh stikov bo povzročilo, da si bodo delili en sam vnos na seznamu prijateljev in eno samo pogovorno okno. Znova jih lahko ločite z izbiro 'Razširi' v kontekstnem meniju stika."
-
-#: ../pidgin/gtkblist.c:552
-msgid "_Merge"
-msgstr "_Spoji"
-
-#: ../pidgin/gtkblist.c:953
-#: ../pidgin/gtkblist.c:6683
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Spajanje teh stikov bo povzročilo, da si bodo delili en sam vnos na seznamu "
+"prijateljev in eno samo pogovorno okno. Znova jih lahko ločite z izbiro "
+"'Razširi' v kontekstnem meniju stika."
+
 msgid "Room _List"
 msgstr "Se_znam sob"
 
-#: ../pidgin/gtkblist.c:973
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+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"
 
-#: ../pidgin/gtkblist.c:985
-#: ../pidgin/gtkblist.c:6718
-#: ../pidgin/gtkpounce.c:546
-#: ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../pidgin/gtkblist.c:1263
-#: ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Zavrni"
 
-#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "Prekliči _zavrnitev"
 
-#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
 msgstr "Premakni v"
 
-#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../pidgin/gtkblist.c:1349
-#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "_Pošlji datoteko ..."
 
-#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "Dodaj &opozorilo prijatelju ..."
 
-#: ../pidgin/gtkblist.c:1367
-#: ../pidgin/gtkblist.c:1371
-#: ../pidgin/gtkblist.c:1486
-#: ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "Skrij, če nepovezan"
 
-#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "Pokaži, če nepovezan"
 
-#: ../pidgin/gtkblist.c:1391
-#: ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494
-#: ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
-#: ../pidgin/gtkblist.c:1394
-#: ../pidgin/gtkblist.c:1402
-#: ../pidgin/gtkblist.c:1496
-#: ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../pidgin/gtkblist.c:1452
 msgid "Add _Buddy..."
 msgstr "Dodaj _prijatelja ..."
 
-#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "Dodaj &klepet ..."
 
-#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "I_zbriši skupino"
 
-#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../pidgin/gtkblist.c:1480
-#: ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594
-#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "Vztrajno"
 
-#: ../pidgin/gtkblist.c:1522
-#: ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../pidgin/gtkblist.c:1801
-#: ../pidgin/gtkblist.c:1813
-#: ../pidgin/gtkblist.c:5364
-#: ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../pidgin/gtkblist.c:2273
-#: ../pidgin/gtkconv.c:4813
-#: ../pidgin/gtkpounce.c:437
-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."
+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."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2618
 msgid "Unknown node type"
 msgstr "Neznana vrsta vozlišča"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Po_kaži uporabnikov dnevnik ..."
 
-#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Sh_ow"
 msgstr "/Prijatelji/Poka_ži"
 
-#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na _zvezi"
 
-#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Prijatelji/Pokaži/Prazne _skupine"
 
-#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Prijatelji/Pokaži/P_odrobnosti prijateljev"
 
-#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Prijatelji/Pokaži/_Časi nedejavnosti"
 
-#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Prijatelji/Pokaži/_Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../pidgin/gtkblist.c:3076
-#: ../pidgin/gtkblist.c:7403
 msgid "/Accounts/Manage"
 msgstr "/Računi/Upravljaj"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
 msgstr "/Orodja/_Digitalna potrdila"
 
-#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vtični_ki"
 
-#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../pidgin/gtkblist.c:3096
-#: ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../pidgin/gtkblist.c:3128
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Račun:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
 #, c-format
 msgid ""
 "\n"
@@ -14329,90 +10127,66 @@
 "\n"
 "<b>Tema:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
 msgid "(no topic set)"
 msgstr "(tema ni določena)"
 
-#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "Prijavljeni"
 
-#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "Zadnjič viden"
 
-#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
 msgstr "Strašljivo"
 
-#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
 msgstr "Noro dobro"
 
-#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
 msgstr "Kulsko"
 
-#: ../pidgin/gtkblist.c:3329
 msgid "Total Buddies"
 msgstr "Skupaj prijateljev"
 
-#: ../pidgin/gtkblist.c:3696
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Nedejaven %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
-#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../pidgin/gtkblist.c:3855
-#: ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../pidgin/gtkblist.c:3857
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../pidgin/gtkblist.c:3858
-#: ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../pidgin/gtkblist.c:4029
-#: ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -14421,385 +10195,312 @@
 msgstr[2] "%d neprebrani sporočili od %s\n"
 msgstr[3] "%d neprebrana sporočila od %s\n"
 
-#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "ročno"
 
-#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "po stanju"
 
-#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../pidgin/gtkblist.c:4535
 #, c-format
 msgid "%s disabled"
 msgstr "%s onemogočen"
 
-#: ../pidgin/gtkblist.c:4539
 msgid "Reconnect"
 msgstr "Ponovno poveži"
 
-#: ../pidgin/gtkblist.c:4539
-#: ../pidgin/gtkblist.c:4658
 msgid "Re-enable"
 msgstr "Ponovno omogoči"
 
-#: ../pidgin/gtkblist.c:4656
 msgid "Welcome back!"
 msgstr "Dobrodošli nazaj!"
 
-#: ../pidgin/gtkblist.c:4692
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "Ker ste se prijavili z druge lokacije, je bilo onemogočenih %d računov."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"Ker ste se prijavili z druge lokacije, je bilo onemogočenih %d računov."
 msgstr[1] "Ker ste se prijavili z druge lokacije, je bil onemogočen %d račun."
-msgstr[2] "Ker ste se prijavili z druge lokacije, sta bila onemogočena %d računa."
-msgstr[3] "Ker ste se prijavili z druge lokacije, so bili onemogočeni %d računi."
-
-#: ../pidgin/gtkblist.c:4971
+msgstr[2] ""
+"Ker ste se prijavili z druge lokacije, sta bila onemogočena %d računa."
+msgstr[3] ""
+"Ker ste se prijavili z druge lokacije, so bili onemogočeni %d računi."
+
 msgid "<b>Username:</b>"
 msgstr "<b>Uporabniško ime:</b>"
 
-#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>Geslo:</b>"
 
-#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr "_Prijavi"
 
-#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5087
 #, 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->Manage</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->Manage</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'>Dobrodošli v %s!</span>\n"
 "\n"
-"Nimate aktiviranih računov. Vključite svoje račune za neposredno sporočanje (IM) prek okna <b>Računi</b> z ukazom <b>Računi->Dodaj/Uredi</b>. Ko račune omogočite, se boste lahko prijavili, nastavili svoje stanje in klepetali s svojimi prijatelji."
+"Nimate aktiviranih računov. Vključite svoje račune za neposredno sporočanje "
+"(IM) prek okna <b>Računi</b> z ukazom <b>Računi->Dodaj/Uredi</b>. Ko račune "
+"omogočite, se boste lahko prijavili, nastavili svoje stanje in klepetali s "
+"svojimi prijatelji."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Prijatelji/Pokaži/Prijatelji, ki niso na zvezi"
 
-#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Prijatelji/Pokaži/Prazne skupine"
 
-#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Prijatelji/Pokaži/Podrobnosti prijateljev"
 
-#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Prijatelji/Pokaži/Časi nedejavnosti"
 
-#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Prijatelji/Pokaži/Ikone protokolov"
 
-#: ../pidgin/gtkblist.c:6324
-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"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6347
-msgid "A_ccount:"
-msgstr "Ra_čun:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:6359
-msgid "_Screen name:"
-msgstr "_Pojavno ime:"
-
-#: ../pidgin/gtkblist.c:6381
-#: ../pidgin/gtkblist.c:6731
-msgid "A_lias:"
-msgstr "Psev_donim:"
-
-#: ../pidgin/gtkblist.c:6648
+msgid "Add a buddy.\n"
+msgstr "Dodaj prijatelja.\n"
+
+msgid "Buddy's _screen name:"
+msgstr "_Pojavno ime prijatelja:"
+
+msgid "(Optional) A_lias:"
+msgstr "(Dodatni) _psevdonimi:"
+
+msgid "Add buddy to _group:"
+msgstr "Doda_j prijatelja v skupino:"
+
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../pidgin/gtkblist.c:6664
-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:6708
-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:6738
+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."
+
+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"
+
+msgid "A_lias:"
+msgstr "Psev_donim:"
+
 msgid "Auto_join when account becomes online."
 msgstr "Samo_dejno se pridruži, ko račun postane povezan."
 
-#: ../pidgin/gtkblist.c:6739
 msgid "_Hide chat when the window is closed."
 msgstr "_Skrij klepet, ko je okno zaprto."
 
-#: ../pidgin/gtkblist.c:6765
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Računi/"
 
-#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../pidgin/gtkblist.c:7460
-#: ../pidgin/gtkconv.c:3132
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Računi/Omogoči račun"
 
-#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "Strežniki SSL"
 
-#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Neznan ukaz."
 
-#: ../pidgin/gtkconv.c:755
-#: ../pidgin/gtkconv.c:781
 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:775
-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:828
+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."
+
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:858
-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:879
+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."
+
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../pidgin/gtkconv.c:890
-#: ../pidgin/gtksavedstatuses.c:1166
-#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../pidgin/gtkconv.c:1138
-#: ../pidgin/gtkdebug.c:167
-#: ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Najdi"
 
-#: ../pidgin/gtkconv.c:1164
-#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../pidgin/gtkconv.c:1668
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
-#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "Nastavi ikono po meri ..."
 
-#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "Odstrani ikono po meri"
 
-#: ../pidgin/gtkconv.c:2917
 msgid "Show All"
 msgstr "Pokaži vse"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2936
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../pidgin/gtkconv.c:2938
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."
 
-#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/View _Log"
 msgstr "/Pogovor/Pokaži _dnevnik ..."
 
-#: ../pidgin/gtkconv.c:2946
 msgid "/Conversation/_Save As..."
 msgstr "/Pogovor/_Shrani kot ..."
 
-#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Pogovor/Po_čisti pogovor"
 
-#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Pova_bi ..."
 
-#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/M_ore"
 msgstr "/Pogovor/_Več"
 
-#: ../pidgin/gtkconv.c:2963
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/_Vzdevek ..."
 
-#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/Zavr_ni ..."
 
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Unblock..."
 msgstr "/Pogovor/Pre_kliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi pove_zavo ..."
 
-#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../pidgin/gtkconv.c:2988
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../pidgin/gtkconv.c:2990
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../pidgin/gtkconv.c:2992
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za _oblikovanje"
 
-#: ../pidgin/gtkconv.c:2993
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pokaži _časovne žige"
 
-#: ../pidgin/gtkconv.c:3120
 msgid "/Conversation/More"
 msgstr "/Pogovor/Več"
 
-#: ../pidgin/gtkconv.c:3176
 msgid "/Options"
 msgstr "/Možnosti"
 
@@ -14808,80 +10509,60 @@
 #. 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:3211
-#: ../pidgin/gtkconv.c:3243
 msgid "/Conversation"
 msgstr "/Pogovor"
 
-#: ../pidgin/gtkconv.c:3251
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Pokaži dnevnik"
 
-#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Unblock..."
 msgstr "/Pogovor/Prekliči zavrnitev ..."
 
-#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../pidgin/gtkconv.c:3309
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../pidgin/gtkconv.c:3312
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../pidgin/gtkconv.c:3325
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Pokaži orodno vrstico za oblikovanje"
 
-#: ../pidgin/gtkconv.c:3328
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Pokaži časovne žige"
 
-#: ../pidgin/gtkconv.c:3406
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../pidgin/gtkconv.c:3476
 #, c-format
 msgid ""
 "\n"
@@ -14891,22 +10572,16 @@
 "%s vam je prenehal pisati"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3642
-#: ../pidgin/gtkconv.c:8313
 msgid "S_end To"
 msgstr "Po_šlji k"
 
-#: ../pidgin/gtkconv.c:4354
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4492
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
-#: ../pidgin/gtkconv.c:5791
-#: ../pidgin/gtkconv.c:5912
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14915,911 +10590,659 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../pidgin/gtkconv.c:6539
-#: ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../pidgin/gtkconv.c:6543
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../pidgin/gtkconv.c:6546
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../pidgin/gtkconv.c:6549
-#: ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: ../pidgin/gtkconv.c:6555
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../pidgin/gtkconv.c:7785
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Počisti vse izpisane replike pomenka."
 
-#: ../pidgin/gtkconv.c:7989
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../pidgin/gtkconv.c:8021
 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:8654
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../pidgin/gtkconv.c:8660
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../pidgin/gtkconv.c:8668
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../pidgin/gtkconv.c:8674
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../pidgin/gtkconv.c:9188
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../pidgin/gtkconv.c:9792
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../pidgin/gtkconv.c:9794
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../pidgin/gtkconv.c:9796
-#: ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "novo okno"
 
-#: ../pidgin/gtkconv.c:9798
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../pidgin/gtkconv.c:9800
 msgid "By account"
 msgstr "po vrsti računa"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Shrani dnevnik razhroščevanja"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Preobrni"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Obarvaj zadetke"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Samo _ikona"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Samo _besedilo"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "Tako ikona _kot besedilo"
 
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Za več možnosti kliknite na desni miškin gumb."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Raven"
 
-#: ../pidgin/gtkdebug.c:822
-#: ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Izberite raven filtra razhroščevanja."
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Vse"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Razno"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Napaka"
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Usodna napaka"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "glavni razvijalec"
 
-#: ../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:86
-#: ../pidgin/gtkdialogs.c:87
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92
-#: ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "razvijalec"
 
-#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "podpora"
 
-#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "podpora/QA"
 
-#: ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "razvijalec in oskrbnik spletne strani"
 
-#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "Starejši avtor prispevkov / Zagotavljanje kakovosti"
 
-#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "različica win32"
 
-#: ../pidgin/gtkdialogs.c:111
-#: ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "vzdrževalec"
 
-#: ../pidgin/gtkdialogs.c:113
 msgid "libfaim maintainer"
 msgstr "vzdrževalec libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "heker in uradni vodja [lenoba]"
 
-#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "Razvijalec XMPP"
 
-#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "prvotni avtor"
 
-#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "afrikansko"
 
-#: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "arabsko"
 
-#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "belorusko (latinica)"
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "bengalsko"
 
-#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "bosansko"
 
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "katalonsko"
 
-#: ../pidgin/gtkdialogs.c:145
-#: ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "valencijansko-katalonsko"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "češko"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "dansko"
 
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "nemško"
 
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Džonka"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "grško"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "avstralsko-angleško"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "britansko-angleško"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "špansko"
 
-#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "estonsko"
 
-#: ../pidgin/gtkdialogs.c:163
-#: ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "baskijsko"
 
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "perzijsko"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "finsko"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "francosko"
 
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "galicijsko"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "gujaratsko"
 
-#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "prevajalska skupina za Gujarati"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "hebrejsko"
 
-#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "hindujsko"
 
-#: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "indonezijsko"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "italijansko"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "japonsko"
 
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "gruzijsko"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "gruzijski prevajalci za Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "kannadsko"
 
-#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "prevajalska skupina za Kannado"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "korejsko"
 
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "kurdsko"
 
-#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "laoško"
 
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "nepalsko"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "norveško (Nyorsk)"
 
-#: ../pidgin/gtkdialogs.c:195
 msgid "Punjabi"
 msgstr "pundžabsko"
 
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "poljsko"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "portugalsko"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "portugalsko (Brazilija)"
 
-#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "paštunsko"
 
-#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "romunsko"
 
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "rusko"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:263
-#: ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "slovaško"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "slovensko"
 
-#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "albansko"
 
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267
-#: ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "srbsko"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+msgid "Sinhala"
+msgstr "sinhalsko"
+
 msgid "Swedish"
 msgstr "švedsko"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "tamilsko"
 
-#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "teluško"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "tajsko"
 
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "turško"
 
-#: ../pidgin/gtkdialogs.c:215
 msgid "Urdu"
 msgstr "urdujsko"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
-#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh in ekipa Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "hongkonško kitajsko"
 
-#: ../pidgin/gtkdialogs.c:221
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "O programu %s"
 
-#: ../pidgin/gtkdialogs.c:394
-#, 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 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:412
+#, 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 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>"
+
 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:417
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Upokojeni nori pisci obližev"
 
-#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Oblikovalci"
 
-#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../pidgin/gtkdialogs.c:746
-#: ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:966
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../pidgin/gtkdialogs.c:751
-#: ../pidgin/gtkdialogs.c:890
-#: ../pidgin/gtkdialogs.c:971
 msgid "_Account"
 msgstr "_Račun"
 
-#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../pidgin/gtkdialogs.c:900
-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:990
+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."
+
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../pidgin/gtkdialogs.c:992
-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:1012
+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."
+
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../pidgin/gtkdialogs.c:1013
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1035
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../pidgin/gtkdialogs.c:1098
-#, 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 seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih prijateljev. Ali želite nadaljevati?"
-msgstr[1] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega prijatelja. Ali želite nadaljevati?"
-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:1106
+#, 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 seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugih "
+"prijateljev. Ali želite nadaljevati?"
+msgstr[1] ""
+"S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d drugega "
+"prijatelja. Ali želite nadaljevati?"
+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?"
+
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../pidgin/gtkdialogs.c:1140
-#, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+#, 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:1147
 msgid "Merge Groups"
 msgstr "Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
 msgstr "_Spoji skupine"
 
-#: ../pidgin/gtkdialogs.c:1200
-#, 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:1203
+#, 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?"
+
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../pidgin/gtkdialogs.c:1239
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#, 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:1242
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../pidgin/gtkdialogs.c:1266
-#, 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:1269
+#, 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?"
+
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
-#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Spremeni stanje"
 
-#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "Pokaži seznam prijateljev"
 
-#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "Novo sporočilo ..."
 
-#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "Utišaj zvoke"
 
-#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "Utripaj ob novem sporočilu"
 
-#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Ni zagnano"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Sprejemam kot:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Sprejemam od:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Pošiljam k:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Pošiljam kot:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "Za odpiranje datotek te vrste ni nastavljen noben program."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Med odpiranjem datoteke je prišlo do napake."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Napaka pri zagonu %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Napaka pri uporabi %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces je vrnil kodo napake %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Datoteka:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Lokalna datoteka:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Porabljen čas:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Preostali čas:"
 
-#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Zapri to okno po zaključku _vseh prenosov"
 
-#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Počisti dokončane prenose"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818
-#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Premor"
 
 #. Resume button
-#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Nadaljuj"
 
-#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
-#: ../pidgin/gtkimhtml.c:833
-#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Počisti oblikovanje"
 
-#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "Barva povezave"
 
-#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "Barva za risanje povezav."
 
-#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
 
-#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Barva za risanje povezav, ko je nad njimi miška."
 
-#: ../pidgin/gtkimhtml.c:1399
-#: ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Ime barve poslanega sporočila"
 
-#: ../pidgin/gtkimhtml.c:1400
 msgid "Color to draw the name of a message you sent."
 msgstr "Barva za izris imena sporočila, ki ste ga poslali."
 
-#: ../pidgin/gtkimhtml.c:1403
-#: ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Ime barve prejetega sporočila"
 
-#: ../pidgin/gtkimhtml.c:1404
 msgid "Color to draw the name of a message you received."
 msgstr "Barva za izris imena sporočila, ki ste ga prejeli."
 
-#: ../pidgin/gtkimhtml.c:1407
 msgid "\"Attention\" Name Color"
 msgstr "Ime barve \"Pozor\""
 
-#: ../pidgin/gtkimhtml.c:1408
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "Barva za izris imena sporočila, ki ste ga prejeli in ki vsebuje vaše ime."
-
-#: ../pidgin/gtkimhtml.c:1411
-#: ../pidgin/plugins/pidginrc.c:55
+msgstr ""
+"Barva za izris imena sporočila, ki ste ga prejeli in ki vsebuje vaše ime."
+
 msgid "Action Message Name Color"
 msgstr "Ime barve sporočila dejanja"
 
-#: ../pidgin/gtkimhtml.c:1412
 msgid "Color to draw the name of an action message."
 msgstr "Barva izrisa imena na sporočilo dejanja."
 
-#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiraj naslov e-pošte"
 
-#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokacijo povezave"
 
-#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15829,7 +11252,6 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15839,7 +11261,6 @@
 "\n"
 "Uporabljena bo privzeta vrednost PNG."
 
-#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15850,7 +11271,6 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15861,246 +11281,196 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3537
-#: ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_Shrani sliko ..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Nastavi pisavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Nastavi barvo besedila"
 
-#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Nastavi barvo ozadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_Opis"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+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:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Vnesite URL povezave, ki jo želite vstaviti."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Vstavi povezavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437
-#: ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Slike: %s ni mogoče shraniti.\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544
-#: ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:712
 msgid "Smile!"
 msgstr "Nasmeh!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "Ta tema nima smeškov."
 
-#: ../pidgin/gtkimhtmltoolbar.c:848
-#: ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "_Pisava"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr "Združi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr "Razdruži"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
-#: ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Krepko"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
-#: ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Ležeče"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092
-#: ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Podčrtano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "Prečrtano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Povečaj pisavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Pomanjšaj pisavo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Vrsta pisave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Barva ozadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Barva ospredja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Ponastavi oblikovanje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Vstavi sliko IM"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Vstavi smejčka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>_Krepko</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_Ležeče</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>Pod_črtano</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Prečrtano</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size=\"larger\">_Večje</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Navadna"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
 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:1194
 msgid "_Font face"
 msgstr "V_rsta pisave"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "Barva o_spredja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "Barva o_zadja"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "Sl_ika"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "P_ovezava"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_Vodoravna črta"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "_Nasmeh!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Brisanje dnevnika ni uspelo"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Preveri dovoljenja in poskusi znova."
 
-#: ../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 "Ste prepričani, da želite povsem izbrisati dnevnik klepeta z %s, ki se je pričel ob %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 "Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je pričel ob %s?"
-
-#: ../pidgin/gtklog.c:308
-#, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
-msgstr "Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je pričel ob %s?"
-
-#: ../pidgin/gtklog.c:323
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Ste prepričani, da želite povsem izbrisati dnevnik klepeta z %s, ki se je "
+"pričel ob %s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je "
+"pričel ob %s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je "
+"pričel ob %s?"
+
 msgid "Delete Log?"
 msgstr "Želite izbrisati dnevnik?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Izbriši dnevnik ..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s o %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Pogovor s/z %s glede %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Prebrskaj mapo dnevnikov"
 
-#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Poskusite `%s -h' za več informacij.\n"
 
-#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16111,8 +11481,9 @@
 "  -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"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -16125,11 +11496,11 @@
 "  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
 "  -n, --nologin       brez samodejne prijave\n"
 "  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                     določa račun(e) za prijavo, ločene z vejico)\n"
+"                      določa račun(e) za prijavo, ločene z vejico.\n"
+"                      Brez tega bo omogočen le prvi račun).\n"
 "  --display=DISPLAY   zaslon X, ki naj bo uporabljen\n"
-"  -v, --version       izpiši trenutno različico in končaj program\n"
-
-#: ../pidgin/gtkmain.c:413
+"  -v, --version       izpiši trenutno različico in zapri program\n"
+
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16140,8 +11511,9 @@
 "  -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"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -16153,10 +11525,10 @@
 "  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
 "  -n, --nologin       brez samodejne prijave\n"
 "  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                     določa račun(e) za prijavo, ločene z vejico)\n"
-"  -v, --version       izpiši trenutno različico in končaj program\n"
-
-#: ../pidgin/gtkmain.c:540
+"                      določa račun(e) za prijavo, ločene z vejico.\n"
+"                      Brez tega bo omogočen le prvi račun).\n"
+"  -v, --version       izpiši trenutno različico in zapri program\n"
+
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16196,20 +11568,15 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:731
-#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Odpri vsa sporočila"
 
-#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Dobili ste pošto!</span>"
 
-#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -16218,7 +11585,6 @@
 msgstr[2] "%s ima %d novi sporočili."
 msgstr[3] "%s ima %d nova sporočila."
 
-#: ../pidgin/gtknotify.c:575
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
@@ -16227,49 +11593,42 @@
 msgstr[2] "<b>Imate %d novi e-sporočili.</b>"
 msgstr[3] "<b>Imate %d nova e-sporočila.</b>"
 
-#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Ukaz brskalnika \"%s\" ni veljaven."
 
-#: ../pidgin/gtknotify.c:1010
-#: ../pidgin/gtknotify.c:1022
-#: ../pidgin/gtknotify.c:1035
-#: ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "Ni bilo mogoče odprti URL"
 
-#: ../pidgin/gtknotify.c:1020
-#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Napaka pri zagonu \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1173
-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:266
+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."
+
 msgid "The following plugins will be unloaded."
 msgstr "Odloženi bodo naslednji vtičniki."
 
-#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "Odloženih bo več vtičnikov."
 
-#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "Odloži vtičnike"
 
-#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "Vtičnika ni mogoče odložiti"
 
-#: ../pidgin/gtkplugin.c:310
-msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
-msgstr "Vtičnika zdaj ni mogoče odložiti, vendar bo ob naslednjem zagonu programa onemogočen."
-
-#: ../pidgin/gtkplugin.c:418
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Vtičnika zdaj ni mogoče odložiti, vendar bo ob naslednjem zagonu programa "
+"onemogočen."
+
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16280,7 +11639,6 @@
 "<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
 "<span weight=\"bold\">Ime datoteke:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -16291,314 +11649,248 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Napaka: %s\n"
 "Preverite spletno stran vtičnika za posodobitev.</span>"
 
-#: ../pidgin/gtkplugin.c:606
+msgid "Author"
+msgstr "Avtor"
+
 msgid "Configure Pl_ugin"
 msgstr "_Nastavi vtičnik"
 
-#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Podrobnosti o vtičniku</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Opozori koga"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_prijavi"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_odjavi"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "postane od_soten"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_vrne"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "postane _nedejaven"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "ni ve_č nedejaven."
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "začne _tipkati"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Premor med _tipkanjem"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "_preneha tipkati"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Pošlje spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Odpri no_vo sporočilno okno"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "_Prikaži obvestilo"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Pošlji spo_ročilo"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Izvr_ši ukaz"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Pre_dvajaj zvok"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "Pre_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "Preb_rskaj ..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Pred_ogled"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "_Opozori le tedaj, ko nisem na voljo"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "Ponavl_jajoč"
 
-#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Tarča opozorila"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Teme smeškov ni mogoče razpakirati."
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Namesti temo"
 
-#: ../pidgin/gtkprefs.c:646
-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 "S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove teme lahko namestite, če jih povlečete in spustite na seznam."
-
-#: ../pidgin/gtkprefs.c:681
+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 ""
+"S spodnjega seznama izberite vrsto smeškov, ki jih želite uporabljati. Nove "
+"teme lahko namestite, če jih povlečete in spustite na seznam."
+
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
 
-#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "_Pokaži sistemsko ikono na pladnju:"
 
-#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Ob neprebranih sporočilih"
 
-#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Skrivanje okna pogovora"
 
-#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
 
-#: ../pidgin/gtkprefs.c:857
-#: ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "ob odsotnosti"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Zavihki"
 
-#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Prikaži pogovore v _oknih z zavihki"
 
-#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Pokaži _gumb 'Zapri' na zavihkih"
 
-#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Postavitev"
 
-#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "zgoraj"
 
-#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "spodaj"
 
-#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "na levi"
 
-#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "na desni"
 
-#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "levo navpično"
 
-#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "desno navpično"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "N_ovi pogovori:"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Prikaži _oblikovanje v dohodnih sporočilih"
 
-#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Zapri sporočila takoj, ko je zaprt zavihek."
 
-#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "Pokaži _podrobne podatke"
 
-#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "_Omogoči animacijo ikon prijateljev"
 
-#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "O_bvesti prijatelje, da jim pišem"
 
-#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "_Obarvaj nepravilno črkovane besede"
 
-#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Uporabi animirano drsenje"
 
-#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
 
-#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Poman_jšaj pogovorna okna"
 
-#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "Pisava"
 
-#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "Uporabi pisavo dokumenta iz _teme"
 
-#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Uporabi pisavo iz _teme"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "_Pisava pogovora:"
 
-#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Privzeto oblikovanje"
 
-#: ../pidgin/gtkprefs.c:1010
-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:1070
+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."
+
 msgid "Cannot start proxy configuration program."
 msgstr "Konfiguracijskega programa za posredovalni strežnik ni mogoče zagnati."
 
-#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "Konfiguracijskega programa brskalnika ni mogoče zagnati."
 
-#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "Strežnik ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "_Samozaznaj naslov IP"
 
-#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "Javen _IP:"
 
-#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Vrata"
 
-#: ../pidgin/gtkprefs.c:1161
 msgid "_Enable automatic router port forwarding"
 msgstr "_Omogoči samodejno prepošiljanje vrat usmerjevalnika"
 
-#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Ročno določi obseg vrat za poslušanje"
 
-#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_Začetna vrata:"
 
-#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_Končna vrata:"
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "Posredovalni strežnik in brskalnik"
 
-#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Konfiguracijskega programa posredovalnega strežnika ni mogoče najti.</b>"
-
-#: ../pidgin/gtkprefs.c:1198
+msgstr ""
+"<b>Konfiguracijskega programa posredovalnega strežnika ni mogoče najti.</b>"
+
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Konfiguracijskega programa brskalnika ni mogoče najti.</b>"
 
-#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16606,99 +11898,75 @@
 "Nastavitve posredovalnega strežnika in brskalnika določite\n"
 "v nastavitvah GNOME"
 
-#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "Prilagodi po_sredovalni strežnik"
 
-#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "Prilagodi _brskalnik"
 
-#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Posredovalni strežnik"
 
-#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Brez posredovalnega strežnika"
 
-#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_Uporabnik:"
 
-#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1375
 msgid "Desktop Default"
 msgstr "Privzeto za namizje"
 
-#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "Privzeto za GNOME"
 
-#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Ročni"
 
-#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
-#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_Odpri povezavo v:"
 
-#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Privzeto za brskalnik"
 
-#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Obstoječe okno"
 
-#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Nov zavihek"
 
-#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16707,63 +11975,48 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
-#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
-#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "Shranjuj vsa _neposredna sporočila"
 
-#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Shranjuj vse po_menke"
 
-#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Beleži vse spremembe _stanja v sistemski dnevnik"
 
-#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Izbira zvoka"
 
-#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "najtišje"
 
-#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "tišje"
 
-#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "tiho"
 
-#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "glasno"
 
-#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "glasneje"
 
-#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "najglasneje"
 
-#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Pisk"
 
-#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Nemo"
 
-#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16772,337 +12025,268 @@
 "Ukaz za _zvok:\n"
 "(%s namesto datoteke)"
 
-#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "Zvok, ko pogovorno okno dobi _fokus"
 
-#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Omogoči zvoke:"
 
-#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Glasnost:"
 
-#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "_Poročaj o času odsotnosti:"
 
-#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Temelji na uporabi tipkovnice ali miške"
 
-#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
-#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Samodejna odsotnost"
 
-#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "Spremeni stanje ob _nedejavnosti"
 
-#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "Število _minut pred nedejavnostjo:"
 
-#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Spremeni _stanje v:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
 
-#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Ob zagonu uporabi stanje ob zadnjem _izhodu"
 
-#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Stanje ob _zagonu:"
 
-#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Teme za smeške"
 
-#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Brskalnik"
 
-#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Stanje / Nedejaven"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Dovoli vsem uporabnikom, da stopijo v stik z mano"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Dovoli le uporabnikom na mojem seznamu prijateljev"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Dovoli samo spodnjim uporabnikom"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Zavrni vse uporabnike"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Zavrni samo uporabnike spodaj"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Spremembe nastavitev o zasebnosti stopijo v veljavo takoj."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Nastavi zasebnost za:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Odstrani vs_e"
 
-#: ../pidgin/gtkprivacy.c:503
-#: ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Dovoli uporabniku"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Vpišite uporabnika, ki mu želiš dovoliti, da stopi v stik z vami."
 
-#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
-
-#: ../pidgin/gtkprivacy.c:508
-#: ../pidgin/gtkprivacy.c:524
+msgstr ""
+"Prosim vnesite ime uporabnika, ki mu želite omogočiti, da stopi v stik z vami"
+
 msgid "_Permit"
 msgstr "_Dovoli"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Dovoli %s, da stopi v stik z vami?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Ste prepričani, da želite dovoliti %s, da stopi v stik z vami?"
 
-#: ../pidgin/gtkprivacy.c:545
-#: ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Zavrni uporabnika"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Vpišite uporabnika, ki ga želite zavrniti."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vnesite ime uporabnika, ki ga želite zavrniti."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Zavrnem %s?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Ste prepričani, da želite zavrniti %s?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Uporabi"
 
-#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "Datoteka že obstaja"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "Ali jo želite prepisati?"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Izberite novo ime"
 
-#: ../pidgin/gtkrequest.c:1649
-#: ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Izberite mapo ..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Dobi seznam"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_Dodaj pomenek"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Ste prepričani, da želite izbrisati izbrana shranjena stanja?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616
-#: ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Uporabi"
 
-#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Naziv je že v uporabi. Prosimo, izberite drug naziv."
 
-#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Razno"
 
-#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: ../pidgin/gtksavedstatuses.c:1161
-#: ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Stanje:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Za nekatere račune uporabi _različno stanje"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "Shra_ni in uporabi"
 
-#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
-#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "Čakanje na omrežno povezavo"
 
-#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "Novo stanje ..."
 
-#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "Shranjena stanja ..."
 
-#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1450
-#: ../pidgin/gtkutils.c:1473
 #, 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:1453
-#: ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Slike ni mogoče odpreti"
 
-#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ni mogoče poslati mape %s."
 
-#: ../pidgin/gtkutils.c:1550
-#, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
+#, 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:1584
-#: ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Povlekli ste sliko"
 
-#: ../pidgin/gtkutils.c:1585
-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:1591
-#: ../pidgin/gtkutils.c:1611
+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."
+
 msgid "Set as buddy icon"
 msgstr "Nastavi kot ikono prijatelja"
 
-#: ../pidgin/gtkutils.c:1592
-#: ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Pošlji slikovno datoteko"
 
-#: ../pidgin/gtkutils.c:1593
-#: ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Vstavi v sporočilo"
 
-#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Jo želite nastaviti za ikono prijatelja?"
 
-#: ../pidgin/gtkutils.c:1604
-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:1605
-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"
+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."
+
+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"
 
 #. 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:1664
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#: ../pidgin/gtkutils.c:1664
-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:2402
+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."
+
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17113,110 +12297,84 @@
 "<b>Velikost:</b> %s\n"
 "<b>Velikost slike:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2704
 #, 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:2706
+msgstr ""
+"Datoteka '%s' je prevelika za %s.  Prosimo, poskusite z manjšo sliko.\n"
+
 msgid "Icon Error"
 msgstr "Napaka ikone"
 
-#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "Ikone ni mogoče nastaviti"
 
-#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Datoteke '%s' ni mogoče odpreti: %s"
 
-#: ../pidgin/gtkutils.c:2856
-#, 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"
-
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
+#, 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"
+
 msgid "Save File"
 msgstr "Shrani datoteko"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Izberite barvo"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "Psev_donim"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Zapri _zavihke"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Informacije"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "Povab_i"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
-#: ../pidgin/pidgintooltip.c:100
 msgid "Pidgin Tooltip"
 msgstr "Nasvet Pidgin"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Smejčki Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pingvinske ikone (Penguin Pimps)"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "S to izbiro onemogočite grafične smejčke."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "brez"
 
-#: ../pidgin/plugins/cap/cap.c:444
-#: ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "Verjetnost odgovora:"
 
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Prilagoditev statistike"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Največji časovni zamik odziva:"
 
-#: ../pidgin/plugins/cap/cap.c:778
-#: ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792
-#: ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minut"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "Največja razlika nazadnje-viden:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "Prag:"
 
@@ -17226,55 +12384,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "Napoved dosegljivosti stika"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "Vtičnik za napovedovanje dosegljivosti stika."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
-msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
-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 ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih "
+"podatkov o prijateljih v seznamu stikov."
+
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Prijatelj je odsoten"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Prijatelj je \"podaljšano\" odsoten"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Prijatelj je mobilen"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Prijatelj ni na zvezi"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Vrednosti točk, ko ..."
 
-#: ../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 "Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri stiku.\n"
-
-#: ../pidgin/plugins/contact_priority.c:125
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+"Prijatelj z <i>največjim rezultatom</i> je tisti, ki bo imel prioriteto pri "
+"stiku.\n"
+
 msgid "Use last buddy when scores are equal"
 msgstr "Uporabi zadnjega prijatelja, ko so rezultati poravnani"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Vrednosti točk za račun ..."
 
@@ -17284,87 +12438,76 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prednost stika"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Omogoča nastavljanje vrednosti, povezanih z različnimi stanji prijateljev."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja prijateljev nedejaven/odsoten/ni na zvezi."
-
-#: ../pidgin/plugins/convcolors.c:23
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Omogoča nastavljanje vrednosti točk pri računanju prednosti stikov za stanja "
+"prijateljev nedejaven/odsoten/ni na zvezi."
+
 msgid "Conversation Colors"
 msgstr "Barve pogovora"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Prilagodi barve v oknu pogovora"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Sporočila o napaki"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Poudarjena sporočila"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Sistemska sporočila"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Poslana sporočila"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Prejeta sporočila"
 
-#: ../pidgin/plugins/convcolors.c:223
-#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Nastavite barvo za %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Prezri dohodno obliko"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Uporabi pri klepetih"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Uporabi pri sporočilih"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Po številu pomenkov"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Postavitev pomenkov"
 
 #. 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 "Opomba: Nastavitev za \"Nove pomenke\" mora biti nastavljena na \"Po številu pomenkov\"."
-
-#: ../pidgin/plugins/extplacement.c:111
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Opomba: Nastavitev za \"Nove pomenke\" mora biti nastavljena na \"Po številu "
+"pomenkov\"."
+
 msgid "Number of conversations per window"
 msgstr "Število pomenkov v oknu"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Pri postavitvi po številu loči okna za klepet in zasebni pomenek"
 
@@ -17374,37 +12517,34 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Postavitev"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Dodatne možnosti postavitve pomenka."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in zasebni pomenek"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Omeji število pomenkov po oknih z možnostjo ločitve oken za klepet in "
+"zasebni pomenek"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Nastavitve gest miške"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Srednja miškina tipka"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Desna miškina tipka"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Viden prikaz gest"
 
@@ -17414,19 +12554,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Miškine geste"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Omogoča podporo za geste miške"
 
 #. *  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"
@@ -17442,75 +12579,60 @@
 "Povlecite navzgor in zatem levo, da se vrnete k prejšnjemu pogovoru.\n"
 "Povlecite navzgor in zatem desno, da se premaknete k naslednjemu pogovoru."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Neposredno sporočanje"
 
 #. 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 "Izberite osebo iz vašega adresarja spodaj ali dodajte novo."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Skupina:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nova oseba"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Izberi prijatelja"
 
 #. 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 "Izberite osebo iz vašega adresarja, ki ji želite dodati tega prijatelja, ali ustvarite novo osebo."
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Izberite osebo iz vašega adresarja, ki ji želite dodati tega prijatelja, ali "
+"ustvarite novo osebo."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Podrobnosti _o uporabniku"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "Pridruži prijatelj_a"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "E-sporočila ni mogoče poslati."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Izvršilne datoteke Evolution ni v POTI."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Za tega prijatelja e-naslova ni mogoče najti."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Dodaj v adresar"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Pošlji e-sporočilo"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Nastavitve integracije z Evolutionom"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Izberite vse račune, katerim naj se samodejno dodajo prijatelji."
 
@@ -17520,7 +12642,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integracija z Evolutionom"
 
@@ -17528,37 +12649,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Omogoča integracijo z Evolutionom."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Spodaj vnesite podatke o osebi."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Spodaj vnesite prijateljevo pojavno ime in vrsto računa."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Vrsta računa:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Dodatne informacije:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Priimek:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "E-pošta:"
 
@@ -17568,7 +12680,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Preskus signalov GTK"
 
@@ -17576,12 +12687,9 @@
 #. *< 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 "Preveri pravilnost delovanja vseh signalov uporabniškega vmesnika."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17590,7 +12698,6 @@
 "\n"
 "<b>Opombe o prijatelju</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Zgodovina"
 
@@ -17600,7 +12707,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Pomanjšaj, ko sem odsoten"
 
@@ -17608,80 +12714,63 @@
 #. *< 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 "Pomanjša seznam prijateljev in pogovorna okna, ko ste odsotni."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Preverjevalnik pošte"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Preveri morebitno novoprispelo pošto."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
-
-#: ../pidgin/plugins/markerline.c:23
+msgstr ""
+"Doda majhno škatlo na seznam prijateljev, ki prikazuje, ali imate novo pošto."
+
 msgid "Markerline"
 msgstr "Označevalna črta"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Nariši črto, ki prikazuje nova sporočila pogovora."
 
-#: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr "Nariši označevalno črto v "
 
-#: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "oknih _neposrednih pogovorov"
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_pogovornih oknih"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za sprejem."
-
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Zahtevana je seja glasbenega sporočanja. Prosimo, kliknite ikono MM za "
+"sprejem."
+
 msgid "Music messaging session confirmed."
 msgstr "Seja glasbenega sporočanja potrjena."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Glasbeno sporočanje"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Pri zaganjanju ukaza je prišlo do napake:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Napaka pri uporabi urejevalnika"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Prišlo je do naslednje napake:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Nastavitve glasbe sporočanja"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Pot urejevalnika partiture"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "Upor_abi"
 
@@ -17693,85 +12782,72 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
 
 #. *  summary
-#: ../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."
-msgstr "Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju pri glasbenem ustvarjanju kompozicije v resničnem času."
+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:678
 msgid "Notify For"
 msgstr "Obveščaj o"
 
-#: ../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:707
 msgid "_Focused windows"
 msgstr "Okna, ki imajo _fokus"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Načini obveščanja"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Dodaj _obvestilo v naslov okna:"
 
 #. Count method button
-#: ../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: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:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "V upravljalniku oken nastavi namig \"N_UJNO\""
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Povzdigni pogovorna okn_a"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Odstranjevanje obvestil"
 
 #. Remove on focus button
-#: ../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:787
 msgid "Remove when conversation window _receives click"
 msgstr "Odstrani, ko _kliknem na pogovorno okno"
 
 #. Remove on type button
-#: ../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:803
 msgid "Remove when a _message gets sent"
 msgstr "Odstrani, ko je _sporočilo poslano"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Odstrani ob zamenjavi _zavihka pomenka"
 
@@ -17781,7 +12857,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Obvestila o sporočilih"
 
@@ -17789,8 +12864,6 @@
 #. *< 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 "Ponuja mnoge načine opozarjanja na nova sporočila."
 
@@ -17807,19 +12880,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 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 vtičnik, ki počne razne stvari - oglejte si opis."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.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"
@@ -17831,56 +12901,43 @@
 "- 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:49
 msgid "Cursor Color"
 msgstr "Barva kazalke"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Drugotna barva kazalke"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Barva povezave"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Ime barve poudarjenih sporočil"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodoravno ločilo GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Vnos pogovora"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Pogovorno okno zahteve"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Pogovorno okno obvestila"
 
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Nastavite barvo"
 
-#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "Nastavite pisavo vmesnika"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Nastavite pisavo za %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "Pisava vmesnika GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
@@ -17904,64 +12961,57 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Barve vmesnika"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Velikosti gradnikov"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Datotečna orodja Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Zapiši nastavitve v %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Ponovno preberi datoteke gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Nadzor teme Gaim GTK+ v Pidginu"
 
-#: ../pidgin/plugins/pidginrc.c:557
-#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Omogoča dostop do pogosto uporabljenih nastavitev gtkrc."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Direktno"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Omogoča neposreden vnos v protokole."
 
-#: ../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 "Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu (XMPP, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte razhroščevalno okno."
-
-#: ../pidgin/plugins/relnot.c:71
-#, 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 "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
-
-#: ../pidgin/plugins/relnot.c:79
+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 ""
+"Omogoča pošiljanje golih ukazov za protokole, ki temeljijo na besedilu "
+"(XMPP, MSN, IRC, TOC). Pritisnite 'Enter' za pošiljanje in opazujte "
+"razhroščevalno okno."
+
+#, 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 ""
+"Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. "
+"Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
+
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Dnevnik sprememb:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Na voljo je nova različica."
 
@@ -17971,87 +13021,73 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Obvestilo o izdaji"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Preverjaj, ali je na voljo nova različica."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom sprememb."
-
-#: ../pidgin/plugins/spellchk.c:1962
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Preverja, ali je na voljo nova različica in uporabika seznanja z dnevnikom "
+"sprememb."
+
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Navedena beseda že obstaja v seznamu popravkov."
 
-#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "Zamenjave besedila"
 
-#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "Vi napišete"
 
-#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "Jaz pošljem"
 
-#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "Samo cele besede"
 
-#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
-#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "Dodaj novo zamenjavo"
 
-#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "Vi _napišete:"
 
-#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "Jaz _pošljem:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
-
-#: ../pidgin/plugins/spellchk.c:2290
+msgstr ""
+"_Natanko ujemanje velikih in malih črk (ne označi za samodejno ravnanje)"
+
 msgid "Only replace _whole words"
 msgstr "Zamenjaj le _cele besede"
 
-#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Splošne možnosti zamenjave besedila"
 
-#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Omogoči zamenjavo zadnje besede pri pošiljanju"
 
-#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "Zamenjava besedila"
 
-#: ../pidgin/plugins/spellchk.c:2351
-#: ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
+msgstr ""
+"Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
 #. *< type
 #. *< ui_requirement
@@ -18059,8 +13095,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -18068,12 +13102,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359
-#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vodoravna inačica seznama prijateljev."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Pokaži časovne žige vsakih"
 
@@ -18083,49 +13114,37 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Čas nastanka"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Pokaži časovne žige v slogu iChata"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Pokaži čase nastanka vsakih N minut v slogu iChata."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Možnosti zapisa časovnega žiga"
 
-#: ../pidgin/plugins/timestamp_format.c:26
 msgid "_Force 24-hour time format"
 msgstr "_Vsili 24-urni časovni zapis"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Pokaži datume v ..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Po_govori:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Za zakasnjena sporočila"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Za zakasnjena sporočila in v pogovorih"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Dnevniki _sporočil:"
 
@@ -18135,60 +13154,49 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Zapisi časovnega žiga sporočil"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Prilagodi oblike časovnega žiga sporočil po meri."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-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:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
+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."
+
 msgid "Opacity:"
 msgstr "Neprosojnost:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Pogovorna okna"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Pro_sojnost pogovornega okna"
 
-#: ../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:584
 msgid "Remove IM window transparency on focus"
 msgstr "Odstrani prosojnost pogovornega okna v ospredju"
 
-#: ../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:619
 msgid "Buddy List Window"
 msgstr "Seznam prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Prosojnost seznama prijateljev"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Odstrani prosojnost seznama prijateljev v ospredju"
 
@@ -18198,73 +13206,64 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Prosojnost"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../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:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+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 vtičnik 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 vtičnik zahteva Win2000 ali novejše."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Nastavitve GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Zagon"
 
-#: ../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:327
 msgid "_Dockable Buddy List"
 msgstr "Le_pljiv seznam prijateljev"
 
 #. Blist On Top
-#: ../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:336
 msgid "Only when docked"
 msgstr "samo, ko je lepljiv"
 
-#: ../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:371
 msgid "Windows Pidgin Options"
 msgstr "Možnosti Pidgin za okolje Windows"
 
-#: ../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: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."
-
-#: ../pidgin/plugins/xmppconsole.c:670
+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."
+
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Odjavljeni.</font>"
 
@@ -18274,87 +13273,118 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749
-#: ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Konzola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Račun: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>V XMPP niste prijavljeni</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Vstavi vrstico <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Vstavi vrstico <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Vstavi vrstico <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Pošlijaj in sprejemaj surove vrstice XMPP."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
+msgstr ""
+"Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
+
+#~ msgid "Screen name sent"
+#~ msgstr "Pojavno ime poslano"
+
+#~ msgid "Screen name"
+#~ msgstr "Pojavno ime"
+
+#~ msgid "_Merge"
+#~ msgstr "_Spoji"
+
+#~ 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"
+
+#~ msgid "A_ccount:"
+#~ msgstr "Ra_čun:"
 
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
+
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Pri odlaganju vtičnika je prišlo do napake."
+
 #~ msgid "Couldn't open file"
 #~ msgstr "Ni mogoče odpreti datoteke"
+
 #~ msgid "Error initializing session"
 #~ msgstr "Napaka pri inicializaciji seje"
+
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Povezava s strežnikom stikov ni uspela."
+
 #~ msgid "Current media"
 #~ msgstr "Trenutni medij"
+
 #~ msgid "Unable to connect to OIM server"
 #~ msgstr "Povezava s strežnikom OIM ni uspela."
+
 #~ 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)."
+
 #~ 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."
+
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
+
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Navedeno je neveljavno ime pomenka."
+
 #~ msgid "Use recent buddies group"
 #~ msgstr "Uporabi nedavno skupino prijateljev"
+
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Prikaz časa vaše odsotnosti"
+
 #~ msgid "Cannot find/access ~/.silc directory"
 #~ msgstr "Mape ~/.silc ni mogoče najti/do nje dostopati."
+
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s je spremenil stanje iz %s v %s"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s je zdaj %s"
+
 #~ msgid "%s is no longer %s"
 #~ msgstr "%s ni nič več %s"
+
 #~ msgid "<span color=\"red\">%s disconnected: %s</span>"
 #~ msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
+
 #~ msgid ""
 #~ "%s\n"
 #~ "\n"
@@ -18365,8 +13395,9 @@
 #~ "\n"
 #~ "%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
 #~ "ponovno omogočite povezovanje računa."
+
 #~ msgid "User has typed something and stopped"
 #~ msgstr "Uporabnik je napisal nekaj in se ustavil."
+
 #~ msgid "Display Statistics"
 #~ msgstr "Pokaži statistiko"
-